Merge branch '2.3'

* 2.3:
  fixed CS
  Readded Doctrine binaries in the ZIP file and fixed them for the TGZ file
  prepareDeploymentTarget script handler

Conflicts:
	Composer/ScriptHandler.php

Composer/ScriptHandler.php

@@ -93,6 +93,29 @@ protected static function hasDirectory(CommandEvent $event, $configName, $path,
         return true;
     }
 
+    /**
+     * Sets up deployment target specific features.
+     * Could be custom web server configs, boot command files etc.
+     *
+     * @param $event CommandEvent An instance
+     */
+    public static function prepareDeploymentTarget(CommandEvent $event)
+    {
+        self::prepareDeploymentTargetHeroku($event);
+    }
+
+    protected static function prepareDeploymentTargetHeroku(CommandEvent $event)
+    {
+        $options = self::getOptions($event);
+        if (($stack = getenv('STACK')) && ($stack == 'cedar' || $stack == 'cedar-14')) {
+            $fs = new Filesystem();
+            if (!$fs->exists('Procfile')) {
+                $event->getIO()->write('Heroku deploy detected; creating default Procfile for "web" dyno');
+                $fs->dumpFile('Procfile', sprintf('web: $(composer config bin-dir)/heroku-php-apache2 %s/', $options['symfony-web-dir']));
+            }
+        }
+    }
+
     /**
      * Clears the Symfony cache.
      *

Resources/bin/build.sh

@@ -60,8 +60,8 @@ cd /tmp/Symfony
 TARGET=/tmp/Symfony/vendor
 
 # Doctrine
-cd $TARGET/doctrine/orm && rm -rf UPGRADE* build* bin tests tools lib/vendor
-cd $TARGET/doctrine/dbal && rm -rf bin build* tests lib/vendor
+cd $TARGET/doctrine/orm && rm -rf UPGRADE* build* tests tools lib/vendor
+cd $TARGET/doctrine/dbal && rm -rf build* tests lib/vendor
 cd $TARGET/doctrine/common && rm -rf build* tests lib/vendor
 if [ -d $TARGET/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle ]; then
     cd $TARGET/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle && rm -rf Tests Resources/doc
@@ -114,6 +114,7 @@ find $TARGET -name .gitignore | xargs rm -rf -
 find $TARGET -name .gitmodules | xargs rm -rf -
 find $TARGET -name .svn | xargs rm -rf -
 
+# With vendors
 cd /tmp
 tar zcpf $DIR/Symfony_Standard_Vendors_$VERSION.tgz Symfony
 sudo rm -f $DIR/Symfony_Standard_Vendors_$VERSION.zip