MAGETWO-67871: Requesting autogenerated classes that are not in constructor cause fatal errors in production mode

- refactor

Author: Igor Melnikov

app/code/Magento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php

@@ -236,12 +236,14 @@ public function testTierPrices($priceScope, $expectedWebsiteId)
             $this->assertEquals($tps[$i]->getQty(), $tpData['price_qty'], 'Qty does not match');
         }
 
-        $tierPriceExtention = $this->getMockBuilder(ProductTierPriceExtensionInterface::class)
+        $tierPriceExtensionMock = $this->getMockBuilder(ProductTierPriceExtensionInterface::class)
             ->setMethods(['getWebsiteId', 'setWebsiteId', 'getPercentageValue', 'setPercentageValue'])
             ->getMock();
-        $tierPriceExtention->expects($this->any())->method('getPercentageValue')->willReturn(50);
-        $tierPriceExtention->expects($this->any())->method('setWebsiteId');
-        $this->tierPriceExtensionFactoryMock->expects($this->any())->method('create')->willReturn($tierPriceExtention);
+        $tierPriceExtensionMock->expects($this->any())->method('getPercentageValue')->willReturn(50);
+        $tierPriceExtensionMock->expects($this->any())->method('setWebsiteId');
+        $this->tierPriceExtensionFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($tierPriceExtensionMock);
 
         // test with the data retrieved as a REST object
         $tpRests = $this->model->getTierPrices($this->product);

app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/FileTest.php

@@ -21,7 +21,8 @@ class FileTest extends AbstractFormTestCase
      */
     private $urlEncode;
 
-    /**@var \PHPUnit_Framework_MockObject_MockObject|NotProtectedExtension
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|NotProtectedExtension
      */
     private $fileValidatorMock;
 

app/code/Magento/Directory/Model/Currency/Import/Webservicex.php

@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Directory\Model\Currency\Import;
 
 /**
@@ -14,9 +13,8 @@ class Webservicex extends \Magento\Directory\Model\Currency\Import\AbstractImpor
     /**
      * Currency converter url
      */
-    // @codingStandardsIgnoreStart
-    const CURRENCY_CONVERTER_URL = 'http://www.webservicex.net/CurrencyConvertor.asmx/ConversionRate?FromCurrency={{CURRENCY_FROM}}&ToCurrency={{CURRENCY_TO}}';
-    // @codingStandardsIgnoreEnd
+    const CURRENCY_CONVERTER_URL = 'http://www.webservicex.net/CurrencyConvertor.asmx/ConversionRate'
+        . '?FromCurrency={{CURRENCY_FROM}}&ToCurrency={{CURRENCY_TO}}';
 
     /**
      * Http Client Factory

app/code/Magento/Quote/Model/QuoteRepository.php

@@ -47,6 +47,7 @@ class QuoteRepository implements \Magento\Quote\Api\CartRepositoryInterface
 
     /**
      * @var \Magento\Quote\Model\ResourceModel\Quote\Collection
+     * @deprecated
      */
     protected $quoteCollection;
 
@@ -81,6 +82,8 @@ class QuoteRepository implements \Magento\Quote\Api\CartRepositoryInterface
     private $quoteCollectionFactory;
 
     /**
+     * Constructor
+     *
      * @param QuoteFactory $quoteFactory
      * @param StoreManagerInterface $storeManager
      * @param \Magento\Quote\Model\ResourceModel\Quote\Collection $quoteCollection
@@ -232,7 +235,7 @@ protected function getQuoteCollection()
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
-        $this->quoteCollection = $this->getQuoteCollection();
+        $this->quoteCollection = $this->quoteCollectionFactory->create();
         /** @var \Magento\Quote\Api\Data\CartSearchResultsInterface $searchData */
         $searchData = $this->searchResultsDataFactory->create();
         $searchData->setSearchCriteria($searchCriteria);

app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Conditions.php

