Merge remote-tracking branch 'origin/hotfix/psr-4' into develop

hummer2k · Dec 26, 2019 · 26530cc · 26530cc
2 parents 0145583 + aacd025
commit 26530cc
Show file tree

Hide file tree

Showing 27 changed files with 11 additions and 28 deletions.
diff --git a/Module.php b/Module.php
diff --git a/composer.json b/composer.json
@@ -37,8 +37,13 @@
         "hummer2k/conlayout": "To use ESI processing feature."
     },
     "autoload": {
-        "psr-0": {
+        "psr-4": {
             "ConVarnish\\": "src/"
         }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "ConVarnishTest\\": "tests/"
+        }
     }
 }
diff --git a/src/ConVarnish/Controller/EsiController.php → src/Controller/EsiController.php b/src/ConVarnish/Controller/EsiController.php → src/Controller/EsiController.php
diff --git a/...sh/Listener/InjectCacheHeaderListener.php → src/Listener/InjectCacheHeaderListener.php b/...sh/Listener/InjectCacheHeaderListener.php → src/Listener/InjectCacheHeaderListener.php
diff --git a/...ener/InjectCacheHeaderListenerFactory.php → ...ener/InjectCacheHeaderListenerFactory.php b/...ener/InjectCacheHeaderListenerFactory.php → ...ener/InjectCacheHeaderListenerFactory.php
diff --git a/...ish/Listener/InjectTagsHeaderListener.php → src/Listener/InjectTagsHeaderListener.php b/...ish/Listener/InjectTagsHeaderListener.php → src/Listener/InjectTagsHeaderListener.php
diff --git a/src/ConVarnish/Module.php → src/Module.php b/src/ConVarnish/Module.php → src/Module.php
@@ -21,8 +21,7 @@
 class Module implements
     ConfigProviderInterface,
     ServiceProviderInterface,
-    BootstrapListenerInterface,
-    AutoloaderProviderInterface
+    BootstrapListenerInterface
 {
     /**
      * retrieve module config
@@ -32,8 +31,8 @@ class Module implements
     public function getConfig()
     {
         return array_merge(
-            include __DIR__ . '/../../config/module.config.php',
-            include __DIR__ . '/../../config/con-varnish.global.php.dist'
+            include __DIR__ . '/../config/module.config.php',
+            include __DIR__ . '/../config/con-varnish.global.php.dist'
         );
     }
 
@@ -43,11 +42,12 @@ public function getConfig()
      */
     public function getServiceConfig()
     {
-        return include __DIR__ . '/../../config/service.config.php';
+        return include __DIR__ . '/../config/service.config.php';
     }
 
     /**
      * @param EventInterface $e
+     * @return array|void
      */
     public function onBootstrap(EventInterface $e)
     {
@@ -74,22 +74,5 @@ public function onBootstrap(EventInterface $e)
         foreach ($cachingStrategies as $cachingStrategy => $priority) {
             $serviceManager->get($cachingStrategy)->attach($eventManager, $priority);
         }
-
-    }
-
-    /**
-     * retrieve autoloader config
-     *
-     * @return array
-     */
-    public function getAutoloaderConfig()
-    {
-        return [
-            'Zend\Loader\StandardAutoloader' => [
-                'namespaces' => [
-                    __NAMESPACE__ => __DIR__
-                ],
-            ],
-        ];
     }
 }
