Merge pull request #11 from xl32/master

ZF3 support added

Author: davidwindell

config/module.config.php

@@ -28,9 +28,9 @@
     ),
 
     'controllers' => array(
-        'invokables' => array(
-            'SwaggerModule\Controller\Documentation' => 'SwaggerModule\Controller\DocumentationController'
-        )
+        'factories' => array(
+            'SwaggerModule\Controller\Documentation' => 'SwaggerModule\Controller\DocumentationControllerFactory',
+        ),
     ),
 
     'view_manager' => array(

src/SwaggerModule/Controller/DocumentationController.php

@@ -20,6 +20,7 @@
 
 namespace SwaggerModule\Controller;
 
+use Swagger\Annotations\Swagger;
 use Zend\Mvc\Controller\AbstractActionController;
 use Zend\View\Model\JsonModel;
 
@@ -28,16 +29,20 @@
  */
 class DocumentationController extends AbstractActionController
 {
+    protected $swagger;
+
+    public function setSwagger(Swagger $swagger) {
+        $this->swagger = $swagger;
+    }
+
     /**
      * Display the documentation
      *
      * @return JsonModel
      */
     public function displayAction()
     {
-        /** @var $swagger \Swagger\Annotations\Swagger */
-        $swagger = $this->serviceLocator->get('Swagger\Annotations\Swagger');
-        $jsonModel = new JsonModel((array)$swagger->jsonSerialize());
+        $jsonModel = new JsonModel((array)$this->swagger->jsonSerialize());
         return $jsonModel;
     }
 
@@ -48,13 +53,10 @@ public function displayAction()
      */
     public function detailsAction()
     {
-        /** @var $swagger \Swagger\Swagger */
-        $swagger = $this->serviceLocator->get('Swagger\Annotations\Swagger');
-
         /** @var $options \SwaggerModule\Options\ModuleOptions */
         $options = $this->serviceLocator->get('SwaggerModule\Options\ModuleOptions');
         $resourceOptions = $options->getResourceOptions() ? : array();
-        $resource = $swagger->getResource('/' . $this->params('resource', null), $resourceOptions);
+        $resource = $this->swagger->getResource('/' . $this->params('resource', null), $resourceOptions);
 
         if ($resource === false) {
             return new JsonModel();

src/SwaggerModule/Controller/DocumentationControllerFactory.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * SwaggerModule
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @copyright  Copyright (c) 2012 OuterEdge UK Ltd (http://www.outeredgeuk.com)
+ * @license http://www.apache.org/licenses/LICENSE-2.0
+ */
+
+namespace SwaggerModule\Controller;
+
+use Zend\ServiceManager\Factory\FactoryInterface;
+use Interop\Container\ContainerInterface;
+
+/**
+ * DocumentationController factory
+ */
+class DocumentationControllerFactory implements FactoryInterface
+{
+    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
+    {
+        $controller = new DocumentationController();
+        /** @var \Swagger\Annotations\Swagger */
+        $swagger = $container->get('Swagger\Annotations\Swagger');
+        $controller->setSwagger($swagger);
+        return $controller;
+    }
+}