Update class namespaces of Contao\Image

madeyourday · Jul 28, 2016 · 386fe86 · 386fe86
1 parent 1cca8a0
commit 386fe86
Show file tree

Hide file tree

Showing 11 changed files with 61 additions and 61 deletions.
diff --git a/src/Image/ImageFactory.php b/src/Image/ImageFactory.php
@@ -14,12 +14,12 @@
 use Imagine\Image\Point;
 use Imagine\Image\ImagineInterface;
 use Contao\CoreBundle\Framework\ContaoFrameworkInterface;
-use Contao\Image\ResizerInterface;
-use Contao\Image\Image;
-use Contao\Image\ResizeConfiguration;
-use Contao\Image\ResizeConfigurationInterface;
-use Contao\Image\ResizeOptions;
-use Contao\Image\ImportantPart;
+use Contao\Image\Resize\ResizerInterface;
+use Contao\Image\Image\Image;
+use Contao\Image\Resize\ResizeConfiguration;
+use Contao\Image\Resize\ResizeConfigurationInterface;
+use Contao\Image\Resize\ResizeOptions;
+use Contao\Image\Image\ImportantPart;
 use Symfony\Component\Filesystem\Filesystem;
 
 /**

diff --git a/src/Image/PictureFactory.php b/src/Image/PictureFactory.php
@@ -11,11 +11,11 @@
 namespace Contao\CoreBundle\Image;
 
 use Contao\CoreBundle\Framework\ContaoFrameworkInterface;
-use Contao\Image\PictureGeneratorInterface;
-use Contao\Image\PictureConfiguration;
-use Contao\Image\ResizeConfiguration;
-use Contao\Image\ResizeOptions;
-use Contao\Image\PictureConfigurationItem;
+use Contao\Image\Picture\PictureGeneratorInterface;
+use Contao\Image\Picture\PictureConfiguration;
+use Contao\Image\Resize\ResizeConfiguration;
+use Contao\Image\Resize\ResizeOptions;
+use Contao\Image\Picture\PictureConfigurationItem;
 
 /**
  * Creates Picture objects.

diff --git a/src/Image/Resizer.php b/src/Image/Resizer.php
@@ -18,16 +18,16 @@
 use Contao\Image as LegacyImage;
 use Contao\File;
 use Contao\System;
-use Contao\Image\Resizer as ImageResizer;
-use Contao\Image\ImageInterface;
-use Contao\Image\ResizeConfigurationInterface;
-use Contao\Image\ResizeCoordinatesInterface;
-use Contao\Image\ResizeOptionsInterface;
-use Contao\Image\ImportantPartInterface;
+use Contao\Image\Resize\Resizer as ImageResizer;
+use Contao\Image\Image\ImageInterface;
+use Contao\Image\Resize\ResizeConfigurationInterface;
+use Contao\Image\Resize\ResizeCoordinatesInterface;
+use Contao\Image\Resize\ResizeOptionsInterface;
+use Contao\Image\Image\ImportantPartInterface;
 use Symfony\Component\Filesystem\Filesystem;
 
 /**
- * Resizes Image objects via Contao\Image\Resizer and executes legacy hooks.
+ * Resizes Image objects via Contao\Image\Resize\Resizer and executes legacy hooks.
  *
  * @author Martin Auswöger <martin@auswoeger.com>
  */

diff --git a/src/Resources/config/services.yml b/src/Resources/config/services.yml
@@ -132,7 +132,7 @@ services:
         class: Contao\ImagineSvg\Imagine
 
     contao.image.resize_calculator:
-        class: Contao\Image\ResizeCalculator
+        class: Contao\Image\Resize\ResizeCalculator
         public: false
 
     contao.image.resizer:
@@ -158,7 +158,7 @@ services:
             - %contao.image.valid_extensions%
 
     contao.image.picture_generator:
-        class: Contao\Image\PictureGenerator
+        class: Contao\Image\Picture\PictureGenerator
         arguments:
             - "@contao.image.resizer"
 

diff --git a/src/Resources/contao/drivers/DC_Folder.php b/src/Resources/contao/drivers/DC_Folder.php
@@ -13,7 +13,7 @@
 use Contao\CoreBundle\Exception\AccessDeniedException;
 use Contao\CoreBundle\Exception\InternalServerErrorException;
 use Contao\CoreBundle\Util\SymlinkUtil;
-use Contao\Image\ResizeConfiguration;
+use Contao\Image\Resize\ResizeConfiguration;
 use Patchwork\Utf8;
 use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBagInterface;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;

diff --git a/src/Resources/contao/library/Contao/Image.php b/src/Resources/contao/library/Contao/Image.php
@@ -10,11 +10,11 @@
 
 namespace Contao;
 
-use Contao\Image\Image as NewImage;
-use Contao\Image\ImportantPart;
-use Contao\Image\ImageDimensions;
-use Contao\Image\ResizeConfiguration;
-use Contao\Image\ResizeOptions;
+use Contao\Image\Image\Image as NewImage;
+use Contao\Image\Image\ImportantPart;
+use Contao\Image\Image\ImageDimensions;
+use Contao\Image\Resize\ResizeConfiguration;
+use Contao\Image\Resize\ResizeOptions;
 use Imagine\Image\Box;
 use Imagine\Image\Point;
 

