Merge remote-tracking branch 'mainline/develop' into MAGETWO-50158

Author: Volodymyr Zaets

dev/tests/integration/testsuite/Magento/Framework/Composer/ComposerInformationTest.php

@@ -209,4 +209,30 @@ public function testIsPackageInComposerJson()
         $packageName = 'magento/wrong-module-name';
         $this->assertFalse($composerInfo->isPackageInComposerJson($packageName));
     }
+
+    /**
+     * @param $composerDir string Directory under _files that contains composer files
+     *
+     * @dataProvider getRequiredPhpVersionDataProvider
+     */
+    public function testGetRootRepositories($composerDir)
+    {
+        $this->setupDirectory($composerDir);
+
+        /** @var \Magento\Framework\Composer\ComposerInformation $composerInfo */
+        $composerInfo = $this->objectManager->create(
+            'Magento\Framework\Composer\ComposerInformation',
+            [
+                'applicationFactory' => new MagentoComposerApplicationFactory(
+                    $this->composerJsonFinder,
+                    $this->directoryList
+                )
+            ]
+        );
+        if ($composerDir === 'testFromCreateProject') {
+            $this->assertEquals(['https://repo.magento.com/'], $composerInfo->getRootRepositories());
+        } else {
+            $this->assertEquals([], $composerInfo->getRootRepositories());
+        }
+    }
 }

dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/composer.json

@@ -10,6 +10,12 @@
     "require": {
         "magento/product-community-edition": "0.74.0-beta9"
     },
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://repo.magento.com/"
+        }
+    ],
     "require-dev": {
         "phpunit/phpunit": "4.1.0",
         "squizlabs/php_codesniffer": "1.5.3",

dev/tests/integration/testsuite/Magento/Setup/Model/UpdatePackagesCacheTest.php

@@ -9,7 +9,6 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Framework\Composer\ComposerJsonFinder;
 use Magento\Framework\Composer\MagentoComposerApplicationFactory;
-use Magento\Setup\Model\UpdatePackagesCache;
 
 /**
  * Tests Magento\Framework\ComposerInformation
@@ -81,12 +80,6 @@ public function testGetPackagesForUpdate()
 
         $this->setupDirectory('testSkeleton');
 
-        $objectManagerProvider = $this->getMock('Magento\Setup\Model\ObjectManagerProvider', [], [], '', false);
-        $objectManagerProvider
-            ->expects($this->any())
-            ->method('get')
-            ->willReturn($this->objectManager);
-
         /** @var UpdatePackagesCache $updatePackagesCache|\PHPUnit_Framework_MockObject_MockObject */
         $updatePackagesCache = $this->getMock('Magento\Setup\Model\UpdatePackagesCache', [], [], '', false);
 

dev/tests/static/testsuite/Magento/Test/Integrity/Di/CompilerTest.php

@@ -9,6 +9,7 @@
 
 use Magento\Framework\Api\Code\Generator\Mapper;
 use Magento\Framework\Api\Code\Generator\SearchResults;
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\ObjectManager\Code\Generator\Converter;
 use Magento\Framework\ObjectManager\Code\Generator\Factory;
@@ -42,11 +43,6 @@ class CompilerTest extends \PHPUnit_Framework_TestCase
      */
     protected $_compilationDir;
 
-    /**
-     * @var string
-     */
-    protected $_tmpDir;
-
     /**
      * @var \Magento\Framework\ObjectManager\Config\Mapper\Dom()
      */
@@ -70,17 +66,11 @@ protected function setUp()
         $basePath = BP;
         $basePath = str_replace('\\', '/', $basePath);
 
-        $this->_tmpDir = realpath(__DIR__) . '/tmp';
-        $this->_generationDir = $this->_tmpDir . '/generation';
-        if (!file_exists($this->_generationDir)) {
-            mkdir($this->_generationDir, 0777, true);
-        }
-        $this->_compilationDir = $this->_tmpDir . '/di';
-        if (!file_exists($this->_compilationDir)) {
-            mkdir($this->_compilationDir, 0777, true);
-        }
+        $directoryList = new DirectoryList($basePath);
+        $this->_generationDir = $directoryList->getPath(DirectoryList::GENERATION);
+        $this->_compilationDir = $directoryList->getPath(DirectoryList::DI);
 
-        $this->_command = 'php ' . $basePath . '/bin/magento setup:di:compile-multi-tenant --generation=%s --di=%s';
+        $this->_command = 'php ' . $basePath . '/bin/magento setup:di:compile';
 
         $booleanUtils = new \Magento\Framework\Stdlib\BooleanUtils();
         $constInterpreter = new \Magento\Framework\Data\Argument\Interpreter\Constant();
@@ -116,14 +106,6 @@ protected function setUp()
         $this->pluginValidator = new \Magento\Framework\Interception\Code\InterfaceValidator();
     }
 