diff --git a/src/ConVarnish/Options/VarnishOptions.php → src/Options/VarnishOptions.php b/src/ConVarnish/Options/VarnishOptions.php → src/Options/VarnishOptions.php
diff --git a/...Varnish/Options/VarnishOptionsFactory.php → src/Options/VarnishOptionsFactory.php b/...Varnish/Options/VarnishOptionsFactory.php → src/Options/VarnishOptionsFactory.php
diff --git a/src/ConVarnish/Service/VarnishService.php → src/Service/VarnishService.php b/src/ConVarnish/Service/VarnishService.php → src/Service/VarnishService.php
diff --git a/...Varnish/Service/VarnishServiceFactory.php → src/Service/VarnishServiceFactory.php b/...Varnish/Service/VarnishServiceFactory.php → src/Service/VarnishServiceFactory.php
diff --git a/...rnish/Service/VarnishServiceInterface.php → src/Service/VarnishServiceInterface.php b/...rnish/Service/VarnishServiceInterface.php → src/Service/VarnishServiceInterface.php
diff --git a/...nish/Strategy/AbstractCachingStrategy.php → src/Strategy/AbstractCachingStrategy.php b/...nish/Strategy/AbstractCachingStrategy.php → src/Strategy/AbstractCachingStrategy.php
diff --git a/src/ConVarnish/Strategy/ActionStrategy.php → src/Strategy/ActionStrategy.php b/src/ConVarnish/Strategy/ActionStrategy.php → src/Strategy/ActionStrategy.php
diff --git a/...rnish/Strategy/CachingStrategyFactory.php → src/Strategy/CachingStrategyFactory.php b/...rnish/Strategy/CachingStrategyFactory.php → src/Strategy/CachingStrategyFactory.php
diff --git a/...ish/Strategy/CachingStrategyInterface.php → src/Strategy/CachingStrategyInterface.php b/...ish/Strategy/CachingStrategyInterface.php → src/Strategy/CachingStrategyInterface.php
diff --git a/src/ConVarnish/Strategy/DefaultStrategy.php → src/Strategy/DefaultStrategy.php b/src/ConVarnish/Strategy/DefaultStrategy.php → src/Strategy/DefaultStrategy.php
diff --git a/src/ConVarnish/Strategy/EsiStrategy.php → src/Strategy/EsiStrategy.php b/src/ConVarnish/Strategy/EsiStrategy.php → src/Strategy/EsiStrategy.php
diff --git a/src/ConVarnish/Strategy/RouteStrategy.php → src/Strategy/RouteStrategy.php b/src/ConVarnish/Strategy/RouteStrategy.php → src/Strategy/RouteStrategy.php
diff --git a/src/ConVarnish/View/Helper/EsiUrl.php → src/View/Helper/EsiUrl.php b/src/ConVarnish/View/Helper/EsiUrl.php → src/View/Helper/EsiUrl.php
diff --git a/tests/ConVarnishTest/AbstractTest.php → tests/AbstractTest.php b/tests/ConVarnishTest/AbstractTest.php → tests/AbstractTest.php
diff --git a/...istener/InjectCacheHeaderListenerTest.php → ...istener/InjectCacheHeaderListenerTest.php b/...istener/InjectCacheHeaderListenerTest.php → ...istener/InjectCacheHeaderListenerTest.php
@@ -194,7 +194,6 @@ public function testInjectEsi()
             InjectCacheHeaderListener::ESI_TEMPLATE,
             $block->getTemplate()
         );
-
     }
 
     public function testStrategyPriorities()

diff --git a/...Listener/InjectTagsHeaderListenerTest.php → ...Listener/InjectTagsHeaderListenerTest.php b/...Listener/InjectTagsHeaderListenerTest.php → ...Listener/InjectTagsHeaderListenerTest.php
diff --git a/tests/ConVarnishTest/ModuleTest.php → tests/ModuleTest.php b/tests/ConVarnishTest/ModuleTest.php → tests/ModuleTest.php
@@ -23,7 +23,6 @@ public function setUp()
 
     public function testGetConfigs()
     {
-        $this->assertInternalType('array', $this->module->getAutoloaderConfig());
         $this->assertInternalType('array', $this->module->getConfig());
         $this->assertInternalType('array', $this->module->getServiceConfig());
     }

diff --git a/...arnishTest/Options/VarnishOptionsTest.php → tests/Options/VarnishOptionsTest.php b/...arnishTest/Options/VarnishOptionsTest.php → tests/Options/VarnishOptionsTest.php
diff --git a/...arnishTest/Service/VarnishServiceTest.php → tests/Service/VarnishServiceTest.php b/...arnishTest/Service/VarnishServiceTest.php → tests/Service/VarnishServiceTest.php
diff --git a/...ConVarnishTest/View/Helper/EsiUrlTest.php → tests/View/Helper/EsiUrlTest.php b/...ConVarnishTest/View/Helper/EsiUrlTest.php → tests/View/Helper/EsiUrlTest.php