@@ -143,7 +143,7 @@ protected function addTabToForm($model, $fieldsetId = 'conditions_fieldset', $fo
     {
         if (!$model) {
             $id = $this->getRequest()->getParam('id');
-            $model = $this->getRuleFactory()->create();
+            $model = $this->ruleFactory->create();
             $model->load($id);
         }
         $conditionsFieldSetId = $model->getConditionsFieldSetId($formName);

dev/tests/static/framework/Magento/TestFramework/Utility/AutogeneratedClassNotInConstructorFinder.php

@@ -45,7 +45,7 @@ public function find($fileContent)
 
         if (isset($shortNameMatches[2])) {
             foreach ($shortNameMatches[2] as $shortName) {
-                if (strpos($shortName, 'Magento') === false && substr($shortName, 0, 1) !== '\\') {
+                if (substr($shortName, 0, 1) !== '\\') {
                     $class = $this->matchPartialNamespace($fileContent, $shortName);
                 } else {
                     $class = $shortName;
@@ -85,8 +85,8 @@ private function getConstructorArguments($className)
             $classParameters = $constructor->getParameters();
             foreach ($classParameters as $classParameter) {
                 if ($classParameter->getType()) {
-                    $parameterName = $classParameter->getType();
-                    $arguments[] = ltrim($parameterName, '\\');
+                    $parameterType = $classParameter->getType();
+                    $arguments[] = ltrim($parameterType, '\\');
                 }
             }
         }

dev/tests/static/framework/Magento/TestFramework/Utility/ChangedFiles.php

@@ -7,7 +7,6 @@
 namespace Magento\TestFramework\Utility;
 
 use Magento\Framework\App\Utility\Files;
-use Magento\TestFramework\Utility\File\RegexIteratorFactory;
 
 /**
  * A helper to gather various changed files
@@ -25,11 +24,12 @@ class ChangedFiles
      * Returns array of PHP-files, that use or declare Magento application classes and Magento libs
      *
      * @param string $changedFilesList
+     * @param int $fileTypes
      * @return array
      */
-    public static function getPhpFiles($changedFilesList)
+    public static function getPhpFiles($changedFilesList, $fileTypes = 0)
     {
-        $fileUtilities = new File(Files::init(), new RegexIteratorFactory());
+        $fileUtilities = Files::init();
         if (isset($_ENV['INCREMENTAL_BUILD'])) {
             $phpFiles = [];
             foreach (glob($changedFilesList) as $listFile) {
@@ -43,10 +43,10 @@ function (&$file) {
             );
             if (!empty($phpFiles)) {
                 $phpFiles = Files::composeDataSets($phpFiles);
-                $phpFiles = array_intersect_key($phpFiles, $fileUtilities->getPhpFiles());
+                $phpFiles = array_intersect_key($phpFiles, $fileUtilities->getPhpFiles($fileTypes));
             }
         } else {
-            $phpFiles = $fileUtilities->getPhpFiles();
+            $phpFiles = $fileUtilities->getPhpFiles($fileTypes);
         }
 
         return $phpFiles;

dev/tests/static/framework/Magento/TestFramework/Utility/ClassNameExtractor.php

@@ -17,8 +17,8 @@ public function getNameWithNamespace($fileContent)
     {
         $namespace = $this->getNamespace($fileContent);
         $name = $this->getName($fileContent);
-        if ($namespace && $name) {
-            return $namespace . '\\' . $name;
+        if ($name) {
+            return $namespace ? $namespace . '\\' . $name : $name;
         }
         return false;
     }
@@ -34,7 +34,7 @@ public function getName($fileContent)
         $namespace = $this->getNamespace($fileContent);
         if (isset($namespace)) {
             preg_match_all(
-                '/^(class|abstract\sclass|interface)\s([a-z0-9]+)(\sextends|\simplements|$)/im',
+                '/^\s*(class|abstract\sclass|interface)\s+([a-z0-9]+)(\s+(extends|implements)|\s*$)/im',
                 $fileContent,
                 $classMatches
             );

dev/tests/static/framework/Magento/TestFramework/Utility/File.php

@@ -20,8 +20,9 @@
 $dirSearch = new DirSearch($componentRegistrar, new ReadFactory(new DriverPool()));
 $themePackageList = new ThemePackageList($componentRegistrar, new ThemePackageFactory());
 $serializer = new \Magento\Framework\Serialize\Serializer\Json();
+$regexIteratorFactory = new Magento\Framework\App\Utility\RegexIteratorFactory();
 \Magento\Framework\App\Utility\Files::setInstance(
-    new Files($componentRegistrar, $dirSearch, $themePackageList, $serializer)
+    new Files($componentRegistrar, $dirSearch, $themePackageList, $serializer, $regexIteratorFactory)
 );
 
 /**