Merge branch 'master' of https://github.com/magento-hackathon/magento-composer-installer

Conflicts:
	README.md
	src/MagentoHackathon/Composer/Magento/Installer.php
	src/MagentoHackathon/Composer/Magento/Plugin.php
	src/MagentoHackathon/Composer/Magento/ProjectConfig.php
	tests/FullStackTest/home/composer.json
	tests/MagentoHackathon/Composer/Magento/FullStack/GlobalPluginTest.php

Author: David Verholen

README.md

@@ -40,6 +40,33 @@ other support contacts
 - Error message: `Fatal error: Call to undefined method MagentoHackathon\Composer\Magento\Installer::setDeployManager()` happens when you update from 1.x to 2.x, as we switched from pure installer to plugin.
 
 Solution: remove the `vendor` directory and the `composer.lock` and do a fresh install.
+=======
+## Known issues
+
+### When upgrading from 1.x to 2.x 
+
+The update from 1.x to 2.x has to be done with no plugins as otherwise a fatal error will be triggered (which does not hurt, just run the update again and it runs through).
+
+- Error message: `Fatal error: Call to undefined method MagentoHackathon\Composer\Magento\Installer::setDeployManager()` 
+
+To prevent this error, upgrade only *magento-composer-installer* first:
+
+```composer update --no-plugins --no-dev "magento-hackathon/magento-composer-installer"``` 
+
+Fallback Solutions:
+
+1. execute `composer install` two times.
+2. remove the `vendor` directory and `composer.lock` and do a fresh install.
+
+### Timeouts and slow downloading. 
+
+Mostly caused by outtages of Github, Repositories or the Internet. This is a common problem with having all 
+packges remote.
+
+For all of this Issues you can make use of the commercial [Toran Proxy](https://toranproxy.com/).
+It also allows hosting of private packages and speeds up the whole downloading process.
+
+Another alternative is to look into [Satis](https://github.com/composer/satis), bare git mirrors and repository aliasing.
 
 ## Usage
 

composer.json

@@ -54,6 +54,7 @@
     "suggest":{
         "theseer/autoload": "~1.14",
         "zetacomponents/console-tools": "dev-master",
+        "colinmollenhour/modman": "*",
         "magento-hackathon/composer-command-integrator":"*"
     },
     "autoload":{

doc/Mapping.md

@@ -5,9 +5,9 @@ Mapping
 
 There are several ways how the mapping from files in the package into the Magento source is accomplished:
 
-1. [modman](https://github.com/colinmollenhour/modman) file
+1. A mapping in the composer.json
 2. MagentoConnect package.xml file
-3. A mapping in the composer.json
+3. [modman](https://github.com/colinmollenhour/modman) file
 
 As long as one of these mappings can be found, Magento modules are installable.
 

tests/FullStackTest/home/composer.json

@@ -13,6 +13,10 @@
         "magento-hackathon/magento-composer-installer": "*"
     },
     "extra": {
+<<<<<<< HEAD
         "magento-root-dir": "root"
+=======
+
+>>>>>>> f6e6c2c58d5298e4f1388109ae09eec97482cd63
     }
 }

tests/MagentoHackathon/Composer/Magento/FullStack/GlobalPluginTest.php

@@ -31,7 +31,11 @@ protected function prepareCleanDirectories()
     public function testGlobalInstall()
     {
         $process = new Process(
+<<<<<<< HEAD
             self::getComposerCommand().' global install ' . self::getComposerArgs(),
+=======
+            self::getComposerCommand().' global install',
+>>>>>>> f6e6c2c58d5298e4f1388109ae09eec97482cd63
             self::getProjectRoot()
         );
         $process->setEnv( array('COMPOSER_HOME'=>self::getBasePath().'/home'));
@@ -44,7 +48,11 @@ public function testGlobalUpdate()
     {
 
         $process = new Process(
+<<<<<<< HEAD
             self::getComposerCommand().' global update ' . self::getComposerArgs(),
+=======
+            self::getComposerCommand().' global update',
+>>>>>>> f6e6c2c58d5298e4f1388109ae09eec97482cd63
             self::getProjectRoot()
         );
         $process->setEnv( array('COMPOSER_HOME'=>self::getBasePath().'/home'));
@@ -53,4 +61,8 @@ public function testGlobalUpdate()
         $this->assertProcess($process);
     }
 
+<<<<<<< HEAD
 }
+=======
+}
+>>>>>>> f6e6c2c58d5298e4f1388109ae09eec97482cd63