From 1a65a54431cc5677216c1c202f5e7a88d8f527ac Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Fri, 10 Aug 2018 21:16:54 +0200 Subject: [PATCH] Replaced all count() calls inside loops --- .../Catalog/Test/Unit/Model/Product/Type/PriceTest.php | 5 +++-- .../AssertProductsQtyAndStockStatusInAdminPanel.php | 3 ++- .../Test/TestCase/ShoppingCartPerCustomerTest.php | 3 ++- .../Test/TestStep/FillShippingInformationStep.php | 3 ++- .../Test/Constraint/AssertProductsQtyAfterOrderCancel.php | 3 ++- .../Model/Layer/Filter/Price/AlgorithmBaseTest.php | 3 ++- .../Model/ResourceModel/Indexer/PriceTest.php | 5 +++-- .../Magento/Sniffs/Annotation/MethodArgumentsSniff.php | 6 ++++-- .../Magento/Sniffs/EchoTags/ShortEchoSyntaxSniffTest.php | 3 ++- .../Magento/Sniffs/Translation/ConstantUsageSniffTest.php | 3 ++- lib/internal/Magento/Framework/Archive.php | 8 +++++--- lib/internal/Magento/Framework/Filter/Template.php | 3 ++- lib/internal/Magento/Framework/System/Ftp.php | 3 ++- .../src/Magento/Setup/Module/I18n/Parser/Adapter/Html.php | 6 ++++-- setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Js.php | 6 ++++-- 15 files changed, 41 insertions(+), 22 deletions(-) diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php index 99151d1c8dd39..e0e02c9721f19 100644 --- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php @@ -186,6 +186,7 @@ public function testTierPrices($priceScope, $expectedWebsiteId) $tp2->setQty(22); $tp2->setExtensionAttributes($tierPriceExtensionMock); $tps = [$tp1, $tp2]; + $tpsCount = sizeof($tps); // force the product to have null tier prices $this->product->setData($this::KEY_TIER_PRICE, null); @@ -200,7 +201,7 @@ public function testTierPrices($priceScope, $expectedWebsiteId) $this->assertTrue(is_array($tpArray)); $this->assertEquals(sizeof($tps), sizeof($tpArray)); - for ($i = 0; $i < sizeof($tps); $i++) { + for ($i = 0; $i < $tpsCount; $i++) { $tpData = $tpArray[$i]; $this->assertEquals($expectedWebsiteId, $tpData['website_id'], 'Website Id does not match'); $this->assertEquals($tps[$i]->getValue(), $tpData['price'], 'Price/Value does not match'); @@ -231,7 +232,7 @@ public function testTierPrices($priceScope, $expectedWebsiteId) $this->assertEquals(50, $tpRest->getExtensionAttributes()->getPercentageValue()); } - for ($i = 0; $i < sizeof($tps); $i++) { + for ($i = 0; $i < $tpsCount; $i++) { $this->assertEquals( $tps[$i]->getValue(), $tpRests[$i]->getValue(), diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductsQtyAndStockStatusInAdminPanel.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductsQtyAndStockStatusInAdminPanel.php index 6c9f2da9587c9..1546133a283b1 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductsQtyAndStockStatusInAdminPanel.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductsQtyAndStockStatusInAdminPanel.php @@ -29,8 +29,9 @@ public function processAssert( array $expectedQty, array $expectedStockStatus ) { + $productsCount = count($products); $actualQtyAndStockStatus = []; - for ($i = 0; $i < count($products); $i++) { + for ($i = 0; $i < $productsCount; $i++) { $catalogProductEdit->open(['id' => $products[$i]->getId()]); $productData = $catalogProductEdit->getProductForm()->getData($products[$i]); 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 index bdd54ce3559f9..7f6f4fc37129f 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/ShoppingCartPerCustomerTest.php +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/ShoppingCartPerCustomerTest.php @@ -93,9 +93,10 @@ public function test( ['products' => $productsData] )->run()['products']; + $checkoutDataCount = count($checkoutData); $customers = []; $cartFixtures = []; - for ($i = 0; $i < count($checkoutData); $i++) { + 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 index 67c1826f40a24..89335bd477762 100644 --- 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 = count($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 index 28259c8f6d93b..7d229bc358995 100644 --- 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 index 4b69bcd4615db..87ba4d7c2808c 100644 --- 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/integration/testsuite/Magento/Downloadable/Model/ResourceModel/Indexer/PriceTest.php b/dev/tests/integration/testsuite/Magento/Downloadable/Model/ResourceModel/Indexer/PriceTest.php index b070ef81a14b6..6620c4ece5318 100644 --- a/dev/tests/integration/testsuite/Magento/Downloadable/Model/ResourceModel/Indexer/PriceTest.php +++ b/dev/tests/integration/testsuite/Magento/Downloadable/Model/ResourceModel/Indexer/PriceTest.php @@ -52,6 +52,7 @@ public function testReindexEntity() ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 11, 'price' => 8.20], ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 21, 'price' => 7.55], ]; + $tierDataCount = count($tierData); $product->setData('tier_price', $tierData); $product->setData('special_price', $specialPrice); $this->productRepository->save($product); @@ -69,9 +70,9 @@ public function testReindexEntity() $resultTiers = $product->getTierPrices(); $this->assertTrue(is_array($resultTiers), 'Tiers not found'); - $this->assertEquals(count($tierData), count($resultTiers), 'Incorrect number of result tiers'); + $this->assertEquals($tierDataCount, count($resultTiers), 'Incorrect number of result tiers'); - for ($i = 0; $i < count($tierData); $i++) { + for ($i = 0; $i < $tierDataCount; $i++) { $this->assertEquals($tierData[$i]['price_qty'], $resultTiers[$i]->getQty(), 'Wrong tier price quantity'); $this->assertEquals($tierData[$i]['price'], $resultTiers[$i]->getValue(), 'Wrong tier price value'); } diff --git a/dev/tests/static/framework/Magento/Sniffs/Annotation/MethodArgumentsSniff.php b/dev/tests/static/framework/Magento/Sniffs/Annotation/MethodArgumentsSniff.php index 879334d8c553b..99a6c4cddeef1 100644 --- a/dev/tests/static/framework/Magento/Sniffs/Annotation/MethodArgumentsSniff.php +++ b/dev/tests/static/framework/Magento/Sniffs/Annotation/MethodArgumentsSniff.php @@ -123,8 +123,9 @@ private function getMethodArguments(File $phpcsFile, int $openParenthesisPtr, in */ private function getMethodParameters(array $paramDefinitions) : array { + $paramDefinitionsCount = count($paramDefinitions; $paramName = []; - for ($i = 0; $i < count($paramDefinitions); $i++) { + for ($i = 0; $i < $paramDefinitionsCount; $i++) { if (isset($paramDefinitions[$i]['paramName'])) { $paramName[] = $paramDefinitions[$i]['paramName']; } @@ -369,9 +370,10 @@ private function validateDuplicateAnnotationDoesnotExists( ) : void { $argumentsCount = count($methodArguments); $parametersCount = count($paramPointers); + $definitionsCount = count($paramDefinitions); if ($argumentsCount <= $parametersCount && $argumentsCount > 0) { $duplicateParameters = []; - for ($i = 0; $i < sizeof($paramDefinitions); $i++) { + for ($i = 0; $i < $definitionsCount; $i++) { if (isset($paramDefinitions[$i]['paramName'])) { $parameterContent = $paramDefinitions[$i]['paramName']; for ($j = $i + 1; $j < count($paramDefinitions); $j++) { diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniffTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniffTest.php index 0601c3eb26698..f85737ca6d399 100644 --- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniffTest.php +++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniffTest.php @@ -58,8 +58,9 @@ public function testEchoTagSniff($file, $stackPtr, $incorrectUsages) private function tokenizeString($fileContent) { $tokens = token_get_all($fileContent); + $tokensCount = count($tokens); $snifferTokens = []; - for ($i = 0; $i < count($tokens); $i++) { + for ($i = 0; $i < $tokensCount; $i++) { $code = is_array($tokens[$i]) ? $tokens[$i][0] : $tokens[$i]; $content = is_array($tokens[$i]) ? $tokens[$i][1] : $tokens[$i]; $snifferTokens[$i]['code'] = $code; 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 index 39ad80850dd30..35879f8e68e39 100644 --- 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 @@ -66,8 +66,9 @@ private function tokenizeString($fileContent) { $lineNumber = 1; $tokens = token_get_all($fileContent); + $tokensCount = count($tokens); $snifferTokens = []; - for ($i = 0; $i < count($tokens); $i++) { + 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/lib/internal/Magento/Framework/Archive.php b/lib/internal/Magento/Framework/Archive.php index d43c976431b51..5da0860fb5925 100644 --- a/lib/internal/Magento/Framework/Archive.php +++ b/lib/internal/Magento/Framework/Archive.php @@ -95,9 +95,10 @@ protected function _getArchivers($source) public function pack($source, $destination = 'packed.tgz', $skipRoot = false) { $archivers = $this->_getArchivers($destination); + $archiversCount = count($archivers); $interimSource = ''; - for ($i = 0; $i < count($archivers); $i++) { - if ($i == count($archivers) - 1) { + for ($i = 0; $i < $archiversCount; $i++) { + if ($i == $archiversCount - 1) { $packed = $destination; } else { $packed = dirname($destination) . '/~tmp-' . microtime(true) . $archivers[$i] . '.' . $archivers[$i]; @@ -126,7 +127,8 @@ public function unpack($source, $destination = '.', $tillTar = false, $clearInte { $archivers = $this->_getArchivers($source); $interimSource = ''; - for ($i = count($archivers) - 1; $i >= 0; $i--) { + $archiversCount = count($archivers); + for ($i = $archiversCount - 1; $i >= 0; $i--) { if ($tillTar && $archivers[$i] == self::TAPE_ARCHIVER) { break; } diff --git a/lib/internal/Magento/Framework/Filter/Template.php b/lib/internal/Magento/Framework/Filter/Template.php index 10b6a17ea57dc..76f7b6139a87f 100644 --- a/lib/internal/Magento/Framework/Filter/Template.php +++ b/lib/internal/Magento/Framework/Filter/Template.php @@ -372,9 +372,10 @@ protected function getVariable($value, $default = '{no_value_defined}') $tokenizer = new Template\Tokenizer\Variable(); $tokenizer->setString($value); $stackVars = $tokenizer->tokenize(); + $stackVarsCount = count($stackVars); $result = $default; $last = 0; - for ($i = 0; $i < count($stackVars); $i++) { + 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 index 8bf898965cbc3..1cc538fb7be82 100644 --- a/lib/internal/Magento/Framework/System/Ftp.php +++ b/lib/internal/Magento/Framework/System/Ftp.php @@ -54,9 +54,10 @@ public function mkdirRecursive($path, $mode = 0777) { $this->checkConnected(); $dir = explode("/", $path); + $dirCount = count($dir); $path = ""; $ret = true; - for ($i = 0; $i < count($dir); $i++) { + 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 index a4e3063abece4..9112192f6eb27 100644 --- 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 index 4095b12c9a6c6..0f6a402e2609c 100644 --- a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Js.php +++ b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Js.php @@ -22,7 +22,8 @@ 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); @@ -30,7 +31,8 @@ protected function _parse() } 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);