Merge remote-tracking branch 'origin/master' into MAGETWO-51439-git-repo-in-composer

ark99 · ark99 · commit 44c6a3bbfbfb · 2016-04-27T17:12:34.000-05:00
diff --git a/LICENSE_AFL.txt b/LICENSE_AFL.txt
@@ -45,4 +45,4 @@ Licensed under the Academic Free License version 3.0
 
   15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
 
-  16. Modification of This License. This License is Copyright � 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
+  16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
diff --git a/composer.json b/composer.json
@@ -2,14 +2,14 @@
   "name": "magento/composer",
   "description": "Magento composer library helps to instantiate Composer application and run composer commands.",
   "type": "library",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "license": [
     "OSL-3.0",
     "AFL-3.0"
   ],
   "require": {
-    "php": "~5.5.0|~5.6.0",
-    "composer/composer": "1.0.0-alpha10",
+    "php": "~5.5.0|~5.6.0|~7.0.0",
+    "composer/composer": "1.0.0-beta1",
     "symfony/console": "~2.3 <2.7"
   },
   "require-dev": {
diff --git a/src/ConsoleArrayInputFactory.php b/src/ConsoleArrayInputFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2015 Magento. All rights reserved.
+ * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/src/InfoCommand.php b/src/InfoCommand.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2015 Magento. All rights reserved.
+ * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 
@@ -28,6 +28,12 @@ class InfoCommand
      */
     const NAME = 'name';
 
+    /**
+     * New versions
+     */
+    const NEW_VERSIONS = 'new_versions';
+
+
     /**
      * @var MagentoComposerApplication
      */
@@ -52,10 +58,12 @@ public function __construct(MagentoComposerApplication $magentoComposerApplicati
      */
     public function run($package, $installed = false)
     {
+        $showAllPackages = !$installed;
         $commandParameters = [
             'command' => 'info',
             'package' => $package,
-            '-i' => $installed
+            '-i' => $installed,
+            '--all' => $showAllPackages,
         ];
 
         try {
@@ -64,8 +72,8 @@ public function run($package, $installed = false)
             return false;
         }
 
-        $rawLines = explode(PHP_EOL, $output);
-        $result = [];
+        $rawLines = explode("\n", str_replace("\r\n", "\n", $output));
+
         foreach ($rawLines as $line) {
             $chunk = explode(':', $line);
             if (count($chunk) === 2) {
@@ -91,10 +99,11 @@ public function run($package, $installed = false)
     private function extractVersions($packageInfo)
     {
         $versions = explode(', ', $packageInfo[self::VERSIONS]);
+        $packageInfo[self::NEW_VERSIONS] = [];
+        $packageInfo[self::AVAILABLE_VERSIONS] = [];
 
         if (count($versions) === 1) {
             $packageInfo[self::CURRENT_VERSION] = str_replace('* ', '', $packageInfo[self::VERSIONS]);
-            $packageInfo[self::AVAILABLE_VERSIONS] = [];
         } else {
             $currentVersion = array_values(preg_grep("/^\*.*/", $versions));
             if ($currentVersion) {
@@ -106,6 +115,18 @@ private function extractVersions($packageInfo)
             $packageInfo[self::AVAILABLE_VERSIONS] = array_values(preg_grep("/^\*.*/", $versions, PREG_GREP_INVERT));
         }
 
+        if (count($packageInfo[self::AVAILABLE_VERSIONS]) > 0) {
+            if ($packageInfo[self::CURRENT_VERSION]) {
+                foreach ($packageInfo[self::AVAILABLE_VERSIONS] as $version) {
+                    if (version_compare($packageInfo[self::CURRENT_VERSION], $version, '<')) {
+                        $packageInfo[self::NEW_VERSIONS][] = $version;
+                    }
+                }
+            } else {
+                $packageInfo[self::NEW_VERSIONS] = $packageInfo[self::AVAILABLE_VERSIONS];
+            }
+        }
+
         return $packageInfo;
     }
 }
diff --git a/src/MagentoComposerApplication.php b/src/MagentoComposerApplication.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2015 Magento. All rights reserved.
+ * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/src/RequireUpdateDryRunCommand.php b/src/RequireUpdateDryRunCommand.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2015 Magento. All rights reserved.
+ * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/tests/Composer/ConsoleArrayInputFactoryTest.php b/tests/Composer/ConsoleArrayInputFactoryTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2015 Magento. All rights reserved.
+ * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/tests/Composer/InfoCommandTest.php b/tests/Composer/InfoCommandTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2015 Magento. All rights reserved.
+ * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 
@@ -61,7 +61,8 @@ public function testRunInstalled()
                 'type' => 'library',
                 'names' => '3rdp/a',
                 'current_version' => '1.0.0',
-                'available_versions' => []
+                'available_versions' => [],
+                'new_versions' => []
             ],
             $result
         );
@@ -97,6 +98,10 @@ public function getCommandOutputDataProvider()
                     'available_versions' => [
                         '1.0.0',
                         '1.1.0'
+                    ],
+                    'new_versions' => [
+                        '1.0.0',
+                        '1.1.0'
                     ]
                 ]
             ],
@@ -123,6 +128,9 @@ public function getCommandOutputDataProvider()
                         '1.0.0',
                         '1.1.0',
                         '1.2.0'
+                    ],
+                    'new_versions' => [
+                        '1.2.0'
                     ]
                 ]
             ],
diff --git a/tests/Composer/MagentoComposerApplicationTest.php b/tests/Composer/MagentoComposerApplicationTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2015 Magento. All rights reserved.
+ * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/tests/Composer/RequireUpdateDryRunCommandTest.php b/tests/Composer/RequireUpdateDryRunCommandTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2015 Magento. All rights reserved.
+ * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 

Original file line number	Diff line number	Diff line change
`@@ -45,4 +45,4 @@ Licensed under the Academic Free License version 3.0`
`45`	`45`
`46`	`46`	`15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.`
`47`	`47`
`48`		- 16. Modification of This License. This License is Copyright � 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
	`48`	+ 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.