MAGETWO-89091: CE edition - Update composer dependencies

Joan He · Joan He · commit a039950f6487 · 2018-03-14T11:17:31.000-05:00
- fix unit test failures
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php b/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 ?: [];
     }
 
     /**
diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -706,7 +706,7 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p
 
                 $selections = $this->mergeSelectionsWithOptions($options, $selections);
             }
-            if (count($selections) > 0 || !$isStrictProcessMode) {
+            if ((is_array($selections) && count($selections) > 0) || !$isStrictProcessMode) {
                 $uniqueKey = [$product->getId()];
                 $selectionIds = [];
                 $qtys = $buyRequest->getBundleOptionQty();
@@ -1322,8 +1322,9 @@ protected function checkIsResult($_result)
     protected function mergeSelectionsWithOptions($options, $selections)
     {
         foreach ($options as $option) {
-            if ($option->getRequired() && count($option->getSelections()) == 1) {
-                $selections = array_merge($selections, $option->getSelections());
+            $optionSelections = $option->getSelections();
+            if ($option->getRequired() && is_array($optionSelections) && count($optionSelections) == 1) {
+                $selections = array_merge($selections, $optionSelections);
             } else {
                 $selections = [];
                 break;
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Decimal.php b/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Decimal.php
@@ -56,7 +56,7 @@ public function getRange(FilterInterface $filter)
             $index = 1;
             do {
                 $range = pow(10, strlen(floor($maxValue)) - $index);
-                $items = $this->getRangeItemCounts($range, $filter);
+                $items = $this->getRangeItemCounts($range, $filter) ?: [];
                 $index++;
             } while ($range > self::MIN_RANGE_POWER && count($items) < 2);
             $this->range = $range;
@@ -109,7 +109,7 @@ public function getMinValue(FilterInterface $filter)
      *
      * @param int $range
      * @param FilterInterface $filter
-     * @return mixed
+     * @return array
      */
     public function getRangeItemCounts($range, FilterInterface $filter)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php b/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
@@ -78,7 +78,7 @@ public function getDefaultStoreId()
      */
     protected function _isApplicableAttribute($object, $attribute)
     {
-        $applyTo = $attribute->getApplyTo();
+        $applyTo = $attribute->getApplyTo() ?: [];
         return (count($applyTo) == 0 || in_array($object->getTypeId(), $applyTo))
             && $attribute->isInSet($object->getAttributeSetId());
     }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/AbstractTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/AbstractTest.php
