fix: cache count() results for loops

DanielRuf · DanielRuf · commit f39e3fd3c927 · 2018-05-25T00:54:42.000+02:00
diff --git a/app/code/Magento/Paypal/Model/Report/Settlement.php b/app/code/Magento/Paypal/Model/Report/Settlement.php
@@ -416,7 +416,8 @@ public function parseCsv($localCsv, $format = 'new')
     private function getBodyItems(array $line, array $sectionColumns, array $rowMap)
     {
         $bodyItem = [];
-        for ($i = 1, $count = count($line); $i < $count; $i++) {
+        $lineCount = count($line);
+        for ($i = 1, $count = $lineCount; $i < $count; $i++) {
             if(isset($rowMap[$sectionColumns[$i]])) {
                 if (in_array($rowMap[$sectionColumns[$i]], $this->dateTimeColumns)) {
                     $line[$i] = $this->formatDateTimeColumns($line[$i]);
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.php
@@ -76,7 +76,8 @@ public function tearDown()
     {
         $this->cmsIndex->open();
         $this->cmsIndex->getLinksBlock()->openLink("Compare Products");
-        for ($i = 1; $i <= count($this->products); $i++) {
+        $productsCount = count($this->products);
+        for ($i = 1; $i <= $productsCount; $i++) {
             $this->catalogProductCompare->getCompareProductsBlock()->removeProduct();
         }
     }
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/ShoppingCartPerCustomerTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/ShoppingCartPerCustomerTest.php
@@ -95,7 +95,8 @@ public function test(
 
         $customers = [];
         $cartFixtures = [];
-        for ($i = 0; $i < count($checkoutData); $i++) {
+        $checkoutDataCount = count($checkoutData);
+        for ($i = 0; $i < $checkoutDataCount; $i++) {
             $customers[$i] = $this->fixtureFactory->createByCode('customer', ['dataset' => $customerDataset]);
             $customers[$i]->persist();
 
diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/TestStep/FillShippingInformationStep.php b/dev/tests/functional/tests/app/Magento/Multishipping/Test/TestStep/FillShippingInformationStep.php
@@ -58,7 +58,8 @@ public function __construct(
     public function run()
     {
         $shippingMethods = [];
-        for ($i = 0; $i < count($this->customer->getAddress()); $i++) {
+        $addressCount = $this->customer->getAddress();
+        for ($i = 0; $i < $addressCount; $i++) {
             $shippingMethods[] = $this->shippingMethod;
         }
         $this->shippingInformation->getShippingBlock()->selectShippingMethod($shippingMethods);
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertProductsQtyAfterOrderCancel.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertProductsQtyAfterOrderCancel.php
@@ -52,7 +52,8 @@ public function processAssert(
         AssertProductForm $assertProductForm,
         AssertConfigurableProductForm $assertConfigurableProductForm
     ) {
-        for ($i = 0; $i < count($order->getEntityId()['products']); $i++) {
+        $productsCount = count($order->getEntityId()['products']);
+        for ($i = 0; $i < $productsCount; $i++) {
             $product = $order->getEntityId()['products'][$i];
             $productData = $product->getData();
             if ($product instanceof BundleProduct) {
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/AlgorithmBaseTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/AlgorithmBaseTest.php
@@ -112,7 +112,8 @@ public function testPricesSegmentation($categoryId, array $entityIds, array $int
         $items = $model->calculateSeparators($interval);
         $this->assertEquals(array_keys($intervalItems), array_keys($items));
 
-        for ($i = 0; $i < count($intervalItems); ++$i) {
+        $intervalItemsCount = count($intervalItems);
+        for ($i = 0; $i < $intervalItemsCount; ++$i) {
             $this->assertInternalType('array', $items[$i]);
             $this->assertEquals($intervalItems[$i]['from'], $items[$i]['from']);
             $this->assertEquals($intervalItems[$i]['to'], $items[$i]['to']);
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/ConstantUsageSniffTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/ConstantUsageSniffTest.php
@@ -67,7 +67,8 @@ private function tokenizeString($fileContent)
         $lineNumber = 1;
         $tokens = token_get_all($fileContent);
         $snifferTokens = [];
-        for ($i = 0; $i < count($tokens); $i++) {
+        $tokensCount = count($tokens);
+        for ($i = 0; $i < $tokensCount; $i++) {
             $content = is_array($tokens[$i]) ? $tokens[$i][1] : $tokens[$i];
             $snifferTokens[$i]['line'] = $lineNumber;
             $snifferTokens[$i]['content'] = $content;
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
@@ -501,8 +501,9 @@ private function _checkConstantWithClasspath($constant, $class, $replacement, $c
     {
         $classPathParts = explode('\\', $class);
         $classPartialPath = '';
-        for ($i = count($classPathParts) - 1; $i >= 0; $i--) {
-            if ($i === (count($classPathParts) - 1)) {
+        $classPathPartsCount = count($classPathParts);
+        for ($i = $classPathPartsCount - 1; $i >= 0; $i--) {
+            if ($i === ($classPathPartsCount - 1)) {
                 $classPartialPath = $classPathParts[$i] . $classPartialPath;
             } else {
                 $classPartialPath = $classPathParts[$i] . '\\' . $classPartialPath;
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Language/DictionaryTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Language/DictionaryTest.php
@@ -52,7 +52,8 @@ public function testDictionaryGetter()
         }
 
         $file = $this->getMockForAbstractClass(\Magento\Framework\Filesystem\File\ReadInterface::class);
-        for ($i = 0; $i < count($data); $i++) {
+        $dataCount = count($data);
+        for ($i = 0; $i < $dataCount; $i++) {
             $file->expects($this->at($i))->method('readCsv')->will($this->returnValue($data[$i]));
         }
         $file->expects($this->at($i))->method('readCsv')->will($this->returnValue(false));
diff --git a/lib/internal/Magento/Framework/Archive.php b/lib/internal/Magento/Framework/Archive.php
@@ -96,14 +96,15 @@ public function pack($source, $destination = 'packed.tgz', $skipRoot = false)
     {
         $archivers = $this->_getArchivers($destination);
         $interimSource = '';
-        for ($i = 0; $i < count($archivers); $i++) {
-            if ($i == count($archivers) - 1) {
+        $archiversCount = count($archivers);
+        for ($i = 0; $i < $archiversCount; $i++) {
+            if ($i == $archiversCount - 1) {
                 $packed = $destination;
             } else {
                 $packed = dirname($destination) . '/~tmp-' . microtime(true) . $archivers[$i] . '.' . $archivers[$i];
             }
             $source = $this->_getArchiver($archivers[$i])->pack($source, $packed, $skipRoot);
-            if ($interimSource && $i < count($archivers)) {
+            if ($interimSource && $i < $archiversCount) {
                 unlink($interimSource);
             }
             $interimSource = $source;
diff --git a/lib/internal/Magento/Framework/Cache/Backend/Memcached.php b/lib/internal/Magento/Framework/Cache/Backend/Memcached.php
@@ -84,7 +84,8 @@ public function save($data, $id, $tags = [], $specificLifetime = false)
         if (is_string($data) && strlen($data) > $this->_options['slab_size']) {
             $dataChunks = str_split($data, $this->_options['slab_size']);
 
-            for ($i = 0, $cnt = count($dataChunks); $i < $cnt; $i++) {
+            $dataChunksCount = count($dataChunks);
+            for ($i = 0, $cnt = $dataChunksCount; $i < $cnt; $i++) {
                 $chunkId = $this->_getChunkId($id, $i);
 
                 if (!parent::save($dataChunks[$i], $chunkId, $tags, $specificLifetime)) {
diff --git a/lib/internal/Magento/Framework/Filter/Template.php b/lib/internal/Magento/Framework/Filter/Template.php
@@ -313,7 +313,8 @@ protected function getVariable($value, $default = '{no_value_defined}')
         $stackVars = $tokenizer->tokenize();
         $result = $default;
         $last = 0;
-        for ($i = 0; $i < count($stackVars); $i++) {
+        $stackVarsCount = count($stackVars);
+        for ($i = 0; $i < $stackVarsCount; $i++) {
             if ($i == 0 && isset($this->templateVars[$stackVars[$i]['name']])) {
                 // Getting of template value
                 $stackVars[$i]['variable'] = & $this->templateVars[$stackVars[$i]['name']];
diff --git a/lib/internal/Magento/Framework/System/Ftp.php b/lib/internal/Magento/Framework/System/Ftp.php
@@ -58,7 +58,8 @@ public function mkdirRecursive($path, $mode = 0777)
         $dir = explode("/", $path);
         $path = "";
         $ret = true;
-        for ($i = 0; $i < count($dir); $i++) {
+        $dirCount = count($dir);
+        for ($i = 0; $i < $dirCount; $i++) {
             $path .= "/" . $dir[$i];
             if (!@ftp_chdir($this->_conn, $path)) {
                 @ftp_chdir($this->_conn, "/");
diff --git a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Html.php b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Html.php
@@ -31,7 +31,8 @@ protected function _parse()
 
         $results = [];
         preg_match_all(Filter::CONSTRUCTION_PATTERN, $data, $results, PREG_SET_ORDER);
-        for ($i = 0; $i < count($results); $i++) {
+        $resultsCount = count($results);
+        for ($i = 0; $i < $resultsCount; $i++) {
             if ($results[$i][1] === Filter::TRANS_DIRECTIVE_NAME) {
                 $directive = [];
                 if (preg_match(Filter::TRANS_DIRECTIVE_REGEX, $results[$i][2], $directive) !== 1) {
@@ -43,7 +44,8 @@ protected function _parse()
         }
 
         preg_match_all(self::HTML_FILTER, $data, $results, PREG_SET_ORDER);
-        for ($i = 0; $i < count($results); $i++) {
+        $resultsCount = count($results);
+        for ($i = 0; $i < $resultsCount; $i++) {
             if (!empty($results[$i]['value'])) {
                 $this->_addPhrase($results[$i]['value']);
             }
diff --git a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Js.php b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Js.php
@@ -22,15 +22,17 @@ protected function _parse()
             $fileRow = fgets($fileHandle, 4096);
             $results = [];
             preg_match_all('/mage\.__\(\s*([\'"])(.*?[^\\\])\1.*?[),]/', $fileRow, $results, PREG_SET_ORDER);
-            for ($i = 0; $i < count($results); $i++) {
+            $resultsCount = count($results);
+            for ($i = 0; $i < $resultsCount; $i++) {
                 if (isset($results[$i][2])) {
                     $quote = $results[$i][1];
                     $this->_addPhrase($quote . $results[$i][2] . $quote, $lineNumber);
                 }
             }
 
             preg_match_all('/\\$t\(\s*([\'"])(.*?[^\\\])\1.*?[),]/', $fileRow, $results, PREG_SET_ORDER);
-            for ($i = 0; $i < count($results); $i++) {
+            $resultsCount = count($results);
+            for ($i = 0; $i < $resultsCount; $i++) {
                 if (isset($results[$i][2])) {
                     $quote = $results[$i][1];
                     $this->_addPhrase($quote . $results[$i][2] . $quote, $lineNumber);

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,8 @@ public function tearDown()`
`76`	`76`	`{`
`77`	`77`	`$this->cmsIndex->open();`
`78`	`78`	`$this->cmsIndex->getLinksBlock()->openLink("Compare Products");`
`79`		`- for ($i = 1; $i <= count($this->products); $i++) {`
	`79`	`+ $productsCount = count($this->products);`
	`80`	`+ for ($i = 1; $i <= $productsCount; $i++) {`
`80`	`81`	`$this->catalogProductCompare->getCompareProductsBlock()->removeProduct();`
`81`	`82`	`}`
`82`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,8 @@ public function __construct(`
`58`	`58`	`public function run()`
`59`	`59`	`{`
`60`	`60`	`$shippingMethods = [];`
`61`		`- for ($i = 0; $i < count($this->customer->getAddress()); $i++) {`
	`61`	`+ $addressCount = $this->customer->getAddress();`
	`62`	`+ for ($i = 0; $i < $addressCount; $i++) {`
`62`	`63`	`$shippingMethods[] = $this->shippingMethod;`
`63`	`64`	`}`
`64`	`65`	`$this->shippingInformation->getShippingBlock()->selectShippingMethod($shippingMethods);`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,8 @@ public function testDictionaryGetter()`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`$file = $this->getMockForAbstractClass(\Magento\Framework\Filesystem\File\ReadInterface::class);`
`55`		`- for ($i = 0; $i < count($data); $i++) {`
	`55`	`+ $dataCount = count($data);`
	`56`	`+ for ($i = 0; $i < $dataCount; $i++) {`
`56`	`57`	`$file->expects($this->at($i))->method('readCsv')->will($this->returnValue($data[$i]));`
`57`	`58`	`}`
`58`	`59`	`$file->expects($this->at($i))->method('readCsv')->will($this->returnValue(false));`
Original file line number	Diff line number	Diff line change
`@@ -96,14 +96,15 @@ public function pack($source, $destination = 'packed.tgz', $skipRoot = false)`
`96`	`96`	`{`
`97`	`97`	`$archivers = $this->_getArchivers($destination);`
`98`	`98`	`$interimSource = '';`
`99`		`- for ($i = 0; $i < count($archivers); $i++) {`
`100`		`- if ($i == count($archivers) - 1) {`
	`99`	`+ $archiversCount = count($archivers);`
	`100`	`+ for ($i = 0; $i < $archiversCount; $i++) {`
	`101`	`+ if ($i == $archiversCount - 1) {`
`101`	`102`	`$packed = $destination;`
`102`	`103`	`} else {`
`103`	`104`	`$packed = dirname($destination) . '/~tmp-' . microtime(true) . $archivers[$i] . '.' . $archivers[$i];`
`104`	`105`	`}`
`105`	`106`	`$source = $this->_getArchiver($archivers[$i])->pack($source, $packed, $skipRoot);`
`106`		`- if ($interimSource && $i < count($archivers)) {`
	`107`	`+ if ($interimSource && $i < $archiversCount) {`
`107`	`108`	`unlink($interimSource);`
`108`	`109`	`}`
`109`	`110`	`$interimSource = $source;`