Merge remote branch 'symfony/master' into experimental

src/Symfony/Bundle/AsseticBundle/AsseticBundle.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\AsseticBundle;
 
+use Symfony\Bundle\AsseticBundle\DependencyInjection\Compiler\AssetFactoryPass;
 use Symfony\Bundle\AsseticBundle\DependencyInjection\Compiler\AssetManagerPass;
 use Symfony\Bundle\AsseticBundle\DependencyInjection\Compiler\FilterManagerPass;
 use Symfony\Bundle\AsseticBundle\DependencyInjection\Compiler\TemplatingPass;
@@ -29,6 +30,7 @@ class AsseticBundle extends Bundle
         parent::build($container);
 
         $container->addCompilerPass(new TemplatingPass());
+        $container->addCompilerPass(new AssetFactoryPass());
         $container->addCompilerPass(new AssetManagerPass());
         $container->addCompilerPass(new FilterManagerPass());
     }

src/Symfony/Bundle/DoctrineBundle/Command/GenerateEntitiesDoctrineCommand.php

@@ -60,7 +60,7 @@ EOT
             $entityGenerator = $this->getEntityGenerator();
 
             foreach ($metadatas as $metadata) {
-                if ($filterEntity && $metadata->reflClass->getShortName() == $filterEntity) {
+                if ($filterEntity && $metadata->reflClass->getShortName() !== $filterEntity) {
                     continue;
                 }
 

src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php

@@ -41,8 +41,8 @@ class CacheClearCommand extends Command
 The <info>cache:clear</info> command clears the application cache for a given environment
 and debug mode:
 
-<info>./app/console cache:clear dev</info>
-<info>./app/console cache:clear prod --without-debug</info>
+<info>./app/console cache:clear --env=dev</info>
+<info>./app/console cache:clear --env=prod --without-debug</info>
 EOF
             )
         ;