-    protected function tearDown()
-    {
-        $filesystem = new \Magento\Framework\Filesystem\Driver\File();
-        if ($filesystem->isExists($this->_tmpDir)) {
-            $filesystem->deleteDirectory($this->_tmpDir);
-        }
-    }
-
     /**
      * Validate DI config file
      *
@@ -412,7 +394,7 @@ protected function pluginDataProvider()
     public function testCompiler()
     {
         try {
-            $this->_shell->execute($this->_command, [$this->_generationDir, $this->_compilationDir]);
+            $this->_shell->execute($this->_command);
         } catch (\Magento\Framework\Exception\LocalizedException $exception) {
             $this->fail($exception->getPrevious()->getMessage());
         }

dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php

@@ -247,117 +247,4 @@ public function testCopyPaste()
             "PHP Copy/Paste Detector has found error(s):" . PHP_EOL . $output
         );
     }
-
-    public function testDeadCode()
-    {
-        if (!class_exists('SebastianBergmann\PHPDCD\Analyser')) {
-            $this->markTestSkipped('PHP Dead Code Detector is not available.');
-        }
-        $analyser = new \SebastianBergmann\PHPDCD\Analyser();
-        $declared = [];
-        $called = [];
-        $collectedFiles = Files::init()->getPhpFiles(
-            Files::INCLUDE_APP_CODE
-            | Files::INCLUDE_PUB_CODE
-            | Files::INCLUDE_LIBS
-            | Files::INCLUDE_TEMPLATES
-            | Files::INCLUDE_TESTS
-            | Files::AS_DATA_SET
-            | Files::INCLUDE_NON_CLASSES
-        );
-        foreach ($collectedFiles as $file) {
-            $file = array_pop($file);
-            $analyser->analyseFile($file);
-            foreach ($analyser->getFunctionDeclarations() as $function => $declaration) {
-                $declaration = $declaration; //avoid "unused local variable" error and non-effective array_keys call
-                if (strpos($function, '::') === false) {
-                    $method = $function;
-                } else {
-                    list($class, $method) = explode('::', $function);
-                }
-                $declared[$method] = $function;
-            }
-            foreach ($analyser->getFunctionCalls() as $function => $usages) {
-                $usages = $usages; //avoid "unused local variable" error and non-effective array_keys call
-                if (strpos($function, '::') === false) {
-                    $method = $function;
-                } else {
-                    list($class, $method) = explode('::', $function);
-                }
-                $called[$method] = 1;
-            }
-        }
-
-        foreach ($called as $method => $value) {
-            $value = $value; //avoid "unused local variable" error and non-effective array_keys call
-            unset($declared[$method]);
-        }
-        $declared = $this->filterUsedObserverMethods($declared);
-        $declared = $this->filterUsedPersistentObserverMethods($declared);
-        $declared = $this->filterUsedCrontabObserverMethods($declared);
-        if ($declared) {
-            $this->fail('Dead code detected:' . PHP_EOL . implode(PHP_EOL, $declared));
-        }
-    }
-
-    /**
-     * @param string[] $methods
-     * @return string[]
-     * @throws \Exception
-     */
-    private function filterUsedObserverMethods($methods)
-    {
-        foreach (Files::init()->getConfigFiles('{*/events.xml,events.xml}') as $file) {
-            $file = array_pop($file);
-
-            $doc = new \DOMDocument();
-            $doc->load($file);
-            foreach ($doc->getElementsByTagName('observer') as $observer) {
-                /** @var \DOMElement $observer */
-                $method = $observer->getAttribute('method');
-                unset($methods[$method]);
-            }
-        }
-        return $methods;
-    }
-
-    /**
-     * @param string[] $methods
-     * @return string[]
-     * @throws \Exception
-     */
-    private function filterUsedPersistentObserverMethods($methods)
-    {
-        foreach (Files::init()->getConfigFiles('{*/persistent.xml,persistent.xml}') as $file) {
-            $file = array_pop($file);
-
-            $doc = new \DOMDocument();
-            $doc->load($file);
-            foreach ($doc->getElementsByTagName('method') as $method) {
-                /** @var \DOMElement $method */
-                unset($methods[$method->textContent]);
-            }
-        }
-        return $methods;
-    }
-
-    /**
-     * @param string[] $methods
-     * @return string[]
-     * @throws \Exception
-     */
-    private function filterUsedCrontabObserverMethods($methods)
-    {
-        foreach (Files::init()->getConfigFiles('{*/crontab.xml,crontab.xml}') as $file) {
-            $file = array_pop($file);
-
-            $doc = new \DOMDocument();
-            $doc->load($file);
-            foreach ($doc->getElementsByTagName('job') as $job) {
-                /** @var \DOMElement $job */
-                unset($methods[$job->getAttribute('method')]);
-            }
-        }
-        return $methods;
-    }
 }

