Upgrade to ZF3

tck · Feb 9, 2017 · 4cb08b0 · 4cb08b0
1 parent d3dd176
commit 4cb08b0
Show file tree

Hide file tree

Showing 25 changed files with 139 additions and 189 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,9 @@
 language: php
 
 php:
-  - 5.4
-  - 5.5
   - 5.6
   - 7
+  - 7.1
 
 before_script:
   - composer update --prefer-source
@@ -14,8 +13,8 @@ script:
   - ./vendor/bin/phpcs --standard=PSR2 --ignore="test/Bootstrap.php" ./src/ ./test/
 
 after_script:
-  - if [ $TRAVIS_PHP_VERSION != 'hhvm' ] && [ $TRAVIS_PHP_VERSION != '7' ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
-  - if [ $TRAVIS_PHP_VERSION != 'hhvm' ] && [ $TRAVIS_PHP_VERSION != '7' ]; then php ocular.phar code-coverage:upload --format=php-clover ./build/logs/clover.xml; fi
+  - if [ $TRAVIS_PHP_VERSION != '7' ] && [ $TRAVIS_PHP_VERSION != '7.1' ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
+  - if [ $TRAVIS_PHP_VERSION != '7' ] && [ $TRAVIS_PHP_VERSION != '7.1' ]; then php ocular.phar code-coverage:upload --format=php-clover ./build/logs/clover.xml; fi
 
 notifications:
   email: false
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2014, Tobias Knab
+Copyright (c) 2017, Tobias Knab
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

diff --git a/Module.php b/Module.php
@@ -1,9 +1,9 @@
 <?php
 /**
- * Smart image resizing (and manipulation) by url module for Zend Framework 2
+ * Smart image resizing (and manipulation) by url module for Zend Framework 3
  *
  * @link      http://github.com/tck/zf2-imageresizer for the canonical source repository
- * @copyright Copyright (c) 2014 Tobias Knab
+ * @copyright Copyright (c) 2017 Tobias Knab
  * 
  * For the full copyright and license information, please view the LICENSE.txt
  * file that was distributed with this source code.
@@ -22,12 +22,9 @@ class Module
     public function getAutoloaderConfig()
     {
         return array(
-            'Zend\Loader\ClassMapAutoloader' => array(
-                __DIR__ . '/autoload_classmap.php',
-            ),
             'Zend\Loader\StandardAutoloader' => array(
                 'namespaces' => array(
-                    __NAMESPACE__ => __DIR__ . '/src/' . str_replace('\\', '/' , __NAMESPACE__),
+                    __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
                 ),
             ),
         );

diff --git a/README.md b/README.md
@@ -7,27 +7,28 @@
 [![Total Downloads](https://poser.pugx.org/tck/zf2-imageresizer/downloads)](https://packagist.org/packages/tck/zf2-imageresizer)
 [![License](https://poser.pugx.org/tck/zf2-imageresizer/license)](https://packagist.org/packages/tck/zf2-imageresizer)
 
-This ZF2 module, once enabled, allows image resizing and manipulation by url.
+This Zend Framework module, once enabled, allows image resizing and manipulation by url.
 
 
 ### Requirements
 
-* PHP 5.3+
-* [Zend Framework 2](https://github.com/zendframework/zf2) (> 2.0)
-* [Imagine](http://imagine.readthedocs.org/en/latest/) (> 0.5)
+* PHP 5.6+
+* [Zend Framework 3](https://github.com/zendframework/zendframework) (> 3.0)
+* [Imagine](http://imagine.readthedocs.org/en/latest/) (> 0.6)
 
+> **IMPORTANT! Version notes** 
+> * Version **2.x**: Zend Framework 3, dropped support for Zend Framework 2.
+> * Version **1.x**: Zend Framework 2
 
-### Installation via Composer
+### Installation
 
-Define dependencies in your composer.json file
+Install composer in your project
 
-```json
-{
-	"require": {
-        "tck/zf2-imageresizer": "1.*"
-    }
-}
-```
+    curl -s http://getcomposer.org/installer | php
+
+Then run 
+
+    php composer.phar require tck/zf2-imageresizer
 
 
 ### Post installation

diff --git a/autoload_classmap.php b/autoload_classmap.php
diff --git a/autoload_function.php b/autoload_function.php
diff --git a/autoload_register.php b/autoload_register.php
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "tck/zf2-imageresizer",
-    "description": "Image resizer and manipulation module for Zend Framework 2",
+    "description": "Image resizer and manipulation module for Zend Framework 3",
     "type": "library",
     "authors": [
         {
@@ -20,17 +20,17 @@
         "MIT"
     ],
     "require": {
-        "php": ">=5.4.0",
-        "zendframework/zend-mvc": "~2.5",
-        "zendframework/zend-loader": "~2.5",
-        "zendframework/zend-modulemanager": "~2.5",
-        "zendframework/zend-config": "~2.5",
-        "zendframework/zend-cache": "~2.5",
-        "zendframework/zend-log": "~2.5",
-        "zendframework/zend-view": "~2.5",
-        "zendframework/zend-i18n": "~2.5",
-        "zendframework/zend-console": "~2.5",
-        "zendframework/zend-http": "~2.5",
+        "php": "^5.6 || ^7.0",
+        "zendframework/zend-mvc": "^3.0.1",
+        "zendframework/zend-loader": "^2.5.1",
+        "zendframework/zend-modulemanager": "^2.7.2",
+        "zendframework/zend-config": "^2.6",
+        "zendframework/zend-cache": "^2.7.1",
+        "zendframework/zend-log": "^2.9",
+        "zendframework/zend-view": "^2.8",
+        "zendframework/zend-i18n": "^2.7.3",
+        "zendframework/zend-console": "^2.6",
+        "zendframework/zend-http": "^2.5.4",
         "imagine/imagine": "0.6.*"
     },
     "require-dev": {

diff --git a/config/module.config.php b/config/module.config.php
@@ -1,59 +1,66 @@
 <?php
 /**
- * Smart image resizing (and manipulation) by url module for Zend Framework 2
+ * Smart image resizing (and manipulation) by url module for Zend Framework 3
  *
  * @link      http://github.com/tck/zf2-imageresizer for the canonical source repository
- * @copyright Copyright (c) 2014 Tobias Knab
+ * @copyright Copyright (c) 2017 Tobias Knab
  * 
  * For the full copyright and license information, please view the LICENSE.txt
  * file that was distributed with this source code.
  */
 
-return array(
-    'router' => array(
-        'routes' => array(
-            'tckimageresizer' => array(
-                'type'    => 'Literal',
-                'options' => array(
+namespace TckImageResizer;
+
+use Imagine\Gd\Imagine;
+use Zend\Router\Http\Literal;
+use Zend\Router\Http\Regex;
+use Zend\ServiceManager\Factory\InvokableFactory;
+
+return [
+    'router' => [
+        'routes' => [
+            'tckimageresizer' => [
+                'type'    => Literal::class,
+                'options' => [
                     'route'    => '/processed',
-                    'defaults' => array(
-                        '__NAMESPACE__' => 'TckImageResizer\Controller',
-                        'controller'    => 'Index',
+                    'defaults' => [
+                        'controller'    => Controller\IndexController::class,
                         'action'        => 'index',
-                    ),
-                ),
+                    ],
+                ],
                 'may_terminate' => true,
-                'child_routes' => array(
-                    'resize' => array(
-                        'type' => 'Zend\Mvc\Router\Http\Regex',
-                        'options' => array(
+                'child_routes' => [
+                    'resize' => [
+                        'type' => Regex::class,
+                        'options' => [
                             'regex'    => '/(?<file>.*?)\.\$(?<command>.*)\.(?<extension>[a-zA-Z]+)',
-                            'defaults' => array(
+                            'defaults' => [
                                 'action'     => 'resize',
-                            ),
+                            ],
                             'spec' => '/processed/%file%.$%command%.%extension%',
-                        ),
-                    ),
-                ),
-            ),
-        ),
-    ),
-    'service_manager' => array(
-        'invokables' => array(
-            'TckImageResizerImagine' => 'Imagine\Gd\Imagine',
-        ),
-        'factories' => array(
-            'TckImageResizer\Service\ImageProcessing' => 'TckImageResizer\Service\ImageProcessingFactory',
-        ),
-    ),
-    'controllers' => array(
-        'factories' => array(
-            'TckImageResizer\Controller\Index' => 'TckImageResizer\Controller\IndexControllerFactory',
-        ),
-    ),
-    'view_helpers' => array(
-        'invokables' => array(
-            'resize' => 'TckImageResizer\View\Helper\Resize'
-        ),
-    ),
-);
+                        ],
+                    ],
+                ],
+            ],
+        ],
+    ],
+    'service_manager' => [
+        'aliases' => [
+            'TckImageResizerImagine' => Imagine::class,
+        ],
+        'factories' => [
+            Imagine::class => InvokableFactory::class,
+            Service\ImageProcessing::class => Service\ImageProcessingFactory::class,
+        ],
+    ],
+    'controllers' => [
+        'factories' => [
+            Controller\IndexController::class => Controller\IndexControllerFactory::class,
+        ],
+    ],
+    'view_helpers' => [
+        'invokables' => [
+            'resize' => View\Helper\Resize::class,
+        ],
+    ],
+];
diff --git a/src/TckImageResizer/Controller/IndexController.php b/src/TckImageResizer/Controller/IndexController.php
@@ -1,9 +1,9 @@
 <?php
 /**
- * Smart image resizing (and manipulation) by url module for Zend Framework 2
+ * Smart image resizing (and manipulation) by url module for Zend Framework 3
  *
  * @link      http://github.com/tck/zf2-imageresizer for the canonical source repository
- * @copyright Copyright (c) 2014 Tobias Knab
+ * @copyright Copyright (c) 2017 Tobias Knab
  * 
  * For the full copyright and license information, please view the LICENSE.txt
  * file that was distributed with this source code.
@@ -12,7 +12,6 @@
 namespace TckImageResizer\Controller;
 
 use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
 use TckImageResizer\Service\ImageProcessing;
 
 /**

diff --git a/src/TckImageResizer/Controller/IndexControllerFactory.php b/src/TckImageResizer/Controller/IndexControllerFactory.php
@@ -1,16 +1,18 @@
 <?php
 /**
- * Smart image resizing (and manipulation) by url module for Zend Framework 2
+ * Smart image resizing (and manipulation) by url module for Zend Framework 3
  *
  * @link      http://github.com/tck/zf2-imageresizer for the canonical source repository
- * @copyright Copyright (c) 2014 Tobias Knab
+ * @copyright Copyright (c) 2017 Tobias Knab
  * 
  * For the full copyright and license information, please view the LICENSE.txt
  * file that was distributed with this source code.
  */
 
 namespace TckImageResizer\Controller;
 
+use Interop\Container\ContainerInterface;
+use TckImageResizer\Service\ImageProcessing;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
 
@@ -22,16 +24,20 @@
 class IndexControllerFactory implements FactoryInterface
 {
     /**
-     * Create Service Factory
+     * Create an IndexController object
      *
-     * @param \Zend\Mvc\Controller\ControllerManager|ServiceLocatorInterface $serviceLocator
+     * @param  ContainerInterface $container
+     * @param  string             $requestedName
+     * @param  null|array         $options
      * @return IndexController
      */
-    public function createService(ServiceLocatorInterface $serviceLocator)
+    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {
-        $sm = $serviceLocator->getServiceLocator();
-        $imageProcessing = $sm->get('TckImageResizer\Service\ImageProcessing');
-        $controller = new IndexController($imageProcessing);
-        return $controller;
+        return new IndexController($container->get(ImageProcessing::class));
+    }
+
+    public function createService(ServiceLocatorInterface $services)
+    {
+        return $this($services, IndexController::class);
     }
 }
diff --git a/src/TckImageResizer/Exception/BadMethodCallException.php b/src/TckImageResizer/Exception/BadMethodCallException.php
@@ -1,9 +1,9 @@
 <?php
 /**
- * Smart image resizing (and manipulation) by url module for Zend Framework 2
+ * Smart image resizing (and manipulation) by url module for Zend Framework 3
  *
  * @link      http://github.com/tck/zf2-imageresizer for the canonical source repository
- * @copyright Copyright (c) 2014 Tobias Knab
+ * @copyright Copyright (c) 2017 Tobias Knab
  * 
  * For the full copyright and license information, please view the LICENSE.txt
  * file that was distributed with this source code.

diff --git a/src/TckImageResizer/Service/CommandRegistry.php b/src/TckImageResizer/Service/CommandRegistry.php
@@ -1,9 +1,9 @@
 <?php
 /**
- * Smart image resizing (and manipulation) by url module for Zend Framework 2
+ * Smart image resizing (and manipulation) by url module for Zend Framework 3
  *
  * @link      http://github.com/tck/zf2-imageresizer for the canonical source repository
- * @copyright Copyright (c) 2014 Tobias Knab
+ * @copyright Copyright (c) 2017 Tobias Knab
  * 
  * For the full copyright and license information, please view the LICENSE.txt
  * file that was distributed with this source code.

diff --git a/src/TckImageResizer/Service/ImageProcessing.php b/src/TckImageResizer/Service/ImageProcessing.php
@@ -1,9 +1,9 @@
 <?php
 /**
- * Smart image resizing (and manipulation) by url module for Zend Framework 2
+ * Smart image resizing (and manipulation) by url module for Zend Framework 3
  *
  * @link      http://github.com/tck/zf2-imageresizer for the canonical source repository
- * @copyright Copyright (c) 2014 Tobias Knab
+ * @copyright Copyright (c) 2017 Tobias Knab
  * 
  * For the full copyright and license information, please view the LICENSE.txt
  * file that was distributed with this source code.