Merge branch 'hotfix/module-classfile'

Move Module classfile to top-level directory to make usage via git submodule cleaner

Author: weierophinney

Module.php

@@ -4,4 +4,82 @@
  * @copyright Copyright (c) 2013 Zend Technologies USA Inc. (http://www.zend.com)
  */
 
-include __DIR__ . '/src/ZF/ApiProblem/Module.php';
+namespace ZF\ApiProblem;
+
+use Zend\Mvc\ResponseSender\SendResponseEvent;
+
+/**
+ * ZF2 module
+ */
+class Module
+{
+    /**
+     * Retrieve autoloader configuration
+     *
+     * @return array
+     */
+    public function getAutoloaderConfig()
+    {
+        return array(
+            'Zend\Loader\StandardAutoloader' => array('namespaces' => array(
+                __NAMESPACE__ => __DIR__ . '/src/ZF/ApiProblem/',
+            ))
+        );
+    }
+
+    /**
+     * Retrieve module configuration
+     *
+     * @return array
+     */
+    public function getConfig()
+    {
+        return include __DIR__ . '/config/module.config.php';
+    }
+
+    /**
+     * Listener for bootstrap event
+     *
+     * Attaches a render event.
+     *
+     * @param  \Zend\Mvc\MvcEvent $e
+     */
+    public function onBootstrap($e)
+    {
+        $app            = $e->getTarget();
+        $serviceManager = $app->getServiceManager();
+        $eventManager   = $app->getEventManager();
+
+        $eventManager->attach($serviceManager->get('ZF\ApiProblem\ApiProblemListener'));
+        $eventManager->attach('render', array($this, 'onRender'), 100);
+
+        $sendResponseListener = $serviceManager->get('SendResponseListener');
+        $sendResponseListener->getEventManager()->attach(
+            SendResponseEvent::EVENT_SEND_RESPONSE,
+            $serviceManager->get('ZF\ApiProblem\Listener\SendApiProblemResponseListener'),
+            -500
+        );
+    }
+
+    /**
+     * Listener for the render event
+     *
+     * Attaches a rendering/response strategy to the View.
+     *
+     * @param  \Zend\Mvc\MvcEvent $e
+     */
+    public function onRender($e)
+    {
+        $app      = $e->getTarget();
+        $services = $app->getServiceManager();
+
+        if ($services->has('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.
+            $events->attach($services->get('ZF\ApiProblem\ApiProblemStrategy'), 400);
+        }
+    }
+}

composer.json

@@ -41,7 +41,10 @@
     "autoload": {
         "psr-0": {
             "ZF\\ApiProblem\\": "src/",
-            "ZFTest\\": "test/"
-        }
+            "ZFTest\\ApiProblem\\": "test/"
+        },
+        "classmap": [
+            "Module.php"
+        ]
     }
 }

src/ZF/ApiProblem/Module.php

@@ -4,7 +4,7 @@
  * @copyright Copyright (c) 2013 Zend Technologies USA Inc. (http://www.zend.com)
  */
 
-namespace ZFTest;
+namespace ZFTest\ApiProblem;
 
 use Zend\Loader\AutoloaderFactory;
 use RuntimeException;
@@ -50,7 +50,7 @@ protected static function initAutoloader()
                     'autoregister_zf' => true,
                     'namespaces' => array(
                         'ZF\ApiProblem' => __DIR__ . '/../src/ZF/ApiProblem/',
-                        __NAMESPACE__ => __DIR__ . '/' . __NAMESPACE__,
+                        __NAMESPACE__ => __DIR__ . '/ZFTest/ApiProblem/',
                     ),
                 ),
             ));