Merge pull request #42 from BenoitLeveque/symfony21_filesystem

In Symfony 2.1, filesystem class has been moved in Symfony\Component\Filesystem.
avalanche123 · Dec 25, 2011 · 2187ee4 · 2187ee4 · aldobattaglia-tr · Jan 27, 2012
2 parents 72a6d86 + 2ab28a2
commit 2187ee4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Controller/ImagineController.php b/Controller/ImagineController.php
@@ -5,7 +5,7 @@
 use Avalanche\Bundle\ImagineBundle\Imagine\CachePathResolver;
 use Avalanche\Bundle\ImagineBundle\Imagine\Filter\FilterManager;
 use Imagine\Image\ImagineInterface;
-use Symfony\Component\HttpKernel\Util\Filesystem;
+use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -33,7 +33,7 @@ class ImagineController
     private $filterManager;
 
     /**
-     * @var Symfony\Component\HttpKernel\Util\Filesystem
+     * @var Symfony\Component\Filesystem\Filesystem
      */
     private $filesystem;
 
@@ -49,6 +49,7 @@ class ImagineController
      * @param Avalanche\Bundle\ImagineBundle\Imagine\CachePathResolver $cachePathResolver
      * @param Imagine\Image\ImagineInterface                           $imagine
      * @param Avalanche\Bundle\ImagineBundle\Imagine\FilterManager     $filterManager
+     * @param Symfony\Component\Filesystem\Filesystem                  $filesystem
      * @param string                                                   $webRoot
      */
     public function __construct(

diff --git a/Templating/ImagineExtension.php b/Templating/ImagineExtension.php
@@ -3,7 +3,7 @@
 namespace Avalanche\Bundle\ImagineBundle\Templating;
 
 use Avalanche\Bundle\ImagineBundle\Imagine\CachePathResolver;
-use Symfony\Component\HttpKernel\Util\Filesystem;
+use Symfony\Component\Filesystem\Filesystem;
 
 class ImagineExtension extends \Twig_Extension
 {