Move Decorators as part of resource handlers package.

spalax · Jul 28, 2013 · 0ff287a · 0ff287a
1 parent 80c86ee
commit 0ff287a
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/config/module/di.config.php b/config/module/di.config.php
@@ -16,9 +16,9 @@
                 )
             ),
 
-            'Zf2FileUploader\Resource\Decorator\Image\AggregateDecorator' => array(
+            'Zf2FileUploader\Resource\Handler\Decorator\Image\AggregateDecorator' => array(
                 'addDecorator' => array(
-                    array('type' => 'Zf2FileUploader\Resource\Decorator\ImageDecoratorInterface',
+                    array('type' => 'Zf2FileUploader\Resource\Handler\Decorator\ImageDecoratorInterface',
                           'required' => true)
                 )
             )
@@ -68,7 +68,7 @@
 
         'Zf2FileUploader\Service\Resource\Image\DecorateService' => array(
             'parameters' => array(
-                'decorator' => 'Zf2FileUploader\Resource\Decorator\Image\AggregateDecorator'
+                'decorator' => 'Zf2FileUploader\Resource\Handler\Decorator\Image\AggregateDecorator'
             )
         ),
 

diff --git a/src/Zf2FileUploader/Resource/Decorator/DecoratorInterface.php b/src/Zf2FileUploader/Resource/Decorator/DecoratorInterface.php
diff --git a/src/Zf2FileUploader/Resource/Handler/Decorator/DecoratorInterface.php b/src/Zf2FileUploader/Resource/Handler/Decorator/DecoratorInterface.php
@@ -0,0 +1,4 @@
+<?php
+namespace Zf2FileUploader\Resource\Handler\Decorator;
+
+interface DecoratorInterface {}
diff --git a/...or/Exception/InvalidArgumentException.php → ...or/Exception/InvalidArgumentException.php b/...or/Exception/InvalidArgumentException.php → ...or/Exception/InvalidArgumentException.php
@@ -1,5 +1,5 @@
 <?php
-namespace Zf2FileUploader\Resource\Decorator\Exception;
+namespace Zf2FileUploader\Resource\Handler\Decorator\Exception;
 
 use Zf2FileUploader\Exception\ExceptionInterface;
 

diff --git a/...ce/Decorator/Image/AggregateDecorator.php → ...er/Decorator/Image/AggregateDecorator.php b/...ce/Decorator/Image/AggregateDecorator.php → ...er/Decorator/Image/AggregateDecorator.php
@@ -1,7 +1,7 @@
 <?php
-namespace Zf2FileUploader\Resource\Decorator\Image;
+namespace Zf2FileUploader\Resource\Handler\Decorator\Image;
 
-use Zf2FileUploader\Resource\Decorator\ImageDecoratorInterface;
+use Zf2FileUploader\Resource\Handler\Decorator\ImageDecoratorInterface;
 use Zf2FileUploader\Resource\ImageResourceInterface;
 
 class AggregateDecorator implements ImageDecoratorInterface

diff --git a/...ader/Resource/Decorator/Image/Resizer.php → ...ource/Handler/Decorator/Image/Resizer.php b/...ader/Resource/Decorator/Image/Resizer.php → ...ource/Handler/Decorator/Image/Resizer.php
@@ -1,12 +1,12 @@
 <?php
-namespace Zf2FileUploader\Resource\Decorator\Image;
+namespace Zf2FileUploader\Resource\Handler\Decorator\Image;
 
 use Zf2FileUploader\Options\Resource\Decorator\ResizerOptionsInterface;
-use Zf2FileUploader\Resource\Decorator\Exception\DomainException;
+use Zf2FileUploader\Resource\Handler\Decorator\Exception\DomainException;
 use Imagine\Image\Box;
 use Imagine\Image\ImageInterface as ImagineImageInterface;
 use Imagine\Gd\Imagine;
-use Zf2FileUploader\Resource\Decorator\ImageDecoratorInterface;
+use Zf2FileUploader\Resource\Handler\Decorator\ImageDecoratorInterface;
 use Zf2FileUploader\Resource\ImageResourceInterface;
 
 class Resizer implements ImageDecoratorInterface

diff --git a/.../Resource/Decorator/Image/Thumbnailer.php → ...e/Handler/Decorator/Image/Thumbnailer.php b/.../Resource/Decorator/Image/Thumbnailer.php → ...e/Handler/Decorator/Image/Thumbnailer.php
@@ -1,12 +1,12 @@
 <?php
-namespace Zf2FileUploader\Resource\Decorator\Image;
+namespace Zf2FileUploader\Resource\Handler\Decorator\Image;
 
 use Zf2FileUploader\Options\Resource\Decorator\ThumbnailerOptionsInterface;
-use Zf2FileUploader\Resource\Decorator\Exception\DomainException;
+use Zf2FileUploader\Resource\Handler\Decorator\Exception\DomainException;
 use Imagine\Image\Box;
 use Imagine\Image\ImageInterface as ImagineImageInterface;
 use Imagine\Gd\Imagine;
-use Zf2FileUploader\Resource\Decorator\ImageDecoratorInterface;
+use Zf2FileUploader\Resource\Handler\Decorator\ImageDecoratorInterface;
 use Zf2FileUploader\Resource\ImageResourceInterface;
 
 class Thumbnailer implements ImageDecoratorInterface

diff --git a/...rce/Decorator/ImageDecoratorInterface.php → ...ler/Decorator/ImageDecoratorInterface.php b/...rce/Decorator/ImageDecoratorInterface.php → ...ler/Decorator/ImageDecoratorInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace Zf2FileUploader\Resource\Decorator;
+namespace Zf2FileUploader\Resource\Handler\Decorator;
 
 use Zf2FileUploader\Resource\ImageResourceInterface;
 

diff --git a/src/Zf2FileUploader/Service/Resource/Image/DecorateService.php b/src/Zf2FileUploader/Service/Resource/Image/DecorateService.php
@@ -2,7 +2,7 @@
 namespace Zf2FileUploader\Service\Resource\Image;
 
 use Zf2FileUploader\I18n\Translator\TranslatorInterface;
-use Zf2FileUploader\Resource\Decorator\ImageDecoratorInterface;
+use Zf2FileUploader\Resource\Handler\Decorator\ImageDecoratorInterface;
 use Zf2FileUploader\Resource\ImageResourceInterface;
 use Zf2FileUploader\Service\Resource\Response\ImageResponse;
 use Zf2FileUploader\Service\Resource\Response\ImageResponseInterface;