Merge branch 'hotfix/composer-installer-ns' into develop

Forward port #40

CHANGELOG.md

@@ -48,6 +48,8 @@ Fourth release candidate.
   as pipeline middleware; this fixes an issue when using the zend-view renderer
   with the `url()` helper whereby the `UrlHelper` was being registered as a
   route result observer too late to receive the `RouteResult`.
+- [#40](https://github.com/zendframework/zend-expressive-skeleton/pull/40)
+  renames the namespace for the installer to `ExpressiveInstaller`.
 
 ## 1.0.0rc3 - 2015-12-07
 

composer.json

@@ -29,7 +29,8 @@
     },
     "autoload": {
         "psr-4": {
-            "App\\": "src/App/"
+            "App\\": "src/App/",
+            "ExpressiveInstaller\\": "src/ExpressiveInstaller/"
         }
     },
     "autoload-dev": {
@@ -38,8 +39,8 @@
         }
     },
     "scripts": {
-        "pre-install-cmd": "App\\Composer\\OptionalPackages::install",
-        "pre-update-cmd": "App\\Composer\\OptionalPackages::install",
+        "pre-install-cmd": "ExpressiveInstaller\\OptionalPackages::install",
+        "pre-update-cmd": "ExpressiveInstaller\\OptionalPackages::install",
         "check": [
             "@cs",
             "@test"

src/App/Composer/OptionalPackages.php → src/ExpressiveInstaller/OptionalPackages.php

@@ -7,7 +7,7 @@
  * @license   https://github.com/zendframework/zend-expressive-skeleton/blob/master/LICENSE.md New BSD License
  */
 
-namespace App\Composer;
+namespace ExpressiveInstaller;
 
 use Composer\Composer;
 use Composer\Factory;
@@ -28,8 +28,8 @@
  * Add this script to composer.json:
  *
  *  "scripts": {
- *      "pre-update-cmd": "App\\Composer\\OptionalPackages::install",
- *      "pre-install-cmd": "App\\Composer\\OptionalPackages::install"
+ *      "pre-update-cmd": "ExpressiveInstaller\\OptionalPackages::install",
+ *      "pre-install-cmd": "ExpressiveInstaller\\OptionalPackages::install"
  *  },
  */
 class OptionalPackages
@@ -178,6 +178,9 @@ public static function install(Event $event)
             unset(self::$composerDefinition['scripts']);
         }
 
+        // Remove installer script autoloading rules
+        unset(self::$composerDefinition['autoload']['psr-4']['ExpressiveInstaller\\']);
+
         // Update composer definition
         $json->write(self::$composerDefinition);