diff --git a/src/Resources/contao/library/Contao/Picture.php b/src/Resources/contao/library/Contao/Picture.php
@@ -10,11 +10,11 @@
 
 namespace Contao;
 
-use Contao\Image\ImportantPart;
-use Contao\Image\ResizeConfiguration;
-use Contao\Image\ResizeOptions;
-use Contao\Image\PictureConfiguration;
-use Contao\Image\PictureConfigurationItem;
+use Contao\Image\Image\ImportantPart;
+use Contao\Image\Resize\ResizeConfiguration;
+use Contao\Image\Resize\ResizeOptions;
+use Contao\Image\Picture\PictureConfiguration;
+use Contao\Image\Picture\PictureConfigurationItem;
 use Imagine\Image\Box;
 use Imagine\Image\Point;
 

diff --git a/src/Resources/contao/widgets/FileSelector.php b/src/Resources/contao/widgets/FileSelector.php
@@ -11,7 +11,7 @@
 namespace Contao;
 
 use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBagInterface;
-use Contao\Image\ResizeConfiguration;
+use Contao\Image\Resize\ResizeConfiguration;
 
 
 /**

diff --git a/tests/Image/ImageFactoryTest.php b/tests/Image/ImageFactoryTest.php
@@ -14,9 +14,9 @@
 use Contao\CoreBundle\Image\ImageFactory;
 use Contao\CoreBundle\Image\Resizer;
 use Contao\CoreBundle\Framework\ContaoFrameworkInterface;
-use Contao\Image\ImportantPart;
-use Contao\Image\ResizeCalculator;
-use Contao\Image\ResizeConfiguration;
+use Contao\Image\Image\ImportantPart;
+use Contao\Image\Resize\ResizeCalculator;
+use Contao\Image\Resize\ResizeConfiguration;
 use Symfony\Component\Filesystem\Filesystem;
 use Imagine\Image\Box;
 use Imagine\Image\Point;
@@ -54,7 +54,7 @@ public function tearDown()
     private function createImageFactory($resizer = null, $imagine = null, $imagineSvg = null, $filesystem = null, $framework = null, $bypassCache = null, $imagineOptions = null, $validExtensions = null)
     {
         if (null === $resizer) {
-            $resizer = $this->getMockBuilder('Contao\Image\Resizer')
+            $resizer = $this->getMockBuilder('Contao\Image\Resize\Resizer')
              ->disableOriginalConstructor()
              ->getMock();
         }
@@ -105,11 +105,11 @@ public function testCreate()
     {
         $path = $this->getRootDir() . '/images/dummy.jpg';
 
-        $imageMock = $this->getMockBuilder('Contao\Image\Image')
+        $imageMock = $this->getMockBuilder('Contao\Image\Image\Image')
              ->disableOriginalConstructor()
              ->getMock();
 
-        $resizer = $this->getMockBuilder('Contao\Image\Resizer')
+        $resizer = $this->getMockBuilder('Contao\Image\Resize\Resizer')
              ->disableOriginalConstructor()
              ->getMock();
 
@@ -190,11 +190,11 @@ public function testCreateWithImageSize()
     {
         $path = $this->getRootDir() . '/images/dummy.jpg';
 
-        $imageMock = $this->getMockBuilder('Contao\Image\Image')
+        $imageMock = $this->getMockBuilder('Contao\Image\Image\Image')
              ->disableOriginalConstructor()
              ->getMock();
 
-        $resizer = $this->getMockBuilder('Contao\Image\Resizer')
+        $resizer = $this->getMockBuilder('Contao\Image\Resize\Resizer')
              ->disableOriginalConstructor()
              ->getMock();
 
@@ -346,11 +346,11 @@ public function testCreateWithResizeConfiguration()
             ->setMode(ResizeConfiguration::MODE_BOX)
             ->setZoomLevel(50);
 
-        $imageMock = $this->getMockBuilder('Contao\Image\Image')
+        $imageMock = $this->getMockBuilder('Contao\Image\Image\Image')
              ->disableOriginalConstructor()
              ->getMock();
 
-        $resizer = $this->getMockBuilder('Contao\Image\Resizer')
+        $resizer = $this->getMockBuilder('Contao\Image\Resize\Resizer')
              ->disableOriginalConstructor()
              ->getMock();
 
@@ -426,7 +426,7 @@ public function testCreateWithLegacyMode($mode, $expected)
     {
         $path = $this->getRootDir() . '/images/none.jpg';
 
-        $imageMock = $this->getMockBuilder('Contao\Image\Image')
+        $imageMock = $this->getMockBuilder('Contao\Image\Image\Image')
              ->disableOriginalConstructor()
              ->getMock();
 
@@ -437,7 +437,7 @@ public function testCreateWithLegacyMode($mode, $expected)
             ->method('exists')
             ->willReturn(true);
 
-        $resizer = $this->getMockBuilder('Contao\Image\Resizer')
+        $resizer = $this->getMockBuilder('Contao\Image\Resize\Resizer')
              ->disableOriginalConstructor()
              ->getMock();
 

diff --git a/tests/Image/PictureFactoryTest.php b/tests/Image/PictureFactoryTest.php
@@ -13,11 +13,11 @@
 use Contao\CoreBundle\Test\TestCase;
 use Contao\CoreBundle\Image\PictureFactory;
 use Contao\CoreBundle\Framework\ContaoFrameworkInterface;
-use Contao\Image\ImportantPart;
-use Contao\Image\Image;
-use Contao\Image\Resizer;
-use Contao\Image\ResizeConfiguration;
-use Contao\Image\PictureConfiguration;
+use Contao\Image\Image\ImportantPart;
+use Contao\Image\Image\Image;
+use Contao\Image\Resize\Resizer;
+use Contao\Image\Resize\ResizeConfiguration;
+use Contao\Image\Picture\PictureConfiguration;
 use Symfony\Component\Filesystem\Filesystem;
 use Imagine\Image\Box;
 use Imagine\Image\Point;
@@ -43,7 +43,7 @@ class PictureFactoryTest extends TestCase
     private function createPictureFactory($pictureGenerator = null, $imageFactory = null, $framework = null, $bypassCache = null, $imagineOptions = null)
     {
         if (null === $pictureGenerator) {
-            $pictureGenerator = $this->getMockBuilder('Contao\Image\PictureGenerator')
+            $pictureGenerator = $this->getMockBuilder('Contao\Image\Picture\PictureGenerator')
              ->disableOriginalConstructor()
              ->getMock();
         }
@@ -84,15 +84,15 @@ public function testCreate()
     {
         $path = $this->getRootDir() . '/images/dummy.jpg';
 
-        $imageMock = $this->getMockBuilder('Contao\Image\Image')
+        $imageMock = $this->getMockBuilder('Contao\Image\Image\Image')
             ->disableOriginalConstructor()
             ->getMock();
 
-        $pictureMock = $this->getMockBuilder('Contao\Image\Picture')
+        $pictureMock = $this->getMockBuilder('Contao\Image\Picture\Picture')
              ->disableOriginalConstructor()
              ->getMock();
 
-        $pictureGenerator = $this->getMockBuilder('Contao\Image\PictureGenerator')
+        $pictureGenerator = $this->getMockBuilder('Contao\Image\Picture\PictureGenerator')
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -225,19 +225,19 @@ public function testCreateLegacyMode()
     {
         $path = $this->getRootDir() . '/images/dummy.jpg';
 
-        $pictureMock = $this->getMockBuilder('Contao\Image\Picture')
+        $pictureMock = $this->getMockBuilder('Contao\Image\Picture\Picture')
              ->disableOriginalConstructor()
              ->getMock();
 
-        $pictureGenerator = $this->getMockBuilder('Contao\Image\PictureGenerator')
+        $pictureGenerator = $this->getMockBuilder('Contao\Image\Picture\PictureGenerator')
             ->disableOriginalConstructor()
             ->getMock();
 
         $pictureGenerator->expects($this->any())
             ->method('generate')
             ->willReturn($pictureMock);
 
-        $imageMock = $this->getMockBuilder('Contao\Image\Image')
+        $imageMock = $this->getMockBuilder('Contao\Image\Image\Image')
              ->disableOriginalConstructor()
              ->getMock();
 
@@ -275,15 +275,15 @@ public function testCreateWithoutMode()
     {
         $path = $this->getRootDir() . '/images/dummy.jpg';
 
-        $imageMock = $this->getMockBuilder('Contao\Image\Image')
+        $imageMock = $this->getMockBuilder('Contao\Image\Image\Image')
              ->disableOriginalConstructor()
              ->getMock();
 
-        $pictureMock = $this->getMockBuilder('Contao\Image\Picture')
+        $pictureMock = $this->getMockBuilder('Contao\Image\Picture\Picture')
              ->disableOriginalConstructor()
              ->getMock();
 
-        $pictureGenerator = $this->getMockBuilder('Contao\Image\PictureGenerator')
+        $pictureGenerator = $this->getMockBuilder('Contao\Image\Picture\PictureGenerator')
             ->disableOriginalConstructor()
             ->getMock();
 

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -17,8 +17,8 @@
 use Contao\CoreBundle\Image\PictureFactory;
 use Contao\CoreBundle\Image\ImageFactory;
 use Contao\CoreBundle\Image\Resizer;
-use Contao\Image\ResizeCalculator;
-use Contao\Image\PictureGenerator;
+use Contao\Image\Resize\ResizeCalculator;
+use Contao\Image\Picture\PictureGenerator;
 use Contao\ImagineSvg\Imagine as ImagineSvg;
 use Imagine\Gd\Imagine as ImagineGd;
 use Symfony\Component\Config\FileLocator;