Merge pull request #185 from thomasvargiu/fix/zf2-bis

Fix zf2

Module.php

@@ -1,25 +1,3 @@
 <?php
-namespace TwbBundle;
-class Module implements
-	\Zend\ModuleManager\Feature\ConfigProviderInterface,
-	\Zend\ModuleManager\Feature\AutoloaderProviderInterface{
 
-	/**
-	 * @see \Zend\ModuleManager\Feature\AutoloaderProviderInterface::getAutoloaderConfig()
-	 * @return array
-	 */
-	public function getAutoloaderConfig(){
-        return array(
-            'Zend\Loader\ClassMapAutoloader' => array(
-                __DIR__.DIRECTORY_SEPARATOR.'autoload_classmap.php'
-            )
-        );
-    }
-
-    /**
-     * @return array
-     */
-    public function getConfig(){
-        return include __DIR__.DIRECTORY_SEPARATOR.'config/module.config.php';
-    }
-}
+require_once __DIR__ . '/src/TwbBundle/Module.php';

composer.json

@@ -5,7 +5,7 @@
     "keywords": ["Zend Framework 2","Twitter Bootstrap","module"],
     "homepage": "http://neilime.github.io/zf2-twb-bundle/",
     "license": "MIT",
-    "minimum-stability" : "stable",
+    "minimum-stability": "stable",
     "authors": [
         {
             "name": "Neilime",
@@ -40,10 +40,9 @@
         "satooshi/php-coveralls": "^0.7"
     },
     "autoload": {
-        "psr-0": {
-            "TwbBundle": "src"
-        },
-        "classmap" : ["Module.php"]
+        "psr-4": {
+            "TwbBundle\\": "src/TwbBundle"
+        }
     },
     "extra": {
         "branch-alias": {

config/module.config.php

@@ -18,9 +18,6 @@
     'service_manager' => array (
         'factories' => array (
             'TwbBundle\Options\ModuleOptions' => 'TwbBundle\Options\Factory\ModuleOptionsFactory',
-            'RoutePluginManager'              => 'Zend\Router\RoutePluginManagerFactory',
-            'Router'                          => 'Zend\Router\RouterFactory',
-            'HttpRouter'                      => 'Zend\Router\Http\HttpRouterFactory',
         )
     ),
     'view_helpers' => array (

src/TwbBundle/Form/View/Helper/Factory/TwbBundleFormElementFactory.php

@@ -1,6 +1,7 @@
 <?php
 namespace TwbBundle\Form\View\Helper\Factory;
 
+use Zend\ServiceManager\AbstractPluginManager;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
 use TwbBundle\Form\View\Helper\TwbBundleFormElement;
@@ -17,12 +18,17 @@ class TwbBundleFormElementFactory implements FactoryInterface
 
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
-        return $this($serviceLocator, 'TwbBundle\Form\View\Helper\TwbBundleFormElement');
+        if ($serviceLocator instanceof AbstractPluginManager) {
+            $serviceLocator = $serviceLocator->getServiceLocator() ?: $serviceLocator;
+        }
+
+        $options = $serviceLocator->get('TwbBundle\Options\ModuleOptions');
+        return new TwbBundleFormElement($options);
     }
 
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {
         $options = $container->get('TwbBundle\Options\ModuleOptions');
         return new TwbBundleFormElement($options);
     }
-}
+}

src/TwbBundle/Module.php

@@ -0,0 +1,25 @@
+<?php
+namespace TwbBundle;
+class Module implements
+	\Zend\ModuleManager\Feature\ConfigProviderInterface,
+	\Zend\ModuleManager\Feature\AutoloaderProviderInterface{
+
+	/**
+	 * @see \Zend\ModuleManager\Feature\AutoloaderProviderInterface::getAutoloaderConfig()
+	 * @return array
+	 */
+	public function getAutoloaderConfig(){
+        return array(
+            'Zend\Loader\ClassMapAutoloader' => array(
+                realpath(__DIR__.DIRECTORY_SEPARATOR.'/../../autoload_classmap.php')
+            )
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function getConfig(){
+        return include __DIR__.DIRECTORY_SEPARATOR.'/../../config/module.config.php';
+    }
+}

src/TwbBundle/Options/Factory/ModuleOptionsFactory.php

@@ -11,7 +11,9 @@ class ModuleOptionsFactory implements FactoryInterface
 
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
-        return $this($serviceLocator, 'TwbBundle\Options\ModuleOptions');
+        $config = $serviceLocator->get('config');
+        $options = $config['twbbundle'];
+        return new ModuleOptions($options);
     }
 
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
@@ -20,4 +22,4 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
         $options = $config['twbbundle'];
         return new ModuleOptions($options);
     }
-}
+}

src/TwbBundle/Options/ModuleOptions.php

@@ -18,7 +18,7 @@ class ModuleOptions extends AbstractOptions
     /**
      * Constructor
      * 
-     * @param array|Traversable|null $options
+     * @param array|\Traversable|null $options
      */
     public function __construct($options = null)
     {

tests/Bootstrap.php

@@ -2,11 +2,7 @@
 
 namespace TwbBundleTest;
 
-use Zend\EventManager\EventManagerAwareInterface;
-use Zend\EventManager\EventManagerInterface;
 use Zend\ServiceManager\ServiceManager;
-use Zend\Stdlib\RequestInterface;
-use Zend\Stdlib\ResponseInterface;
 use Zend\Mvc\Service;
 
 error_reporting(E_ALL | E_STRICT);
@@ -51,7 +47,7 @@ public static function init() {
 
         $configuration = static::$config;
         // Prepare the service manager
-        $smConfig = isset($configuration['service_manager']) ? $configuration['service_manager'] : [];
+        $smConfig = isset($configuration['service_manager']) ? $configuration['service_manager'] : array();
         $smConfig = new Service\ServiceManagerConfig($smConfig);
 
         $serviceManager = new ServiceManager();
@@ -80,7 +76,7 @@ public static function getConfig() {
 
     /**
      * Initialize Autoloader
-     * @throws RuntimeException
+     * @throws \RuntimeException
      */
     protected static function initAutoloader() {
         $sVendorPath = static::findParentPath('vendor');