Merge pull request #44 from AGmakonts/feature/zf3-support

ZF MVC 3.0.0 compatibility

Conflicts:
	Module.php
	composer.json
	config/module.config.php
	src/ApiProblem.php
	src/Listener/ApiProblemListener.php
	src/Listener/RenderErrorListener.php
	src/View/ApiProblemStrategy.php
	test/ApiProblemResponseTest.php

Author: weierophinney

Module.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @license   http://opensource.org/licenses/BSD-3-Clause BSD-3-Clause
  * @copyright Copyright (c) 2014 Zend Technologies USA Inc. (http://www.zend.com)
@@ -11,7 +12,7 @@
 use ZF\ApiProblem\Listener\SendApiProblemResponseListener;
 
 /**
- * ZF2 module
+ * ZF2 module.
  */
 class Module
 {
@@ -26,19 +27,19 @@ public function getConfig()
     }
 
     /**
-     * Listener for bootstrap event
+     * Listener for bootstrap event.
      *
      * Attaches a render event.
      *
      * @param  MvcEvent $e
      */
     public function onBootstrap(MvcEvent $e)
     {
-        $app            = $e->getTarget();
+        $app = $e->getTarget();
         $serviceManager = $app->getServiceManager();
         $eventManager   = $app->getEventManager();
 
-        $serviceManager->get('ZF\ApiProblem\ApiProblemListener')->attach($eventmanager);
+        $serviceManager->get(ApiProblemListener::class)->attach($eventmanager);
         $eventManager->attach(MvcEvent::EVENT_RENDER, [$this, 'onRender'], 100);
 
         $sendResponseListener = $serviceManager->get('SendResponseListener');
@@ -50,24 +51,24 @@ public function onBootstrap(MvcEvent $e)
     }
 
     /**
-     * Listener for the render event
+     * Listener for the render event.
      *
      * Attaches a rendering/response strategy to the View.
      *
      * @param  MvcEvent $e
      */
     public function onRender(MvcEvent $e)
     {
-        $app      = $e->getTarget();
+        $app = $e->getTarget();
         $services = $app->getServiceManager();
 
         if ($services->has('View')) {
-            $view   = $services->get('View');
+            $view = $services->get('View');
             $events = $view->getEventManager();
 
             // register at high priority, to "beat" normal json strategy registered
             // via view manager, as well as HAL strategy.
-            $services->get('ZF\ApiProblem\ApiProblemStrategy')->attach($events, 400);
+            $services->get(ApiProblemStrategy::class)->attach($events, 400);
         }
     }
 }

ModuleTest.php

@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Creator: adamgrabek
+ * Date: 08.06.2016
+ * Time: 00:06.
+ */
+
+namespace ZF\ApiProblem;
+
+use PHPUnit_Framework_TestCase as TestCase;
+use Zend\EventManager\EventManager;
+use Zend\EventManager\SharedEventManager;
+use Zend\Mvc\Application;
+use Zend\Mvc\MvcEvent;
+use Zend\Mvc\SendResponseListener;
+use Zend\ServiceManager\ServiceLocatorInterface;
+use ZF\ApiProblem\Listener\ApiProblemListener;
+use ZF\ApiProblem\Listener\SendApiProblemResponseListener;
+
+class ModuleTest extends TestCase
+{
+    public function testOnBootstrap()
+    {
+        $module = new Module();
+
+        $application = $this->getMock(Application::class, [], [], '', false);
+        $serviceLocator = $this->getMockForAbstractClass(ServiceLocatorInterface::class);
+        $serviceLocator->method('get')->will($this->returnCallback([$this, 'serviceLocator']));
+
+        $eventManager = new EventManager(new SharedEventManager());
+        $event = $this->getMock(MvcEvent::class);
+
+        $application->method('getServiceManager')->willReturn($serviceLocator);
+        $application->method('getEventManager')->willReturn($eventManager);
+        $event->expects($this->once())->method('getTarget')->willReturn($application);
+
+        $module->onBootstrap($event);
+    }
+
+    public function serviceLocator($service)
+    {
+        switch ($service) {
+            case 'ZF\ApiProblem\Listener\ApiProblemListener':
+                return new ApiProblemListener();
+                break;
+            case 'SendResponseListener':
+                $listener = $this->getMock(SendResponseListener::class);
+                $listener->method('getEventManager')->willReturn(new EventManager());
+
+                return $listener;
+                break;
+            case SendApiProblemResponseListener::class :
+                return new SendApiProblemResponseListener();
+            default:
+                //
+        }
+    }
+}

composer.lock

@@ -1,7 +1,7 @@
 <?php
 /**
  * @license   http://opensource.org/licenses/BSD-3-Clause BSD-3-Clause
- * @copyright Copyright (c) 2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2014-2016 Zend Technologies USA Inc. (http://www.zend.com)
  */
 
 namespace ZF\ApiProblem;
@@ -34,6 +34,6 @@
         // 'accept_filters' => $stringOrArray,
 
         // Array of controller service names that should enable the ApiProblem render.error listener
-        //'render_error_controllers' => [],
+        // 'render_error_controllers' => [],
     ],
 ];

config/module.config.php

@@ -3,5 +3,8 @@
         <testsuite name="ZFApiProblem Module Tests">
             <directory>./test</directory>
         </testsuite>
+        <testsuite name="ZFApiProblem Module Class tests">
+            <file>./ModuleTest.php</file>
+        </testsuite>
     </testsuites>
 </phpunit>