lib/internal/Magento/Framework/App/Response/Http.php

@@ -156,7 +156,7 @@ public function representJson($content)
      */
     public function __sleep()
     {
-        return ['content', 'isRedirect', 'statusCode', 'context'];
+        return ['content', 'isRedirect', 'statusCode', 'context', 'headers'];
     }
 
     /**

lib/internal/Magento/Framework/Composer/ComposerInformation.php

@@ -44,6 +44,11 @@ class ComposerInformation
      */
     const COMPONENT_PACKAGE_TYPE = 'magento2-component';
 
+    /**
+     * Default composer repository key
+     */
+    const COMPOSER_DEFAULT_REPO_KEY = 'packagist';
+
     /**#@+
      * Composer command
      */
@@ -286,4 +291,22 @@ public function getPackageRequirements($name, $version)
         $package = $this->composer->getRepositoryManager()->findPackage($name, $version);
         return $package->getRequires();
     }
+
+    /**
+     * Returns all repository URLs, except local and packagists.
+     *
+     * @return string[]
+     */
+    public function getRootRepositories()
+    {
+        $repositoryUrls = [];
+
+        foreach ($this->composer->getConfig()->getRepositories() as $key => $repository) {
+            if ($key !== self::COMPOSER_DEFAULT_REPO_KEY) {
+                $repositoryUrls[] = $repository['url'];
+            }
+        }
+
+        return $repositoryUrls;
+    }
 }

lib/internal/Magento/Framework/Console/GenerationDirectoryAccess.php

@@ -57,7 +57,7 @@ public function check()
                 try {
                     $probeFilePath = $generationDirectoryPath . DIRECTORY_SEPARATOR . time();
                     $fileWriteFactory->create($probeFilePath, DriverPool::FILE, 'w');
-                    $directoryWrite->delete($probeFilePath);
+                    $driver->deleteFile($probeFilePath);
                 } catch (\Exception $e) {
                     return false;
                 }

lib/internal/Magento/Framework/ObjectManager/ObjectManager.php

@@ -27,7 +27,7 @@ class ObjectManager implements \Magento\Framework\ObjectManagerInterface
     protected $_sharedInstances = [];
 
     /**
-     * @var Config\Config
+     * @var ConfigInterface
      */
     protected $_config;
 

setup/src/Magento/Setup/Console/Command/DiCompileCommand.php

@@ -111,18 +111,6 @@ private function checkEnvironment()
             $messages[] = 'You cannot run this command because the Magento application is not installed.';
         }
 
-        /**
-         * By the time the command is able to execute, the Object Management configuration is already contaminated
-         * by old config info, and it's too late to just clear the files in code.
-         *
-         * TODO: reconfigure OM in runtime so DI resources can be cleared after command launches
-         *
-         */
-        $path = $this->directoryList->getPath(DirectoryList::DI);
-        if ($this->fileDriver->isExists($path)) {
-            $messages[] = "DI configuration must be cleared before running compiler. Please delete '$path'.";
-        }
-
         return $messages;
     }