From b40e5b03409b8e4a3b4cb391f1b94ee2971089e5 Mon Sep 17 00:00:00 2001
From: Rob Shipley <rwjshipley@gmail.com>
Date: Wed, 24 Aug 2016 16:07:22 +0100
Subject: [PATCH] Upgraded to zf3 functionality

---
 Module.php                                    | 17 --------
 autoload_classmap.php                         | 13 ------
 autoload_function.php                         | 12 ------
 autoload_register.php                         |  2 -
 composer.json                                 | 15 +++----
 .../Module/AbstractModule.php                 |  4 --
 .../Module/AbstractModuleNoTraits.php         | 43 +------------------
 .../AutoloaderProviderDefaultTrait.php        | 36 ----------------
 .../ModuleManager/Feature/ClassDirTrait.php   |  2 +-
 9 files changed, 8 insertions(+), 136 deletions(-)
 delete mode 100644 Module.php
 delete mode 100644 autoload_classmap.php
 delete mode 100644 autoload_function.php
 delete mode 100644 autoload_register.php
 delete mode 100644 src/TccAbstractModule/ModuleManager/Feature/AutoloaderProviderDefaultTrait.php

diff --git a/Module.php b/Module.php
deleted file mode 100644
index 326baff..0000000
--- a/Module.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace TccAbstractModule;
-
-use Zend\ModuleManager\Feature\AutoloaderProviderInterface;
-
-class Module implements AutoloaderProviderInterface
-{
-    public function getAutoloaderConfig()
-    {
-        return array(
-            'Zend\Loader\ClassMapAutoloader' => array(
-                __DIR__ . '/autoload_classmap.php',
-            ),
-        );
-    }
-}
diff --git a/autoload_classmap.php b/autoload_classmap.php
deleted file mode 100644
index d5daf45..0000000
--- a/autoload_classmap.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-// Generated by ZF2's ./bin/classmap_generator.php
-return array(
-  'TccAbstractModule\Module'                                               => __DIR__ . '/Module.php',
-  'TccAbstractModule\Module\AbstractModule'                                => __DIR__ . '/src/TccAbstractModule/Module/AbstractModule.php',
-  'TccAbstractModule\ModuleManager\Feature\AutoloaderProviderDefaultTrait' => __DIR__ . '/src/TccAbstractModule/ModuleManager/Feature/AutoloaderProviderDefaultTrait.php',
-  'TccAbstractModule\ModuleManager\Feature\ClassDirTrait'                  => __DIR__ . '/src/TccAbstractModule/ModuleManager/Feature/ClassDirTrait.php',
-  'TccAbstractModule\ModuleManager\Feature\ClassNamespaceTrait'            => __DIR__ . '/src/TccAbstractModule/ModuleManager/Feature/ClassNamespaceTrait.php',
-  'TccAbstractModule\ModuleManager\Feature\ConfigProviderTrait'            => __DIR__ . '/src/TccAbstractModule/ModuleManager/Feature/ConfigProviderTrait.php',
-  'TccAbstractModule\ModuleManager\Feature\ControllerConfigProviderTrait'  => __DIR__ . '/src/TccAbstractModule/ModuleManager/Feature/ControllerConfigProviderTrait.php',
-  'TccAbstractModule\ModuleManager\Feature\ServiceConfigProviderTrait'     => __DIR__ . '/src/TccAbstractModule/ModuleManager/Feature/ServiceConfigProviderTrait.php',
-  'TccAbstractModule\ModuleManager\Feature\ViewHelperConfigProviderTrait'  => __DIR__ . '/src/TccAbstractModule/ModuleManager/Feature/ViewHelperConfigProviderTrait.php',
-);
diff --git a/autoload_function.php b/autoload_function.php
deleted file mode 100644
index 3ea81c4..0000000
--- a/autoload_function.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-return function ($class) {
-    static $map;
-    if (!$map) {
-        $map = include __DIR__ . '/autoload_classmap.php';
-    }
-
-    if (!isset($map[$class])) {
-        return false;
-    }
-    return include $map[$class];
-};
diff --git a/autoload_register.php b/autoload_register.php
deleted file mode 100644
index a8dcbb4..0000000
--- a/autoload_register.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-spl_autoload_register(include __DIR__ . '/autoload_function.php');
diff --git a/composer.json b/composer.json
index 64074c2..20d41dc 100644
--- a/composer.json
+++ b/composer.json
@@ -11,14 +11,11 @@
     ],
     "require": {
         "php": ">=5.3.0"
-   },
-	"minimum-stability" : "stable",
-	"autoload": {
-        "psr-0": {
-            "TccAbstractModule": "src/"
-        },
-        "classmap": [
-            "./Module.php"
-        ]
+    },
+    "minimum-stability" : "stable",
+    "autoload": {
+        "psr-4": {
+            "TccAbstractModule\\": "src/TccAbstractModule/"
+        }
     }
 }
diff --git a/src/TccAbstractModule/Module/AbstractModule.php b/src/TccAbstractModule/Module/AbstractModule.php
index a0bac65..7b91e31 100644
--- a/src/TccAbstractModule/Module/AbstractModule.php
+++ b/src/TccAbstractModule/Module/AbstractModule.php
@@ -2,22 +2,18 @@
 
 namespace TccAbstractModule\Module;
 
-use Zend\ModuleManager\Feature\AutoloaderProviderInterface;
 use Zend\ModuleManager\Feature\ConfigProviderInterface;
 use Zend\ModuleManager\Feature\ControllerProviderInterface;
 use Zend\ModuleManager\Feature\ServiceProviderInterface;
 use Zend\ModuleManager\Feature\ViewHelperProviderInterface;
 
 abstract class AbstractModule implements
