Merge remote-tracking branch 'engcom/libs-upgrade' into MAGETWO-89569

Author: danielrenaud

.travis.yml

@@ -16,8 +16,8 @@ services:
   - elasticsearch
 language: php
 php:
-  - 7.0
   - 7.1
+  - 7.2
 env:
   global:
     - COMPOSER_BIN_DIR=~/bin
@@ -35,13 +35,13 @@ env:
     - TEST_SUITE=functional
 matrix:
   exclude:
-    - php: 7.0
+    - php: 7.1
       env: TEST_SUITE=static
-    - php: 7.0
+    - php: 7.1
       env: TEST_SUITE=js GRUNT_COMMAND=spec
-    - php: 7.0
+    - php: 7.1
       env: TEST_SUITE=js GRUNT_COMMAND=static
-    - php: 7.0
+    - php: 7.1
       env: TEST_SUITE=functional
 cache:
   apt: true

app/code/Magento/AdminNotification/composer.json

@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.1.3||~7.2.0",
         "lib-libxml": "*",
         "magento/framework": "100.3.*",
         "magento/module-backend": "100.3.*",

app/code/Magento/AdvancedPricingImportExport/composer.json

@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.1.3||~7.2.0",
         "magento/framework": "100.3.*",
         "magento/module-catalog": "101.2.*",
         "magento/module-catalog-import-export": "100.3.*",

app/code/Magento/AdvancedSearch/composer.json

@@ -13,7 +13,7 @@
         "magento/module-customer": "100.3.*",
         "magento/module-search": "100.3.*",
         "magento/module-store": "100.3.*",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
+        "php": "~7.1.3||~7.2.0"
     },
     "type": "magento2-module",
     "version": "100.3.0-dev",

app/code/Magento/Amqp/composer.json

@@ -8,7 +8,7 @@
         "magento/framework": "100.3.*",
         "magento/framework-amqp": "100.1.*",
         "magento/framework-message-queue": "100.3.*",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
+        "php": "~7.1.3||~7.2.0"
     },
     "type": "magento2-module",
     "version": "100.3.0-dev",

app/code/Magento/Analytics/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-analytics",
     "description": "N/A",
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.1.3||~7.2.0",
         "magento/module-backend": "100.3.*",
         "magento/module-config": "100.3.*",
         "magento/module-integration": "100.3.*",

app/code/Magento/AsynchronousOperations/composer.json

@@ -11,7 +11,7 @@
         "magento/module-backend": "100.3.*",
         "magento/module-ui": "100.3.*",
         "magento/module-user": "100.3.*",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
+        "php": "~7.1.3||~7.2.0"
     },
     "suggest": {
         "magento/module-admin-notification": "100.3.*",

app/code/Magento/Authorization/composer.json

@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.1.3||~7.2.0",
         "magento/framework": "100.3.*",
         "magento/module-backend": "100.3.*"
     },

app/code/Magento/Authorizenet/composer.json

@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.1.3||~7.2.0",
         "magento/framework": "100.3.*",
         "magento/module-backend": "100.3.*",
         "magento/module-catalog": "101.2.*",

app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php

@@ -258,7 +258,8 @@ public function getRowUrl($item)
      */
     public function getMultipleRows($item)
     {
-        return $item->getChildren();
+        $children = $item->getChildren();
+        return $children ?: [];
     }
 
     /**