@@ -25,7 +25,7 @@ protected function _getAttributes()
         foreach ($codes as $code) {
             $mock = $this->createPartialMock(
                 \Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class,
-                ['isInSet', 'getBackend', '__wakeup']
+                ['isInSet', 'getApplyTo', 'getBackend', '__wakeup']
             );
 
             $mock->setAttributeId($code);
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/ProductScopeRewriteGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/ProductScopeRewriteGenerator.php
@@ -208,7 +208,7 @@ public function generateForSpecificStoreView($storeId, $productCategories, Produ
     public function isCategoryProperForGenerating(Category $category, $storeId)
     {
         $parentIds = $category->getParentIds();
-        if (count($parentIds) >= 2) {
+        if (is_array($parentIds) && count($parentIds) >= 2) {
             $rootCategoryId = $parentIds[1];
             return $rootCategoryId == $this->storeManager->getStore($storeId)->getRootCategoryId();
         }
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Import/SourceAbstractTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Import/SourceAbstractTest.php
@@ -57,7 +57,7 @@ public function testIteratorInterface()
         )->method(
             '_getNextRow'
         )->will(
-            $this->onConsecutiveCalls([1, 2, 3], [4, 5, 5], [6, 7, 8])
+            $this->onConsecutiveCalls([1, 2, 3], [4, 5, 5], [6, 7, 8], [])
         );
         $data = [];
         foreach ($this->_model as $key => $value) {
diff --git a/app/code/Magento/Quote/Test/Unit/Observer/Backend/CustomerQuoteObserverTest.php b/app/code/Magento/Quote/Test/Unit/Observer/Backend/CustomerQuoteObserverTest.php
@@ -160,8 +160,8 @@ public function testDispatch($isWebsiteScope, $websites)
     public function dispatchDataProvider()
     {
         return [
-            [true, ['website1']],
-            [true, ['website1', 'website2']],
+            [true, [['website1']]],
+            [true, [['website1'], ['website2']]],
             [false, ['website1']],
             [false, ['website1', 'website2']],
         ];
diff --git a/app/code/Magento/Swatches/Helper/Data.php b/app/code/Magento/Swatches/Helper/Data.php
@@ -515,7 +515,7 @@ private function addFallbackOptions(array $fallbackValues, array $swatches)
      */
     public function isProductHasSwatch(Product $product)
     {
-        $swatchAttributes = $this->getSwatchAttributes($product);
+        $swatchAttributes = $this->getSwatchAttributes($product) ?: [];
         return count($swatchAttributes) > 0;
     }
 
diff --git a/app/code/Magento/Weee/Model/Tax.php b/app/code/Magento/Weee/Model/Tax.php
@@ -326,7 +326,7 @@ public function getProductWeeeAttributes(
                         $amountExclTax = $amountInclTax - $taxAmount;
                     } else {
                         $appliedRates = $this->_calculationFactory->create()->getAppliedRates($rateRequest);
-                        if (count($appliedRates) > 1) {
+                        if (is_array($appliedRates) && count($appliedRates) > 1) {
                             $taxAmount = 0;
                             foreach ($appliedRates as $appliedRate) {
                                 $taxRate = $appliedRate['percent'];
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/_files/SampleMapper.txt b/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/_files/SampleMapper.txt
@@ -17,9 +17,9 @@ class SampleMapper
      *
      * @var array
      */
-    protected $registry = array(
+    protected $registry = [
         
-    );
+    ];
 
     /**
      * Mapper constructor
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/SevenInterface.php b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/SevenInterface.php
@@ -32,7 +32,7 @@ interface SevenInterface extends \Magento\Framework\Code\Generator\CodeGenerator
      * @param array $data
      * @return TestThree
      */
-    public static function testMethod1(array &$data = array());
+    public static function testMethod1(array &$data = []);
 
     /**
      * Method short description
diff --git a/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php b/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php
@@ -237,7 +237,8 @@ public function getSelectCountSql()
         $countSelect->reset(\Magento\Framework\DB\Select::LIMIT_OFFSET);
         $countSelect->reset(\Magento\Framework\DB\Select::COLUMNS);
 
-        if (!count($this->getSelect()->getPart(\Magento\Framework\DB\Select::GROUP))) {
+        $part = $this->getSelect()->getPart(\Magento\Framework\DB\Select::GROUP);
+        if (!is_array($part) || !count($part)) {
             $countSelect->columns(new \Zend_Db_Expr('COUNT(*)'));
             return $countSelect;
         }
diff --git a/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php b/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php
@@ -81,7 +81,7 @@ public function getCipherModeCombinations()
         $result = [];
         foreach ($this->_supportedCiphers as $cipher) {
             foreach ($this->_supportedModes as $mode) {
-                $result[] = [$cipher, $mode];
+                $result[$cipher . '-' . $mode] = [$cipher, $mode];
             }
         }
         return $result;
@@ -110,9 +110,9 @@ public function getConstructorExceptionData()
                 $tooLongKey = str_repeat('-', $this->_getKeySize($cipher, $mode) + 1);
                 $tooShortInitVector = str_repeat('-', $this->_getInitVectorSize($cipher, $mode) - 1);
                 $tooLongInitVector = str_repeat('-', $this->_getInitVectorSize($cipher, $mode) + 1);
-                $result[] = [$tooLongKey, $cipher, $mode, false];
-                $result[] = [$this->_key, $cipher, $mode, $tooShortInitVector];
-                $result[] = [$this->_key, $cipher, $mode, $tooLongInitVector];
+                $result['tooLongKey-' . $cipher . '-' . $mode . '-false'] = [$tooLongKey, $cipher, $mode, false];
+                $result['key-' . $cipher . '-' . $mode . '-tooShortInitVector'] = [$this->_key, $cipher, $mode, $tooShortInitVector];
+                $result['key-' . $cipher . '-' . $mode . '-tooLongInitVector'] = [$this->_key, $cipher, $mode, $tooLongInitVector];
             }
         }
         return $result;
diff --git a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
@@ -295,7 +295,7 @@ protected function _loadScopedData()
                 $virtualTypes = [];
                 foreach ($this->_scopePriorityScheme as $scopeCode) {
                     if (false == isset($this->_loadedScopes[$scopeCode])) {
-                        $data = $this->_reader->read($scopeCode);
+                        $data = $this->_reader->read($scopeCode) ?: [];
                         unset($data['preferences']);
                         if (count($data) > 0) {
                             $this->_inherited = [];
diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/TransportTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/TransportTest.php
@@ -10,7 +10,7 @@ class TransportTest extends \PHPUnit\Framework\TestCase
     /**
      * @covers \Magento\Framework\Mail\Transport::sendMessage
      * @expectedException \Magento\Framework\Exception\MailException
-     * @expectedExceptionMessage Invalid email; contains no "To" header
+     * @expectedExceptionMessage Invalid email; contains no at least one of "To", "Cc", and "Bcc" header
      */
     public function testSendMessageBrokenMessage()
     {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleFactory.txt b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleFactory.txt
@@ -37,7 +37,7 @@ class SampleFactory
      * @param array $data
      * @return \Magento\Framework\ObjectManager\Code\Generator\Sample
      */
-    public function create(array $data = array())
+    public function create(array $data = [])
     {
         return $this->_objectManager->create($this->_instanceName, $data);
     }
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleRepository.txt b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleRepository.txt
@@ -27,9 +27,9 @@ class SampleRepository implements SampleRepositoryInterface
      *
      * @var array
      */
-    protected $registry = array(
+    protected $registry = [
         
-    );
+    ];
 
     /**
      * Extension attributes join processor.
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/TSampleRepository.txt b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/TSampleRepository.txt
@@ -27,9 +27,9 @@ class TSampleRepository implements TSampleRepositoryInterface
      *
      * @var array
      */
-    protected $registry = array(
+    protected $registry = [
         
-    );
+    ];
 
     /**
      * Extension attributes join processor.
diff --git a/lib/internal/Magento/Framework/Session/SessionManager.php b/lib/internal/Magento/Framework/Session/SessionManager.php
@@ -124,9 +124,6 @@ public function __construct(
         $this->cookieManager = $cookieManager;
         $this->cookieMetadataFactory = $cookieMetadataFactory;
         $this->appState = $appState;
-
-        // Enable session.use_only_cookies
-        ini_set('session.use_only_cookies', '1');
         $this->start();
     }
 
@@ -576,6 +573,14 @@ public function expireSessionCookie()
      */
     private function initIniOptions()
     {
+        $result = ini_set('session.use_only_cookies', '1');
+        if ($result === false) {
+            $error = error_get_last();
+            throw new \InvalidArgumentException(
+                sprintf('Failed to set ini option session.use_only_cookies to value 1. %s', $error['message'])
+            );
+        }
+
         foreach ($this->sessionConfig->getOptions() as $option => $value) {
             $result = ini_set($option, $value);
             if ($result === false) {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/OptionsTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/OptionsTest.php
@@ -67,7 +67,10 @@ public function testEvaluate()
      */
     public function testEvaluateWrongModel($input, $expectedException, $expectedExceptionMessage)
     {
-        $this->expectException($expectedException, $expectedExceptionMessage);
+        $this->expectException($expectedException);
+        $this->expectExceptionMessage($expectedExceptionMessage);
+        $this->_objectManager->method('get')
+            ->willReturnSelf();
         $this->_model->evaluate($input);
     }
 
diff --git a/setup/src/Magento/Setup/Console/Style/MagentoStyle.php b/setup/src/Magento/Setup/Console/Style/MagentoStyle.php
@@ -7,7 +7,6 @@
 namespace Magento\Setup\Console\Style;
 
 use Magento\Setup\Console\InputValidationException;
-use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Helper\Helper;
@@ -21,6 +20,7 @@
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 use Symfony\Component\Console\Question\Question;
 use Symfony\Component\Console\Style\OutputStyle;
+use Symfony\Component\Console\Terminal;
 
 /**
  * Magento console output decorator.
@@ -483,10 +483,10 @@ private function getProgressBar()
      */
     private function getTerminalWidth()
     {
-        $application = new Application();
-        $dimensions = $application->getTerminalDimensions();
+        $terminal = new Terminal();
+        $width = $terminal->getWidth();
 
-        return $dimensions[0] ?: self::MAX_LINE_LENGTH;
+        return $width ?: self::MAX_LINE_LENGTH;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,8 @@ public function getRowUrl($item)`
`258`	`258`	`*/`
`259`	`259`	`public function getMultipleRows($item)`
`260`	`260`	`{`
`261`		`- return $item->getChildren();`
	`261`	`+ $children = $item->getChildren();`
	`262`	`+ return $children ?: [];`
`262`	`263`	`}`
`263`	`264`
`264`	`265`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public function getDefaultStoreId()`
`78`	`78`	`*/`
`79`	`79`	`protected function _isApplicableAttribute($object, $attribute)`
`80`	`80`	`{`
`81`		`- $applyTo = $attribute->getApplyTo();`
	`81`	`+ $applyTo = $attribute->getApplyTo() ?: [];`
`82`	`82`	`return (count($applyTo) == 0 \|\| in_array($object->getTypeId(), $applyTo))`
`83`	`83`	`&& $attribute->isInSet($object->getAttributeSetId());`
`84`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ public function generateForSpecificStoreView($storeId, $productCategories, Produ`
`208`	`208`	`public function isCategoryProperForGenerating(Category $category, $storeId)`
`209`	`209`	`{`
`210`	`210`	`$parentIds = $category->getParentIds();`
`211`		`- if (count($parentIds) >= 2) {`
	`211`	`+ if (is_array($parentIds) && count($parentIds) >= 2) {`
`212`	`212`	`$rootCategoryId = $parentIds[1];`
`213`	`213`	`return $rootCategoryId == $this->storeManager->getStore($storeId)->getRootCategoryId();`
`214`	`214`	`}`
Original file line number	Diff line number	Diff line change
`@@ -515,7 +515,7 @@ private function addFallbackOptions(array $fallbackValues, array $swatches)`
`515`	`515`	`*/`
`516`	`516`	`public function isProductHasSwatch(Product $product)`
`517`	`517`	`{`
`518`		`- $swatchAttributes = $this->getSwatchAttributes($product);`
	`518`	`+ $swatchAttributes = $this->getSwatchAttributes($product) ?: [];`
`519`	`519`	`return count($swatchAttributes) > 0;`
`520`	`520`	`}`
`521`	`521`