Merge branch 'feature/36' into develop

Close #36
Close #45

Author: weierophinney

.gitignore

@@ -1,2 +1 @@
-composer.lock
 vendor/

.travis.yml

@@ -5,33 +5,60 @@ language: php
 cache:
   directories:
     - $HOME/.composer/cache
+    - vendor
+
+env:
+  global:
+    - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
 
 matrix:
   fast_finish: true
   include:
-    - php: 5.5
+    - php: 5.6
+      env:
+        - DEPS=lowest
+    - php: 5.6
       env:
-        - EXECUTE_CS_CHECK=true
+        - DEPS=locked
     - php: 5.6
       env:
-        - EXECUTE_COVERAGE=true
+        - DEPS=latest
+    - php: 7
+      env:
+        - DEPS=lowest
+    - php: 7
+      env:
+        - DEPS=locked
+        - CS_CHECK=true
     - php: 7
+      env:
+        - DEPS=latest
+    - php: hhvm 
+      env:
+        - DEPS=lowest
     - php: hhvm 
+      env:
+        - DEPS=locked
+    - php: hhvm 
+      env:
+        - DEPS=latest
   allow_failures:
-    - php: 7
     - php: hhvm
 
 notifications:
   irc: "irc.freenode.org#apigility-dev"
   email: false
 
 before_install:
-  - if [[ $EXECUTE_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
-  - composer self-update
+  - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
+  - travis_retry composer self-update
 
 install:
-  - travis_retry composer install --no-interaction --ignore-platform-reqs --prefer-source
+  - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
+  - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
+  - travis_retry composer install $COMPOSER_ARGS
+  - composer show
 
 script:
-  - ./vendor/bin/phpunit
-  - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/phpcs ; fi
+  - composer test
+  - if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi

CHANGELOG.md

@@ -0,0 +1,29 @@
+# Changelog
+
+All notable changes to this project will be documented in this file, in reverse chronological order by release.
+
+## 1.2.0 - TBD
+
+### Added
+
+- [#45](https://github.com/zfcampus/zf-api-problem/pull/45) adds support for PHP 7.
+- [#45](https://github.com/zfcampus/zf-api-problem/pull/45) adds support for
+  version 3 components of Zend Framework.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- [#45](https://github.com/zfcampus/zf-api-problem/pull/45) removes support for
+  PHP 5.6.
+- [#45](https://github.com/zfcampus/zf-api-problem/pull/45) removes the
+  `Module::getAutoloaderConfig()` implementation, as it was redundant in
+  composer-based applications.
+
+### Fixed
+
+- [#45](https://github.com/zfcampus/zf-api-problem/pull/45) ensures that
+  definition and attachment of the listener aggregates defined in the module
+  will work with both v2 and v3 versions of zend-eventmanager.

Module.php

@@ -8,26 +8,13 @@
 
 use Zend\Mvc\ResponseSender\SendResponseEvent;
 use Zend\Mvc\MvcEvent;
+use ZF\ApiProblem\Listener\SendApiProblemResponseListener;
 
 /**
  * ZF2 module
  */
 class Module
 {
-    /**
-     * Retrieve autoloader configuration
-     *
-     * @return array
-     */
-    public function getAutoloaderConfig()
-    {
-        return array(
-            'Zend\Loader\StandardAutoloader' => array('namespaces' => array(
-                __NAMESPACE__ => __DIR__ . '/src/',
-            ))
-        );
-    }
-
     /**
      * Retrieve module configuration
      *
@@ -43,21 +30,21 @@ public function getConfig()
      *
      * Attaches a render event.
      *
-     * @param  \Zend\Mvc\MvcEvent $e
+     * @param  MvcEvent $e
      */
-    public function onBootstrap($e)
+    public function onBootstrap(MvcEvent $e)
     {
         $app            = $e->getTarget();
         $serviceManager = $app->getServiceManager();
         $eventManager   = $app->getEventManager();
 
-        $eventManager->attach($serviceManager->get('ZF\ApiProblem\ApiProblemListener'));
-        $eventManager->attach(MvcEvent::EVENT_RENDER, array($this, 'onRender'), 100);
+        $serviceManager->get('ZF\ApiProblem\ApiProblemListener')->attach($eventmanager);
+        $eventManager->attach(MvcEvent::EVENT_RENDER, [$this, 'onRender'], 100);
 
         $sendResponseListener = $serviceManager->get('SendResponseListener');
         $sendResponseListener->getEventManager()->attach(
             SendResponseEvent::EVENT_SEND_RESPONSE,
-            $serviceManager->get('ZF\ApiProblem\Listener\SendApiProblemResponseListener'),
+            $serviceManager->get(SendApiProblemResponseListener::class),
             -500
         );
     }
@@ -67,9 +54,9 @@ public function onBootstrap($e)
      *
      * Attaches a rendering/response strategy to the View.
      *
-     * @param  \Zend\Mvc\MvcEvent $e
+     * @param  MvcEvent $e
      */
-    public function onRender($e)
+    public function onRender(MvcEvent $e)
     {
         $app      = $e->getTarget();
         $services = $app->getServiceManager();
@@ -80,7 +67,7 @@ public function onRender($e)
 
             // register at high priority, to "beat" normal json strategy registered
             // via view manager, as well as HAL strategy.
-            $events->attach($services->get('ZF\ApiProblem\ApiProblemStrategy'), 400);
+            $services->get('ZF\ApiProblem\ApiProblemStrategy')->attach($events, 400);
         }
     }
 }

composer.json

@@ -17,27 +17,25 @@
         "source": "https://github.com/zfcampus/zf-api-problem",
         "issues": "https://github.com/zfcampus/zf-api-problem/issues"
     },
-    "repositories": [
-        { "type": "composer", "url": "https://packages.zendframework.com" }
-    ],
     "extra": {
         "branch-alias": {
             "dev-master": "1.1-dev",
             "dev-develop": "1.2-dev"
+        },
+        "zf": {
+            "module": "ZF\\ApiProblem"
         }
     },
     "require": {
-        "php": ">=5.5",
-        "zendframework/zend-eventmanager": "~2.3",
-        "zendframework/zend-http": "~2.3",
-        "zendframework/zend-json": "~2.3",
-        "zendframework/zend-mvc": "~2.3",
-        "zendframework/zend-view": "~2.3"
+        "php": "^5.6 || ^7.0",
+        "zendframework/zend-eventmanager": "^2.6.3 || ^3.0.1",
+        "zendframework/zend-http": "^2.5.4",
+        "zendframework/zend-json": "^2.6.1 || ^3.0",
+        "zendframework/zend-mvc": "^2.7.9 || ^3.0.2",
+        "zendframework/zend-view": "^2.8.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.7",
-        "zendframework/zend-console": "~2.3",
-        "zendframework/zend-loader": "~2.3",
+        "phpunit/phpunit": "^4.8",
         "squizlabs/php_codesniffer": "^2.3.1"
     },
     "autoload": {
@@ -52,5 +50,14 @@
         "psr-4": {
             "ZFTest\\ApiProblem\\": "test/"
         }
+    },
+    "scripts": {
+        "check": [
+            "@cs-check",
+            "@test"
+        ],
+        "cs-check": "phpcs",
+        "cs-fix": "phpcbf",
+        "test": "phpunit"
     }
 }