diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote branch 'symfony/master' into experimental

Browse Source
This commit is contained in:
Bernhard Schussek 2011-03-22 12:39:12 +01:00
commit 0ede9198ea
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/AsseticBundle/AsseticBundle.php
View File

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

2
src/Symfony/Bundle/DoctrineBundle/Command/GenerateEntitiesDoctrineCommand.php
View File

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

4
src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
View File

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