Merge branch 'MAGETWO-63243' into 2.0-pr10

Author: DianaRusin

dev/tests/static/testsuite/Magento/Test/Legacy/CopyrightTest.php

@@ -17,7 +17,7 @@ public function testCopyright()
         $invoker(
             function ($filename) {
                 $fileText = file_get_contents($filename);
-                if (strpos($fileText, 'Copyright © ' . date('Y')) === false) {
+                if (strpos($fileText, 'Copyright © 2016') === false) {
                     $this->fail('Copyright is missing or has wrong year in ' . $filename);
                 }
             },

setup/src/Magento/Setup/Model/UninstallDependencyCheck.php

@@ -15,6 +15,13 @@
  */
 class UninstallDependencyCheck
 {
+    /**
+     * Need to exclude these packages from dependencies because of changes in composer/composer package
+     * It consider now that all packages are depends on root package
+     * @var array
+     */
+    private $rootDependencies = ['magento/magento2ce', 'magento/magento2ee'];
+
     /**
      * @var ComposerInformation
      */
@@ -61,6 +68,7 @@ public function runUninstallReadinessCheck(array $packages)
         try {
             $packagesAndTypes = $this->composerInfo->getRootRequiredPackageTypesByName();
             $dependencies = $this->packageDependencyChecker->checkDependencies($packages, true);
+            $dependencies = $this->excludeRootDependencies($dependencies);
             $messages = [];
             $themes = [];
 
@@ -101,4 +109,20 @@ public function runUninstallReadinessCheck(array $packages)
             return ['success' => false, 'error' => $message];
         }
     }
+
+    /**
+     * Exclude root dependencies like 'magento/magento2ce' or 'magento/magento2ee'
+     *
+     * @param array $dependencies
+     * @return array
+     */
+    private function excludeRootDependencies($dependencies)
+    {
+        $result = [];
+        foreach ($dependencies as $packageName => $packageDependencies) {
+            $result[$packageName] = array_values(array_diff($packageDependencies, $this->rootDependencies));
+        }
+
+        return $result;
+    }
 }

setup/src/Magento/Setup/Test/Unit/Model/UninstallDependencyCheckTest.php

@@ -37,23 +37,23 @@ class UninstallDependencyCheckTest extends \PHPUnit_Framework_TestCase
 
     public function setup()
     {
-        $this->composerInfo = $this->getMock('Magento\Framework\Composer\ComposerInformation', [], [], '', false);
+        $this->composerInfo = $this->getMock(\Magento\Framework\Composer\ComposerInformation::class, [], [], '', false);
         $this->packageDependencyChecker = $this->getMock(
-            'Magento\Framework\Composer\DependencyChecker',
+            \Magento\Framework\Composer\DependencyChecker::class,
             [],
             [],
             '',
             false
         );
         $this->themeDependencyChecker = $this->getMock(
-            'Magento\Theme\Model\Theme\ThemeDependencyChecker',
+            \Magento\Theme\Model\Theme\ThemeDependencyChecker::class,
             [],
             [],
             '',
             false
         );
         $this->themeDependencyCheckerFactory = $this->getMock(
-            'Magento\Setup\Model\ThemeDependencyCheckerFactory',
+            \Magento\Setup\Model\ThemeDependencyCheckerFactory::class,
             [],
             [],
             '',
@@ -81,7 +81,12 @@ public function testRunUninstallReadinessCheck()
         $this->packageDependencyChecker->expects($this->once())
             ->method('checkDependencies')
             ->with(array_keys($packages))
-            ->willReturn([]);
+            ->willReturn([
+                'verndor/module' => ['magento/magento2ce'],
+                'verndor/theme' => ['magento/magento2ee'],
+                'verndor/metapackage' => ['magento/magento2ce'],
+                'verndor/language' => ['magento/magento2ce'],
+            ]);
 
         $this->themeDependencyChecker->expects($this->once())
             ->method('checkChildThemeByPackagesName')
@@ -105,7 +110,12 @@ public function testRunUninstallReadinessCheckWithError()
         $this->packageDependencyChecker->expects($this->once())
             ->method('checkDependencies')
             ->with(array_keys($packages))
-            ->willReturn([]);
+            ->willReturn([
+                'verndor/module' => ['magento/magento2ce'],
+                'verndor/theme' => ['magento/magento2ee'],
+                'verndor/metapackage' => ['magento/magento2ce'],
+                'verndor/language' => ['magento/magento2ce'],
+            ]);
 
         $this->themeDependencyChecker->expects($this->once())
             ->method('checkChildThemeByPackagesName')