[WIP] Added resolve events to cache manager

Events/PostResolveEvent.php

@@ -0,0 +1,44 @@
+<?php
+namespace Liip\ImagineBundle\Events;
+
+use Symfony\Component\EventDispatcher\Event;
+use Liip\ImagineBundle\Imagine\Cache\Resolver\ResolverInterface;
+
+class PostResolveEvent extends Event
+{
+    protected $resolver;
+
+    protected $path;
+
+    protected $filter;
+
+    protected $url;
+
+    public function __construct(ResolverInterface $resolver, $path, $filter, $url)
+    {
+        $this->resolver = $resolver;
+        $this->path = $path;
+        $this->filter = $filter;
+        $this->url = $url;
+    }
+
+    public function getResolver()
+    {
+        return $this->path;
+    }
+
+    public function getPath()
+    {
+        return $this->path;
+    }
+
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    public function getUrl()
+    {
+        return $this->url;
+    }
+}

Events/PreResolveEvent.php

@@ -0,0 +1,35 @@
+<?php
+namespace Liip\ImagineBundle\Events;
+
+use Symfony\Component\EventDispatcher\Event;
+use Liip\ImagineBundle\Imagine\Cache\Resolver\ResolverInterface;
+
+class PreResolveEvent extends Event
+{
+    protected $resolver;
+
+    protected $path;
+
+    protected $filter;
+
+    public function __construct(ResolverInterface $resolver, $path, $filter)
+    {
+        $this->path = $path;
+        $this->filter = $filter;
+    }
+
+    public function getResolver()
+    {
+        return $this->path;
+    }
+
+    public function getPath()
+    {
+        return $this->path;
+    }
+
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+}

Imagine/Cache/CacheManager.php

@@ -8,6 +8,11 @@
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpKernel\UriSigner;
 use Symfony\Component\Routing\RouterInterface;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\EventDispatcher\Event;
+use Liip\ImagineBundle\ImagineEvents;
+use Liip\ImagineBundle\Events\PreResolveEvent;
+use Liip\ImagineBundle\Events\PostResolveEvent;
 
 class CacheManager
 {
@@ -31,6 +36,8 @@ class CacheManager
      */
     protected $uriSigner;
 
+    protected $dispatcher;
+
     /**
      * @var string
      */
@@ -44,11 +51,17 @@ class CacheManager
      * @param UriSigner $uriSigner
      * @param string $defaultResolver
      */
-    public function __construct(FilterConfiguration $filterConfig, RouterInterface $router, UriSigner $uriSigner, $defaultResolver = null)
-    {
+    public function __construct(
+        FilterConfiguration $filterConfig,
+        RouterInterface $router,
+        UriSigner $uriSigner,
+        EventDispatcherInterface $dispatcher,
+        $defaultResolver = null
+    ) {
         $this->filterConfig = $filterConfig;
         $this->router = $router;
         $this->uriSigner = $uriSigner;
+        $this->dispatcher = $dispatcher;
         $this->defaultResolver = $defaultResolver ?: 'default';
     }
 
@@ -176,7 +189,15 @@ public function resolve($path, $filter)
             throw new NotFoundHttpException(sprintf("Source image was searched with '%s' outside of the defined root path", $path));
         }
 
-        return $this->getResolver($filter)->resolve($path, $filter);
+        $resolver = $this->getResolver($filter);
+
+        $this->dispatcher->dispatch(ImagineEvents::PRE_RESOLVE, new PreResolveEvent($resolver, $path, $filter));
+
+        $url = $resolver->resolve($path, $filter);
+
+        $this->dispatcher->dispatch(ImagineEvents::POST_RESOLVE, new PostResolveEvent($resolver, $path, $filter, $url));
+
+        return $url;
     }
 
     /**

ImagineEvents.php

@@ -0,0 +1,14 @@
+<?php
+namespace Liip\ImagineBundle;
+
+
+final class ImagineEvents
+{
+    const PRE_RESOLVE = 'imagine.pre_resolve';
+
+    const POST_RESOLVE = 'imagine.post_resolve';
+
+    protected function __construct()
+    {
+    }
+}

Resources/config/imagine.xml

@@ -83,6 +83,7 @@
             <argument type="service" id="liip_imagine.filter.configuration" />
             <argument type="service" id="router" />
             <argument type="service" id="liip_imagine.uri_signer" />
+            <argument type="service" id="event_dispatcher" />
             <argument>%liip_imagine.cache.resolver.default%</argument>
         </service>