Refactor and fix tests

irishdan · irishdan · commit e8ca7466d614 · 2017-06-06T17:20:59.000+01:00
diff --git a/CoordinateLengthCalculator.php b/CoordinateLengthCalculator.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace IrishDan\ResponsiveImageBundle;
+
+
+trait CoordinateLengthCalculator
+{
+    /**
+     * Gets vertical or horizontal length between two coordinates (x, y, x2, y2).
+     *
+     * @param string $type
+     * @param array  $coords
+     * @return mixed
+     */
+    public function getLength($type = 'x', array $coords)
+    {
+        $type = strtolower($type);
+        if ($type == 'x') {
+            return $coords[2] - $coords[0];
+        } else {
+            return $coords[3] - $coords[1];
+        }
+    }
+}
diff --git a/Event/ImageEvent.php b/Event/ImageEvent.php
@@ -3,7 +3,7 @@
 namespace IrishDan\ResponsiveImageBundle\Event;
 
 
-use IrishDan\ResponsiveImageBundle\Utils\ResponsiveImageInterface;
+use IrishDan\ResponsiveImageBundle\ResponsiveImageInterface;
 use Symfony\Component\EventDispatcher\Event;
 
 /**
diff --git a/FileManager.php b/FileManager.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace IrishDan\ResponsiveImageBundle\Utils;
+namespace IrishDan\ResponsiveImageBundle;
 
 use Symfony\Component\Filesystem\Filesystem;
 
 /**
  * Class FileSystem
  *
- * @package ResponsiveImageBundle\Utils
+ * @package ResponsiveImageBundle
  */
 class FileManager
 {
diff --git a/FileToObject.php b/FileToObject.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace IrishDan\ResponsiveImageBundle\Utils;
+namespace IrishDan\ResponsiveImageBundle;
 
 use Doctrine\ORM\EntityManager;
 
 /**
  * Class FileToObject
  *
- * @package ResponsiveImageBundle\Utils
+ * @package ResponsiveImageBundle
  */
 class FileToObject
 {
diff --git a/FocusCropDataCalculator.php b/FocusCropDataCalculator.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace IrishDan\ResponsiveImageBundle\Utils;
+namespace IrishDan\ResponsiveImageBundle;
 
 class FocusCropDataCalculator
 {
+    use CoordinateLengthCalculator;
     private $cropCoordinates;
     private $focusCoordinates;
     private $styleWidth;
@@ -220,21 +221,4 @@ protected function isInBounds($point, $cropLength, $imageLength, $focusNear, $fo
 
         return $inBounds;
     }
-
-    /**
-     * Gets vertical or horizontal length between two coordinates (x, y, x2, y2).
-     *
-     * @param string $type
-     * @param array  $coords
-     * @return mixed
-     */
-    protected function getLength($type = 'x', array $coords)
-    {
-        $type = strtolower($type);
-        if ($type == 'x') {
-            return $coords[2] - $coords[0];
-        } else {
-            return $coords[3] - $coords[1];
-        }
-    }
 }
diff --git a/Form/CropFocusType.php b/Form/CropFocusType.php
@@ -2,7 +2,7 @@
 
 namespace IrishDan\ResponsiveImageBundle\Form;
 
-use IrishDan\ResponsiveImageBundle\Utils\StyleManager;
+use IrishDan\ResponsiveImageBundle\StyleManager;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
diff --git a/ImageMaker.php b/ImageMaker.php
@@ -1,16 +1,18 @@
 <?php
 
-namespace IrishDan\ResponsiveImageBundle\Utils;
+namespace IrishDan\ResponsiveImageBundle;
 
 use Intervention\Image\ImageManager;
 
 /**
  * Class ImageMaker
  *
- * @package ResponsiveImageBundle\Utils
+ * @package ResponsiveImageBundle
  */
 class ImageMaker
 {
+    use CoordinateLengthCalculator;
+
     /**
      * @var
      */
@@ -249,4 +251,21 @@ protected function saveImage($destination, $source)
 
         return $fullPath;
     }
+
+    /**
+     * Gets vertical or horizontal length between two coordinates (x, y, x2, y2).
+     *
+     * @param string $type
+     * @param array  $coords
+     * @return mixed
+     */
+    protected function getLength($type = 'x', array $coords)
+    {
+        $type = strtolower($type);
+        if ($type == 'x') {
+            return $coords[2] - $coords[0];
+        } else {
+            return $coords[3] - $coords[1];
+        }
+    }
 }
diff --git a/README.markdown b/README.markdown
@@ -233,7 +233,7 @@ Generator is now included
 
 For image objects you can use your own entity, as long as it implements the ResponsiveImageInterface
 ```
-ResponsiveImageBundle\Utils\ResponsiveImageInterface.
+ResponsiveImageBundle\ResponsiveImageInterface.
 ```
 don't for get jquery for the edit widget
 
diff --git a/Repository/ImageRepository.php b/Repository/ImageRepository.php
@@ -3,7 +3,7 @@
 namespace IrishDan\ResponsiveImageBundle\Repository;
 
 use Doctrine\ORM\EntityRepository;
-use IrishDan\ResponsiveImageBundle\Utils\ResponsiveImageRepositoryInterface;
+use IrishDan\ResponsiveImageBundle\ResponsiveImageRepositoryInterface;
 
 class ImageRepository extends EntityRepository implements ResponsiveImageRepositoryInterface
 {
diff --git a/Resources/config/services.yml b/Resources/config/services.yml
@@ -1,30 +1,30 @@
 services:
     responsive_image:
-        class: IrishDan\ResponsiveImageBundle\Utils\ResponsiveImageManager
+        class: IrishDan\ResponsiveImageBundle\ResponsiveImageManager
         arguments: [ '@responsive_image.image_maker', '@responsive_image.style_manager', '%responsive_image%', '@responsive_image.file_manager', '@responsive_image.s3_bridge', '@responsive_image.uploader' ]
 
     responsive_image.file_manager:
-        class: IrishDan\ResponsiveImageBundle\Utils\FileManager
+        class: IrishDan\ResponsiveImageBundle\FileManager
         arguments: ['%kernel.root_dir%', '%responsive_image%', '@filesystem' ]
 
     responsive_image.style_manager:
-        class: IrishDan\ResponsiveImageBundle\Utils\StyleManager
+        class: IrishDan\ResponsiveImageBundle\StyleManager
         arguments: ['@responsive_image.file_manager', '%responsive_image%' ]
 
     responsive_image.image_maker:
-        class: IrishDan\ResponsiveImageBundle\Utils\ImageMaker
+        class: IrishDan\ResponsiveImageBundle\ImageMaker
         arguments: [ '@responsive_image.file_manager', '%responsive_image%' ]
 
     responsive_image.file_to_object:
-        class: IrishDan\ResponsiveImageBundle\Utils\FileToObject
+        class: IrishDan\ResponsiveImageBundle\FileToObject
         arguments: [ '@doctrine.orm.entity_manager' ]
 
     responsive_image.uploader:
-        class: IrishDan\ResponsiveImageBundle\Utils\Uploader
+        class: IrishDan\ResponsiveImageBundle\Uploader
         arguments: ['@responsive_image.file_manager']
 
     responsive_image.s3_bridge:
-        class: IrishDan\ResponsiveImageBundle\Utils\S3Bridge
+        class: IrishDan\ResponsiveImageBundle\S3Bridge
         arguments: [ '%responsive_image.aws_s3%' ]
 
     # Custom form field type.
diff --git a/Resources/skeleton/entity/Image.php.twig b/Resources/skeleton/entity/Image.php.twig
@@ -3,7 +3,7 @@
 namespace {{ namespace }}\Entity;
 
 {% block use_statements %}
-use IrishDan\ResponsiveImageBundle\Utils\ResponsiveImageInterface;
+use IrishDan\ResponsiveImageBundle\ResponsiveImageInterface;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
diff --git a/ResponsiveImageInterface.php b/ResponsiveImageInterface.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace IrishDan\ResponsiveImageBundle\Utils;
+namespace IrishDan\ResponsiveImageBundle;
 
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 /**
  * Interface ResponsiveImageInterface
  *
- * @package ResponsiveImageBundle\Utils
+ * @package ResponsiveImageBundle
  */
 Interface ResponsiveImageInterface
 {
diff --git a/ResponsiveImageManager.php b/ResponsiveImageManager.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace IrishDan\ResponsiveImageBundle\Utils;
+namespace IrishDan\ResponsiveImageBundle;
 
 /**
  * Class ResponsiveImageManager
- * @package ResponsiveImageBundle\Utils
+ * @package ResponsiveImageBundle
  */
 class ResponsiveImageManager
 {
diff --git a/ResponsiveImageRepositoryInterface.php b/ResponsiveImageRepositoryInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IrishDan\ResponsiveImageBundle\Utils;
+namespace IrishDan\ResponsiveImageBundle;
 
 Interface ResponsiveImageRepositoryInterface
 {
diff --git a/S3Bridge.php b/S3Bridge.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IrishDan\ResponsiveImageBundle\Utils;
+namespace IrishDan\ResponsiveImageBundle;
 
 use Aws\CommandPool;
 use Aws\Exception\AwsException;
@@ -9,7 +9,7 @@
 /**
  * Class S3Bridge
  *
- * @package ResponsiveImageBundle\Utils
+ * @package ResponsiveImageBundle
  */
 class S3Bridge
 {
diff --git a/StyleManager.php b/StyleManager.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace IrishDan\ResponsiveImageBundle\Utils;
+namespace IrishDan\ResponsiveImageBundle;
 
 /**
  * Class StyleManager
  *
- * @package ResponsiveImageBundle\Utils
+ * @package ResponsiveImageBundle
  */
 class StyleManager
 {
@@ -37,8 +37,8 @@ class StyleManager
     /**
      * StyleManager constructor.
      *
-     * @param \ResponsiveImageBundle\Utils\FileManager $system
-     * @param array                                    $parameters
+     * @param \ResponsiveImageBundle\FileManager $system
+     * @param array                              $parameters
      */
     public function __construct(FileManager $system, array $parameters)
     {
@@ -232,7 +232,7 @@ protected function buildStylePath($styleName, $fileName)
     public function setImageStyle(ResponsiveImageInterface $image, $styleName = null)
     {
         // @TODO: Hack to avoid looping over itself and string paths together.
-        if ($styleName !== null && !in_array($styleName, $this->styles)) {
+        if ($styleName !== null && empty($this->getStyle($styleName))) {
             return $image;
         }
 
diff --git a/Tests/Entity/TestImage.php b/Tests/Entity/TestImage.php
@@ -2,7 +2,7 @@
 
 namespace IrishDan\ResponsiveImageBundle\Tests\Entity;
 
-use IrishDan\ResponsiveImageBundle\Utils\ResponsiveImageInterface;
+use IrishDan\ResponsiveImageBundle\ResponsiveImageInterface;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
diff --git a/Tests/FocusCropDataCalculatorTest.php b/Tests/FocusCropDataCalculatorTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace IrishDan\ResponsiveImageBundle\Tests\Utils;
+namespace IrishDan\ResponsiveImageBundle\Tests;
 
 use IrishDan\ResponsiveImageBundle\Tests\ResponsiveImageTestCase;
-use IrishDan\ResponsiveImageBundle\Utils\FocusCropDataCalculator;
+use IrishDan\ResponsiveImageBundle\FocusCropDataCalculator;
 
 class FocusCropDataCalculatorTest extends ResponsiveImageTestCase
 {
diff --git a/Tests/ImageMakerTest.php b/Tests/ImageMakerTest.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace IrishDan\ResponsiveImageBundle\Tests\Utils;
+namespace IrishDan\ResponsiveImageBundle\Tests;
 
 use IrishDan\ResponsiveImageBundle\Tests\ResponsiveImageTestCase;
 
 class ImageMakerTest extends ResponsiveImageTestCase
 {
     private $imager;
-    private $testImagePath = __DIR__ . '/../Resources/dummy.jpg';
-    private $generatedDirectory = __DIR__ . '/../Resources/generated/';
+    private $testImagePath = __DIR__ . '/Resources/dummy.jpg';
+    private $generatedDirectory = __DIR__ . '/Resources/generated/';
     private $coordinates = '100, 100, 900, 900:400, 500, 700, 800';
 
     public function setUp()
diff --git a/Tests/StyleManagerTest.php b/Tests/StyleManagerTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace IrishDan\ResponsiveImageBundle\Tests\Utils;
+namespace IrishDan\ResponsiveImageBundle\Tests;
 
 
 use IrishDan\ResponsiveImageBundle\Tests\ResponsiveImageTestCase;
 use IrishDan\ResponsiveImageBundle\Tests\Entity\TestImage;
-use IrishDan\ResponsiveImageBundle\Utils\FileManager;
-use IrishDan\ResponsiveImageBundle\Utils\FileSystem;
-use IrishDan\ResponsiveImageBundle\Utils\StyleManager;
+use IrishDan\ResponsiveImageBundle\FileManager;
+use IrishDan\ResponsiveImageBundle\FileSystem;
+use IrishDan\ResponsiveImageBundle\StyleManager;
 
 class StyleManagerTest extends ResponsiveImageTestCase
 {
diff --git a/Tests/UploaderTest.php b/Tests/UploaderTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace IrishDan\ResponsiveImageBundle\Tests\Utils;
+namespace IrishDan\ResponsiveImageBundle\Tests;
 
 use IrishDan\ResponsiveImageBundle\Tests\ResponsiveImageTestCase;
-use IrishDan\ResponsiveImageBundle\Utils\FileSystem;
-use IrishDan\ResponsiveImageBundle\Utils\Uploader;
+use IrishDan\ResponsiveImageBundle\FileSystem;
+use IrishDan\ResponsiveImageBundle\Uploader;
 
 class UploaderTest extends ResponsiveImageTestCase
 {
diff --git a/Twig/ResponsiveImageExtension.php b/Twig/ResponsiveImageExtension.php
@@ -3,9 +3,9 @@
 namespace IrishDan\ResponsiveImageBundle\Twig;
 
 
-use IrishDan\ResponsiveImageBundle\Utils\ResponsiveImageInterface;
-use IrishDan\ResponsiveImageBundle\Utils\ResponsiveImageManager;
-use IrishDan\ResponsiveImageBundle\Utils\StyleManager;
+use IrishDan\ResponsiveImageBundle\ResponsiveImageInterface;
+use IrishDan\ResponsiveImageBundle\ResponsiveImageManager;
+use IrishDan\ResponsiveImageBundle\StyleManager;
 
 /**
  * Class ResponsiveImageExtension
diff --git a/Uploader.php b/Uploader.php

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace IrishDan\ResponsiveImageBundle\Utils;`
	`3`	`+namespace IrishDan\ResponsiveImageBundle;`
`4`	`4`
`5`	`5`	`use Symfony\Component\Filesystem\Filesystem;`
`6`	`6`
`7`	`7`	`/**`
`8`	`8`	`* Class FileSystem`
`9`	`9`	`*`
`10`		`- * @package ResponsiveImageBundle\Utils`
	`10`	`+ * @package ResponsiveImageBundle`
`11`	`11`	`*/`
`12`	`12`	`class FileManager`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`namespace IrishDan\ResponsiveImageBundle\Repository;`
`4`	`4`
`5`	`5`	`use Doctrine\ORM\EntityRepository;`
`6`		`-use IrishDan\ResponsiveImageBundle\Utils\ResponsiveImageRepositoryInterface;`
	`6`	`+use IrishDan\ResponsiveImageBundle\ResponsiveImageRepositoryInterface;`
`7`	`7`
`8`	`8`	`class ImageRepository extends EntityRepository implements ResponsiveImageRepositoryInterface`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace IrishDan\ResponsiveImageBundle\Utils;`
	`3`	`+namespace IrishDan\ResponsiveImageBundle;`
`4`	`4`
`5`	`5`	`Interface ResponsiveImageRepositoryInterface`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace IrishDan\ResponsiveImageBundle\Utils;`
	`3`	`+namespace IrishDan\ResponsiveImageBundle;`
`4`	`4`
`5`	`5`	`/**`
`6`	`6`	`* Class StyleManager`
`7`	`7`	`*`
`8`		`- * @package ResponsiveImageBundle\Utils`
	`8`	`+ * @package ResponsiveImageBundle`
`9`	`9`	`*/`
`10`	`10`	`class StyleManager`
`11`	`11`	`{`
`@@ -37,8 +37,8 @@ class StyleManager`
`37`	`37`	`/**`
`38`	`38`	`* StyleManager constructor.`
`39`	`39`	`*`
`40`		`- * @param \ResponsiveImageBundle\Utils\FileManager $system`
`41`		`- * @param array $parameters`
	`40`	`+ * @param \ResponsiveImageBundle\FileManager $system`
	`41`	`+ * @param array $parameters`
`42`	`42`	`*/`
`43`	`43`	`public function __construct(FileManager $system, array $parameters)`
`44`	`44`	`{`
`@@ -232,7 +232,7 @@ protected function buildStylePath($styleName, $fileName)`
`232`	`232`	`public function setImageStyle(ResponsiveImageInterface $image, $styleName = null)`
`233`	`233`	`{`
`234`	`234`	`// @TODO: Hack to avoid looping over itself and string paths together.`
`235`		`- if ($styleName !== null && !in_array($styleName, $this->styles)) {`
	`235`	`+ if ($styleName !== null && empty($this->getStyle($styleName))) {`
`236`	`236`	`return $image;`
`237`	`237`	`}`
`238`	`238`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace IrishDan\ResponsiveImageBundle\Tests\Utils;`
	`3`	`+namespace IrishDan\ResponsiveImageBundle\Tests;`
`4`	`4`
`5`	`5`	`use IrishDan\ResponsiveImageBundle\Tests\ResponsiveImageTestCase;`
`6`		`-use IrishDan\ResponsiveImageBundle\Utils\FocusCropDataCalculator;`
	`6`	`+use IrishDan\ResponsiveImageBundle\FocusCropDataCalculator;`
`7`	`7`
`8`	`8`	`class FocusCropDataCalculatorTest extends ResponsiveImageTestCase`
`9`	`9`	`{`