diff --git a/src/Symfony/Bundle/AsseticBundle/CacheWarmer/AssetWriterCacheWarmer.php b/src/Symfony/Bundle/AsseticBundle/CacheWarmer/AssetWriterCacheWarmer.php index 0e840d87e4..034a45a6e0 100644 --- a/src/Symfony/Bundle/AsseticBundle/CacheWarmer/AssetWriterCacheWarmer.php +++ b/src/Symfony/Bundle/AsseticBundle/CacheWarmer/AssetWriterCacheWarmer.php @@ -14,27 +14,20 @@ namespace Symfony\Bundle\AsseticBundle\CacheWarmer; use Assetic\AssetManager; use Assetic\AssetWriter; use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmer; -use Symfony\Component\EventDispatcher\Event; -use Symfony\Component\EventDispatcher\EventDispatcher; class AssetWriterCacheWarmer extends CacheWarmer { protected $am; protected $writer; - protected $dispatcher; - public function __construct(AssetManager $am, AssetWriter $writer, EventDispatcher $dispatcher) + public function __construct(AssetManager $am, AssetWriter $writer) { $this->am = $am; $this->writer = $writer; - $this->dispatcher = $dispatcher; } public function warmUp($cacheDir) { - // notify an event so custom stream wrappers can be registered lazily - $this->dispatcher->notify(new Event(null, 'assetic.write')); - $this->writer->writeManagerAssets($this->am); } diff --git a/src/Symfony/Bundle/AsseticBundle/Resources/config/asset_writer.xml b/src/Symfony/Bundle/AsseticBundle/Resources/config/asset_writer.xml index 54dbb83bc9..855caa06ec 100644 --- a/src/Symfony/Bundle/AsseticBundle/Resources/config/asset_writer.xml +++ b/src/Symfony/Bundle/AsseticBundle/Resources/config/asset_writer.xml @@ -14,7 +14,6 @@ - %assetic.write_to% diff --git a/src/Symfony/Bundle/AsseticBundle/Tests/CacheWarmer/AssetWriterCacheWarmerTest.php b/src/Symfony/Bundle/AsseticBundle/Tests/CacheWarmer/AssetWriterCacheWarmerTest.php index f99cdd5a2a..35e67cd129 100644 --- a/src/Symfony/Bundle/AsseticBundle/Tests/CacheWarmer/AssetWriterCacheWarmerTest.php +++ b/src/Symfony/Bundle/AsseticBundle/Tests/CacheWarmer/AssetWriterCacheWarmerTest.php @@ -12,7 +12,6 @@ namespace Symfony\Bundle\AsseticBundle\Tests\CacheWarmer; use Symfony\Bundle\AsseticBundle\CacheWarmer\AssetWriterCacheWarmer; -use Symfony\Component\EventDispatcher\Event; class AssetWriterCacheWarmerTest extends \PHPUnit_Framework_TestCase { @@ -29,18 +28,12 @@ class AssetWriterCacheWarmerTest extends \PHPUnit_Framework_TestCase $writer = $this->getMockBuilder('Assetic\\AssetWriter') ->disableOriginalConstructor() ->getMock(); - $dispatcher = $this->getMock('Symfony\\Component\\EventDispatcher\\EventDispatcher'); - $event = new Event(null, 'assetic.write'); - - $dispatcher->expects($this->once()) - ->method('notify') - ->with($event); $writer->expects($this->once()) ->method('writeManagerAssets') ->with($am); - $warmer = new AssetWriterCacheWarmer($am, $writer, $dispatcher); + $warmer = new AssetWriterCacheWarmer($am, $writer); $warmer->warmUp('/path/to/cache'); } }