-    AutoloaderProviderInterface,
     ConfigProviderInterface,
     ControllerProviderInterface,
     ServiceProviderInterface,
     ViewHelperProviderInterface
 {
     use \TccAbstractModule\ModuleManager\Feature\ClassDirTrait;
-    use \TccAbstractModule\ModuleManager\Feature\ClassNamespaceTrait;
-    use \TccAbstractModule\ModuleManager\Feature\AutoloaderProviderDefaultTrait;
     use \TccAbstractModule\ModuleManager\Feature\ConfigProviderTrait;
     use \TccAbstractModule\ModuleManager\Feature\ControllerConfigProviderTrait;
     use \TccAbstractModule\ModuleManager\Feature\ServiceConfigProviderTrait;
diff --git a/src/TccAbstractModule/Module/AbstractModuleNoTraits.php b/src/TccAbstractModule/Module/AbstractModuleNoTraits.php
index 0f9ea5a..571e947 100644
--- a/src/TccAbstractModule/Module/AbstractModuleNoTraits.php
+++ b/src/TccAbstractModule/Module/AbstractModuleNoTraits.php
@@ -13,7 +13,6 @@
 use Zend\Stdlib\ArrayUtils;
 
 abstract class AbstractModuleNoTraits implements
-    AutoloaderProviderInterface,
     ConfigProviderInterface,
     ControllerProviderInterface,
     ServiceProviderInterface,
@@ -35,34 +34,6 @@ abstract class AbstractModuleNoTraits implements
      */
     protected $relativeModuleDir = '';
 
-    /**
-     * Return an array to configure a default autoloader instance.
-     *
-     * @return array
-     */
-    public function getAutoloaderConfig()
-    {
-        $autoloaderArray = array();
-
-        // If this module has a defined classmap, add a classmap autoloader.
-        $classmapPath = $this->getDir() . '/' . $this->relativeModuleDir . 'autoload_classmap.php';
-        if (file_exists($classmapPath)) {
-            $autoloaderArray['Zend\Loader\ClassMapAutoloader'] = array(
-                $classmapPath
-            );
-        }
-
-        // Fallback to a PSR-0 autoloader.
-        $autoloaderArray['Zend\Loader\StandardAutoloader'] = array(
-            'namespaces' => array(
-                $this->getNamespace() =>
-                $this->getDir() . '/' . $this->relativeModuleDir . 'src/' . $this->getNamespace(),
-            ),
-        );
-
-        return $autoloaderArray;
-    }
-
     /**
      * Return and merge configuration for this module from the default location of ./config/module.config{,.*}php.
      *
@@ -167,18 +138,6 @@ public function getViewHelperConfig()
     protected function getDir()
     {
         $reflectionClass = new \ReflectionClass(get_class($this));
-        return dirname($reflectionClass->getFileName());
-    }
-
-    /**
-     * Because __NAMESPACE__ in a child class returns the namespace for the parent class, this workaround is required
-     * to get the namespace of the child class.
-     *
-     * @returns string
-     */
-    protected function getNamespace()
-    {
-        $reflectionClass = new \ReflectionClass(get_class($this));
-        return dirname($reflectionClass->getNamespaceName());
+        return dirname($reflectionClass->getFileName()) . '/..';
     }
 }
diff --git a/src/TccAbstractModule/ModuleManager/Feature/AutoloaderProviderDefaultTrait.php b/src/TccAbstractModule/ModuleManager/Feature/AutoloaderProviderDefaultTrait.php
deleted file mode 100644
index 3ea744d..0000000
--- a/src/TccAbstractModule/ModuleManager/Feature/AutoloaderProviderDefaultTrait.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace TccAbstractModule\ModuleManager\Feature;
-
-trait AutoloaderProviderDefaultTrait {
-    //use ClassDirTrait;
-    //use ClassNamespaceTrait;
-
-    /**
-     * Return an array to configure a default autoloader instance.
-     *
-     * @return array
-     */
-    public function getAutoloaderConfig()
-    {
-        $autoloaderArray = array();
-
-        // If this module has a defined classmap, add a classmap autoloader.
-        $classmapPath = $this->getDir() . '/' . $this->relativeModuleDir . 'autoload_classmap.php';
-        if (file_exists($classmapPath)) {
-            $autoloaderArray['Zend\Loader\ClassMapAutoloader'] = array(
-                $classmapPath
-            );
-        }
-
-        // Fallback to a PSR-0 autoloader.
-        $autoloaderArray['Zend\Loader\StandardAutoloader'] = array(
-            'namespaces' => array(
-                $this->getNamespace() =>
-                    $this->getDir() . '/' . $this->relativeModuleDir . 'src/' . $this->getNamespace(),
-            ),
-        );
-
-        return $autoloaderArray;
-    }
-}
diff --git a/src/TccAbstractModule/ModuleManager/Feature/ClassDirTrait.php b/src/TccAbstractModule/ModuleManager/Feature/ClassDirTrait.php
index 2219c8b..ad864f2 100644
--- a/src/TccAbstractModule/ModuleManager/Feature/ClassDirTrait.php
+++ b/src/TccAbstractModule/ModuleManager/Feature/ClassDirTrait.php
@@ -12,6 +12,6 @@ trait ClassDirTrait
      */
     protected function getDir()
     {
-        return dirname((new \ReflectionClass(get_class($this)))->getFileName());
+        return dirname((new \ReflectionClass(get_class($this)))->getFileName()) . '/..';
     }
 }