Updated, use short array, renamed tests IndexController to DemoController + added factory

Author: bacinsky

README.md

@@ -14,9 +14,9 @@ Service that provides API to manipulate images.
 
 - Powered by [PHPThumb](https://github.com/masterexploder/PHPThumb)
 - Demo [webino-image-thumb.demo.webino.org](http://webino-image-thumb.demo.webino.org/)
-  - [Reflection](http://webino-image-thumb.demo.webino.org/application/index/reflection)
-  - [Whitespace cropper](http://webino-image-thumb.demo.webino.org/application/index/whitespace-cropper)
-  - [Sharpen](http://webino-image-thumb.demo.webino.org/application/index/sharpen)
+  - [Reflection](http://webino-image-thumb.demo.webino.org/application/demo/reflection)
+  - [Whitespace cropper](http://webino-image-thumb.demo.webino.org/application/demo/whitespace-cropper)
+  - [Sharpen](http://webino-image-thumb.demo.webino.org/application/demo/sharpen)
 
 ## Features
 

composer.json

@@ -4,14 +4,7 @@
     "homepage":    "https://github.com/webino/WebinoImageThumb",
     "type":        "library",
     "license":     "BSD-3-Clause",
-    "keywords": [
-      "webino",
-      "image",
-      "thumb",
-      "zf2",
-      "zend",
-      "framework"
-    ],
+    "keywords":   ["webino", "image", "thumb", "zf2", "zend", "framework"],
     "authors": [
         {
             "name":     "Webino, s. r. o.",
@@ -26,8 +19,10 @@
             "role":     "Developer"
         }
     ],
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "require": {
-        "php": ">=5.3.3",
+        "php": ">=5.5",
         "ext-gd": "*",
         "masterexploder/PHPThumb": "2.*",
         "zendframework/zend-di": "2.*"

package.json

@@ -1,5 +1,4 @@
 {
-    "name": "WebinoImageThumb",
     "devDependencies": {
         "grunt": "0.4.*",
         "grunt-cli": "0.1.*",

src/WebinoImageThumb/PhpThumb/Plugin/Sharpen.php

@@ -3,20 +3,21 @@
  * Webino (https://github.com/webino/)
  *
  * @link      https://github.com/webino/WebinoImageThumb/ for the canonical source repository
- * @copyright Copyright (c) 2013-2014 Webino, s. r. o. (http://webino.sk/)
+ * @copyright Copyright (c) 2013-2015 Webino, s. r. o. (http://webino.sk/)
  * @license   BSD-3-Clause
  */
 
 namespace WebinoImageThumb\PhpThumb\Plugin;
 
 use PHPThumb\GD as PHPThumb;
+use PHPThumb\PluginInterface;
 
 /**
  * Sharpen plugin
  *
  * @author Miguel Vieira <vieira@miguelvieira.com.pt>
  */
-class Sharpen implements \PHPThumb\PluginInterface
+class Sharpen implements PluginInterface
 {
     /**
      * @var int
@@ -26,17 +27,17 @@ class Sharpen implements \PHPThumb\PluginInterface
     /**
      * @var array
      */
-    protected $matrix = array(
-        array(0.0, -1.0, 0.0),
-        array(-1.0, 5.0, -1.0),
-        array(0.0, -1.0, 0.0)
-    );
+    protected $matrix = [
+        [0.0, -1.0, 0.0],
+        [-1.0, 5.0, -1.0],
+        [0.0, -1.0, 0.0],
+    ];
 
     /**
-     * @param type $offset Color offset
-     * @param type $matrix A 3x3 matrix: an array of three arrays of three floats
+     * @param int $offset Color offset
+     * @param int $matrix A 3x3 matrix: an array of three arrays of three floats
      */
-    public function __construct($offset = 0, $matrix = array())
+    public function __construct($offset = 0, $matrix = [])
     {
         empty($offset) or $this->offset = $offset;
         empty($matrix) or $this->matrix = $matrix;

src/WebinoImageThumb/Service/ImageThumb.php

@@ -30,7 +30,7 @@ class ImageThumb
      * @param array $plugins
      * @return PHPThumb
      */
-    public function create($filename = null, array $options = array(), array $plugins = array())
+    public function create($filename = null, array $options = [], array $plugins = [])
     {
         try {
             $thumb = new PHPThumb($filename, $options, $plugins);
@@ -75,7 +75,7 @@ public function createWhitespaceCropper($border = 0, $color = 0)
      * @param array $matrix
      * @return ExtraPlugins\Sharpen
      */
-    public function createSharpen($offset = 0, array $matrix = array())
+    public function createSharpen($offset = 0, array $matrix = [])
     {
         return new ExtraPlugins\Sharpen($offset, $matrix);
     }

tests/resources/config/module.config.php

@@ -7,7 +7,10 @@
  * @license   BSD-3-Clause
  */
 
-use Application\Controller\IndexController;
+namespace Application;
+
+use Application\Controller;
+use Application\Factory;
 use Zend\I18n\Translator\TranslatorInterface;
 use Zend\I18n\Translator\TranslatorServiceFactory;
 
@@ -20,46 +23,13 @@
  */
 return [
     'service_manager' => [
-        'aliases' => [
-            'Application\Controller\Index' => IndexController::class,
-        ],
         'factories' => [
             TranslatorInterface::class => TranslatorServiceFactory::class,
         ],
     ],
-    'router' => [
-        'routes' => [
-            'home' => [
-                'options' => [
-                    'defaults' => [
-                        /**
-                         * We want to use the DI, so override the application
-                         * module config with a controller FQCN, instead of invocable alias
-                         */
-                        'controller' => IndexController::class,
-                    ],
-                ],
-            ],
-        ],
-    ],
-    'di' => [
-        /**
-         * For security reasons we must allow
-         * our controller for the DI
-         */
-        'allowed_controllers' => [
-            IndexController::class,
-        ],
-        'instance' => [
-            /**
-             * Configure the controller
-             * to inject WebinoImageThumb service
-             */
-            IndexController::class => [
-                'parameters' => [
-                    'thumbnailer' => 'WebinoImageThumb',
-                ],
-            ],
+    'controllers' => [
+        'factories' => [
+            'Application\Controller\Demo' => Factory\DemoControllerFactory::class,
         ],
     ],
     'webino_debug' => [

tests/resources/src/Application/Controller/IndexController.php renamed to tests/resources/src/Application/Controller/DemoController.php

@@ -15,9 +15,8 @@
 /**
  * Image Thumbnailer test application controller
  */
-class IndexController extends AbstractActionController
+class DemoController extends AbstractActionController
 {
-
     /**
      * @var ImageThumb
      */
@@ -34,7 +33,7 @@ class IndexController extends AbstractActionController
      * To see how we configure the controller to use DI
      * check out tests/resources/config/module.config.php
      *
-     * @param ImageThumb $thumbnailer
+     * @param ImageThumb|object $thumbnailer
      */
     public function __construct(ImageThumb $thumbnailer)
     {

tests/resources/src/Application/Factory/DemoControllerFactory.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * Webino (https://github.com/webino/)
+ *
+ * @link      https://github.com/webino/WebinoImageThumb/ for the canonical source repository
+ * @copyright Copyright (c) 2015 Webino, s. r. o. (http://webino.sk/)
+ * @license   BSD-3-Clause
+ */
+
+namespace Application\Factory;
+
+use Application\Controller\DemoController;
+use Zend\ServiceManager\FactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+/**
+ * Class DemoControllerFactory
+ */
+class DemoControllerFactory implements FactoryInterface
+{
+    /**
+     * @param ServiceLocatorInterface|\Zend\Mvc\Controller\ControllerManager $controllers
+     * @return DemoController
+     */
+    public function createService(ServiceLocatorInterface $controllers)
+    {
+        $services = $controllers->getServiceLocator();
+        return new DemoController($services->get('WebinoImageThumb'));
+    }
+}

tests/selenium/WebinoImageThumb/HomeTest.php

@@ -19,7 +19,7 @@ class HomeTest extends AbstractTestCase
      */
     public function testReflection()
     {
-        $src = file_get_contents($this->uri . 'application/index-controller/reflection');
+        $src = file_get_contents($this->uri . 'application/demo/reflection');
         $this->assertJpegImage($src);
     }
 
@@ -28,7 +28,7 @@ public function testReflection()
      */
     public function testWhitespaceCropper()
     {
-        $src = file_get_contents($this->uri . 'application/index-controller/whitespace-cropper');
+        $src = file_get_contents($this->uri . 'application/demo/whitespace-cropper');
         $this->assertJpegImage($src);
     }
 
@@ -37,7 +37,7 @@ public function testWhitespaceCropper()
      */
     public function testSharpen()
     {
-        $src = file_get_contents($this->uri . 'application/index-controller/sharpen');
+        $src = file_get_contents($this->uri . 'application/demo/sharpen');
         $this->assertJpegImage($src);
     }
 }