Resolve modules using PHP 5.5 ::class

src/Listener/ModuleResolverListener.php

@@ -23,6 +23,10 @@ class ModuleResolverListener extends AbstractListener
     public function __invoke(ModuleEvent $e)
     {
         $moduleName = $e->getModuleName();
+        if (class_exists($moduleName)) {
+            return new $moduleName;
+        }
+
         $class      = $moduleName . '\Module';
 
         if (!class_exists($class)) {

test/Listener/ModuleResolverListenerTest.php

@@ -9,6 +9,7 @@
 
 namespace ZendTest\ModuleManager\Listener;
 
+use ListenerTestModule;
 use PHPUnit_Framework_TestCase as TestCase;
 use Zend\Loader\AutoloaderFactory;
 use Zend\Loader\ModuleAutoloader;
@@ -54,13 +55,32 @@ public function tearDown()
         set_include_path($this->includePath);
     }
 
-    public function testModuleResolverListenerCanResolveModuleClasses()
+    /**
+     * @dataProvider validModuleNameProvider
+     */
+    public function testModuleResolverListenerCanResolveModuleClasses($moduleName, $expectedInstanceOf)
     {
         $moduleResolver = new ModuleResolverListener;
         $e = new ModuleEvent;
 
-        $e->setModuleName('ListenerTestModule');
-        $this->assertInstanceOf('ListenerTestModule\Module', $moduleResolver($e));
+        $e->setModuleName($moduleName);
+        $this->assertInstanceOf($expectedInstanceOf, $moduleResolver($e));
+    }
+
+    public function validModuleNameProvider()
+    {
+        return [
+            // Description => [module name, expectedInstanceOf]
+            'Append Module' => ['ListenerTestModule', ListenerTestModule\Module::class],
+            'FQCN Module' => [ListenerTestModule\Module::class, ListenerTestModule\Module::class],
+            'FQCN Arbitrary' => [ListenerTestModule\FooModule::class, ListenerTestModule\FooModule::class],
+        ];
+    }
+
+    public function testModuleResolverListenerReturnFalseIfCannotResolveModuleClasses()
+    {
+        $moduleResolver = new ModuleResolverListener;
+        $e = new ModuleEvent;
 
         $e->setModuleName('DoesNotExist');
         $this->assertFalse($moduleResolver($e));

test/TestAsset/ListenerTestModule/FooModule.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace ListenerTestModule;
+
+class FooModule
+{
+}