Merge pull request #683 from wernerkrauss/fix-some-php72-issues

Merged #683
silvershop · Sep 18, 2018 · abb1b23 · abb1b23
2 parents fa6fd63 + 1609669
commit abb1b23
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/code/cart/ShoppingCart.php b/code/cart/ShoppingCart.php
@@ -566,9 +566,9 @@ protected static function build_url($action, $buyable, $params = array())
      *
      * you will need to decode the url with javascript before using it.
      */
-    protected static function params_to_get_string($array)
+    protected static function params_to_get_string(array $array)
     {
-        if ($array & count($array > 0)) {
+        if ($array && count($array) > 0) {
             array_walk($array, create_function('&$v,$k', '$v = $k."=".$v ;'));
             return "?" . implode("&", $array);
         }

diff --git a/code/cms/ShopConfig.php b/code/cms/ShopConfig.php
@@ -81,7 +81,7 @@ public function getCountriesList($prefixisocode = false)
         asort($countries);
         if ($allowed = $this->owner->AllowedCountries) {
             $allowed = explode(",", $allowed);
-            if (count($allowed > 0)) {
+            if (count($allowed) > 0) {
                 $countries = array_intersect_key($countries, array_flip($allowed));
             }
         }

diff --git a/code/model/Order.php b/code/model/Order.php
@@ -299,7 +299,7 @@ public function getDefaultSearchContext()
     /**
      * Hack for swapping out relation list with OrderItemList
      */
-    public function getComponents($componentName, $filter = "", $sort = "", $join = "", $limit = null)
+    public function getComponents($componentName, $filter = null, $sort = null, $join = null, $limit = null)
     {
         $components = parent::getComponents($componentName, $filter = "", $sort = "", $join = "", $limit = null);
         if ($componentName === "Items" && get_class($components) !== "UnsavedRelationList") {

diff --git a/code/product/Product.php b/code/product/Product.php
@@ -382,9 +382,9 @@ public function isOrphaned()
         return false;
     }
 
-    public function Link()
+    public function Link($action = null)
     {
-        $link = parent::Link();
+        $link = parent::Link($action);
         $this->extend('updateLink', $link);
         return $link;
     }