Merge branch 'feature/psr4' into develop

hummer2k · Apr 20, 2016 · 6059207 · 6059207
2 parents e896ed5 + 60fede3
commit 6059207
Show file tree

Hide file tree

Showing 131 changed files with 9 additions and 26 deletions.
diff --git a/composer.json b/composer.json
@@ -37,7 +37,7 @@
         "satooshi/php-coveralls": "~0.6"
     },
     "autoload": {
-        "psr-0": {
+        "psr-4": {
             "ConLayout\\": "src/",
             "ConLayoutTest\\": "tests/"
         }

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="./tests/ConLayoutTest/Bootstrap.php" colors="true" verbose="true">
+<phpunit bootstrap="./tests/Bootstrap.php" colors="true" verbose="true">
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">./src</directory>

diff --git a/src/ConLayout/Block/AbstractBlock.php → src/Block/AbstractBlock.php b/src/ConLayout/Block/AbstractBlock.php → src/Block/AbstractBlock.php
diff --git a/src/ConLayout/Block/BlockInterface.php → src/Block/BlockInterface.php b/src/ConLayout/Block/BlockInterface.php → src/Block/BlockInterface.php
diff --git a/src/ConLayout/Block/BlockPool.php → src/Block/BlockPool.php b/src/ConLayout/Block/BlockPool.php → src/Block/BlockPool.php
diff --git a/src/ConLayout/Block/BlockPoolInterface.php → src/Block/BlockPoolInterface.php b/src/ConLayout/Block/BlockPoolInterface.php → src/Block/BlockPoolInterface.php
diff --git a/src/ConLayout/Block/Container.php → src/Block/Container.php b/src/ConLayout/Block/Container.php → src/Block/Container.php
diff --git a/src/ConLayout/Block/Factory/BlockFactory.php → src/Block/Factory/BlockFactory.php b/src/ConLayout/Block/Factory/BlockFactory.php → src/Block/Factory/BlockFactory.php
diff --git a/...out/Block/Factory/BlockFactoryFactory.php → src/Block/Factory/BlockFactoryFactory.php b/...out/Block/Factory/BlockFactoryFactory.php → src/Block/Factory/BlockFactoryFactory.php
diff --git a/...t/Block/Factory/BlockFactoryInterface.php → src/Block/Factory/BlockFactoryInterface.php b/...t/Block/Factory/BlockFactoryInterface.php → src/Block/Factory/BlockFactoryInterface.php
diff --git a/src/ConLayout/BlockManager.php → src/BlockManager.php b/src/ConLayout/BlockManager.php → src/BlockManager.php
diff --git a/src/ConLayout/BlockManagerFactory.php → src/BlockManagerFactory.php b/src/ConLayout/BlockManagerFactory.php → src/BlockManagerFactory.php
diff --git a/...ayout/Controller/Plugin/LayoutManager.php → src/Controller/Plugin/LayoutManager.php b/...ayout/Controller/Plugin/LayoutManager.php → src/Controller/Plugin/LayoutManager.php
diff --git a/...ontroller/Plugin/LayoutManagerFactory.php → ...ontroller/Plugin/LayoutManagerFactory.php b/...ontroller/Plugin/LayoutManagerFactory.php → ...ontroller/Plugin/LayoutManagerFactory.php
diff --git a/...yout/Exception/BadMethodCallException.php → src/Exception/BadMethodCallException.php b/...yout/Exception/BadMethodCallException.php → src/Exception/BadMethodCallException.php
diff --git a/...onLayout/Exception/ExceptionInterface.php → src/Exception/ExceptionInterface.php b/...onLayout/Exception/ExceptionInterface.php → src/Exception/ExceptionInterface.php
diff --git a/...ayout/Exception/InvalidBlockException.php → src/Exception/InvalidBlockException.php b/...ayout/Exception/InvalidBlockException.php → src/Exception/InvalidBlockException.php
diff --git a/src/ConLayout/Filter/BasePathFilter.php → src/Filter/BasePathFilter.php b/src/ConLayout/Filter/BasePathFilter.php → src/Filter/BasePathFilter.php
diff --git a/...onLayout/Filter/BasePathFilterFactory.php → src/Filter/BasePathFilterFactory.php b/...onLayout/Filter/BasePathFilterFactory.php → src/Filter/BasePathFilterFactory.php
diff --git a/src/ConLayout/Filter/CacheBusterFilter.php → src/Filter/CacheBusterFilter.php b/src/ConLayout/Filter/CacheBusterFilter.php → src/Filter/CacheBusterFilter.php
diff --git a/...ayout/Filter/CacheBusterFilterFactory.php → src/Filter/CacheBusterFilterFactory.php b/...ayout/Filter/CacheBusterFilterFactory.php → src/Filter/CacheBusterFilterFactory.php
diff --git a/src/ConLayout/Filter/DebugFilter.php → src/Filter/DebugFilter.php b/src/ConLayout/Filter/DebugFilter.php → src/Filter/DebugFilter.php
diff --git a/src/ConLayout/Filter/DebugFilterFactory.php → src/Filter/DebugFilterFactory.php b/src/ConLayout/Filter/DebugFilterFactory.php → src/Filter/DebugFilterFactory.php
diff --git a/...nLayout/Filter/RawValueAwareInterface.php → src/Filter/RawValueAwareInterface.php b/...nLayout/Filter/RawValueAwareInterface.php → src/Filter/RawValueAwareInterface.php
diff --git a/src/ConLayout/Filter/TranslateFilter.php → src/Filter/TranslateFilter.php b/src/ConLayout/Filter/TranslateFilter.php → src/Filter/TranslateFilter.php
diff --git a/...nLayout/Filter/TranslateFilterFactory.php → src/Filter/TranslateFilterFactory.php b/...nLayout/Filter/TranslateFilterFactory.php → src/Filter/TranslateFilterFactory.php
diff --git a/src/ConLayout/Generator/BlocksGenerator.php → src/Generator/BlocksGenerator.php b/src/ConLayout/Generator/BlocksGenerator.php → src/Generator/BlocksGenerator.php
diff --git a/...yout/Generator/BlocksGeneratorFactory.php → src/Generator/BlocksGeneratorFactory.php b/...yout/Generator/BlocksGeneratorFactory.php → src/Generator/BlocksGeneratorFactory.php
diff --git a/...onLayout/Generator/GeneratorInterface.php → src/Generator/GeneratorInterface.php b/...onLayout/Generator/GeneratorInterface.php → src/Generator/GeneratorInterface.php
diff --git a/...nLayout/Generator/ViewHelperGenerator.php → src/Generator/ViewHelperGenerator.php b/...nLayout/Generator/ViewHelperGenerator.php → src/Generator/ViewHelperGenerator.php
diff --git a/.../Generator/ViewHelperGeneratorFactory.php → src/Generator/ViewHelperGeneratorFactory.php b/.../Generator/ViewHelperGeneratorFactory.php → src/Generator/ViewHelperGeneratorFactory.php
diff --git a/src/ConLayout/Handle/Handle.php → src/Handle/Handle.php b/src/ConLayout/Handle/Handle.php → src/Handle/Handle.php
diff --git a/src/ConLayout/Handle/HandleInterface.php → src/Handle/HandleInterface.php b/src/ConLayout/Handle/HandleInterface.php → src/Handle/HandleInterface.php
diff --git a/src/ConLayout/Layout/Layout.php → src/Layout/Layout.php b/src/ConLayout/Layout/Layout.php → src/Layout/Layout.php
diff --git a/src/ConLayout/Layout/LayoutFactory.php → src/Layout/LayoutFactory.php b/src/ConLayout/Layout/LayoutFactory.php → src/Layout/LayoutFactory.php
diff --git a/src/ConLayout/Layout/LayoutInterface.php → src/Layout/LayoutInterface.php b/src/ConLayout/Layout/LayoutInterface.php → src/Layout/LayoutInterface.php
diff --git a/...Layout/Listener/ActionHandlesListener.php → src/Listener/ActionHandlesListener.php b/...Layout/Listener/ActionHandlesListener.php → src/Listener/ActionHandlesListener.php
diff --git a/src/ConLayout/Listener/BodyClassListener.php → src/Listener/BodyClassListener.php b/src/ConLayout/Listener/BodyClassListener.php → src/Listener/BodyClassListener.php
diff --git a/.../Factory/ActionHandlesListenerFactory.php → .../Factory/ActionHandlesListenerFactory.php b/.../Factory/ActionHandlesListenerFactory.php → .../Factory/ActionHandlesListenerFactory.php
diff --git a/...ener/Factory/BodyClassListenerFactory.php → ...ener/Factory/BodyClassListenerFactory.php b/...ener/Factory/BodyClassListenerFactory.php → ...ener/Factory/BodyClassListenerFactory.php
diff --git a/...ner/Factory/LoadLayoutListenerFactory.php → ...ner/Factory/LoadLayoutListenerFactory.php b/...ner/Factory/LoadLayoutListenerFactory.php → ...ner/Factory/LoadLayoutListenerFactory.php
diff --git a/...PrepareActionViewModelListenerFactory.php → ...PrepareActionViewModelListenerFactory.php b/...PrepareActionViewModelListenerFactory.php → ...PrepareActionViewModelListenerFactory.php
diff --git a/...ConLayout/Listener/LoadLayoutListener.php → src/Listener/LoadLayoutListener.php b/...ConLayout/Listener/LoadLayoutListener.php → src/Listener/LoadLayoutListener.php
diff --git a/...stener/PrepareActionViewModelListener.php → ...stener/PrepareActionViewModelListener.php b/...stener/PrepareActionViewModelListener.php → ...stener/PrepareActionViewModelListener.php
diff --git a/src/ConLayout/Module.php → src/Module.php b/src/ConLayout/Module.php → src/Module.php
@@ -31,7 +31,6 @@ class Module implements
     ServiceProviderInterface,
     ViewHelperProviderInterface,
     BootstrapListenerInterface,
-    AutoloaderProviderInterface,
     InitProviderInterface,
     FilterProviderInterface
 {
@@ -43,8 +42,8 @@ class Module implements
     public function getConfig()
     {
         return array_merge(
-            include __DIR__ . '/../../config/module.config.php',
-            include __DIR__ . '/../../config/con-layout.global.php.dist'
+            include __DIR__ . '/../config/module.config.php',
+            include __DIR__ . '/../config/con-layout.global.php.dist'
         );
     }
 
@@ -55,7 +54,7 @@ public function getConfig()
      */
     public function getViewHelperConfig()
     {
-        return include __DIR__ . '/../../config/viewhelper.config.php';
+        return include __DIR__ . '/../config/viewhelper.config.php';
     }
 
     /**
@@ -65,7 +64,7 @@ public function getViewHelperConfig()
      */
     public function getFilterConfig()
     {
-        return include __DIR__ . '/../../config/filter.config.php';
+        return include __DIR__ . '/../config/filter.config.php';
     }
 
     /**
@@ -75,7 +74,7 @@ public function getFilterConfig()
      */
     public function getServiceConfig()
     {
-        return include __DIR__ . '/../../config/service.config.php';
+        return include __DIR__ . '/../config/service.config.php';
     }
 
     /**
@@ -137,19 +136,4 @@ private function attachDebugger(ServiceLocatorInterface $serviceManager)
         $filterManager = $serviceManager->get('FilterManager');
         $renderer->getFilterChain()->attach($filterManager->get(DebugFilter::class));
     }
-
-    /**
-     *
-     * @return array
-     */
-    public function getAutoloaderConfig()
-    {
-        return [
-            StandardAutoloader::class => [
-                'namespaces' => [
-                    __NAMESPACE__ => __DIR__
-                ]
-            ]
-        ];
-    }
 }
diff --git a/...anager/Feature/BlockProviderInterface.php → ...anager/Feature/BlockProviderInterface.php b/...anager/Feature/BlockProviderInterface.php → ...anager/Feature/BlockProviderInterface.php
diff --git a/src/ConLayout/NamedParametersTrait.php → src/NamedParametersTrait.php b/src/ConLayout/NamedParametersTrait.php → src/NamedParametersTrait.php
diff --git a/src/ConLayout/Options/ModuleOptions.php → src/Options/ModuleOptions.php b/src/ConLayout/Options/ModuleOptions.php → src/Options/ModuleOptions.php
diff --git a/...onLayout/Options/ModuleOptionsFactory.php → src/Options/ModuleOptionsFactory.php b/...onLayout/Options/ModuleOptionsFactory.php → src/Options/ModuleOptionsFactory.php
diff --git a/...onLayout/Sorter/BeforeAfterComparison.php → src/Sorter/BeforeAfterComparison.php b/...onLayout/Sorter/BeforeAfterComparison.php → src/Sorter/BeforeAfterComparison.php
diff --git a/src/ConLayout/Sorter/DependentComparison.php → src/Sorter/DependentComparison.php b/src/ConLayout/Sorter/DependentComparison.php → src/Sorter/DependentComparison.php
diff --git a/src/ConLayout/Sorter/OrderComparison.php → src/Sorter/OrderComparison.php b/src/ConLayout/Sorter/OrderComparison.php → src/Sorter/OrderComparison.php
diff --git a/src/ConLayout/Sorter/SorterInterface.php → src/Sorter/SorterInterface.php b/src/ConLayout/Sorter/SorterInterface.php → src/Sorter/SorterInterface.php
diff --git a/src/ConLayout/Updater/AbstractUpdater.php → src/Updater/AbstractUpdater.php b/src/ConLayout/Updater/AbstractUpdater.php → src/Updater/AbstractUpdater.php
diff --git a/.../Updater/Collector/CollectorInterface.php → src/Updater/Collector/CollectorInterface.php b/.../Updater/Collector/CollectorInterface.php → src/Updater/Collector/CollectorInterface.php
diff --git a/...out/Updater/Collector/ConfigCollector.php → src/Updater/Collector/ConfigCollector.php b/...out/Updater/Collector/ConfigCollector.php → src/Updater/Collector/ConfigCollector.php
diff --git a/...ater/Collector/ConfigCollectorFactory.php → ...ater/Collector/ConfigCollectorFactory.php b/...ater/Collector/ConfigCollectorFactory.php → ...ater/Collector/ConfigCollectorFactory.php
diff --git a/...Updater/Collector/FilesystemCollector.php → ...Updater/Collector/FilesystemCollector.php b/...Updater/Collector/FilesystemCollector.php → ...Updater/Collector/FilesystemCollector.php
diff --git a/.../Collector/FilesystemCollectorFactory.php → .../Collector/FilesystemCollectorFactory.php b/.../Collector/FilesystemCollectorFactory.php → .../Collector/FilesystemCollectorFactory.php
diff --git a/src/ConLayout/Updater/Event/UpdateEvent.php → src/Updater/Event/UpdateEvent.php b/src/ConLayout/Updater/Event/UpdateEvent.php → src/Updater/Event/UpdateEvent.php
diff --git a/src/ConLayout/Updater/LayoutUpdater.php → src/Updater/LayoutUpdater.php b/src/ConLayout/Updater/LayoutUpdater.php → src/Updater/LayoutUpdater.php
diff --git a/...onLayout/Updater/LayoutUpdaterFactory.php → src/Updater/LayoutUpdaterFactory.php b/...onLayout/Updater/LayoutUpdaterFactory.php → src/Updater/LayoutUpdaterFactory.php
diff --git a/...Layout/Updater/LayoutUpdaterInterface.php → src/Updater/LayoutUpdaterInterface.php b/...Layout/Updater/LayoutUpdaterInterface.php → src/Updater/LayoutUpdaterInterface.php
diff --git a/src/ConLayout/View/Helper/Block.php → src/View/Helper/Block.php b/src/ConLayout/View/Helper/Block.php → src/View/Helper/Block.php
diff --git a/src/ConLayout/View/Helper/BlockFactory.php → src/View/Helper/BlockFactory.php b/src/ConLayout/View/Helper/BlockFactory.php → src/View/Helper/BlockFactory.php
diff --git a/src/ConLayout/View/Helper/BodyClass.php → src/View/Helper/BodyClass.php b/src/ConLayout/View/Helper/BodyClass.php → src/View/Helper/BodyClass.php
diff --git a/.../Helper/Proxy/AbstractViewHelperProxy.php → .../Helper/Proxy/AbstractViewHelperProxy.php b/.../Helper/Proxy/AbstractViewHelperProxy.php → .../Helper/Proxy/AbstractViewHelperProxy.php
diff --git a/...ayout/View/Helper/Proxy/HeadLinkProxy.php → src/View/Helper/Proxy/HeadLinkProxy.php b/...ayout/View/Helper/Proxy/HeadLinkProxy.php → src/View/Helper/Proxy/HeadLinkProxy.php
diff --git a/...ayout/View/Helper/Proxy/HeadMetaProxy.php → src/View/Helper/Proxy/HeadMetaProxy.php b/...ayout/View/Helper/Proxy/HeadMetaProxy.php → src/View/Helper/Proxy/HeadMetaProxy.php
diff --git a/...out/View/Helper/Proxy/HeadScriptProxy.php → src/View/Helper/Proxy/HeadScriptProxy.php b/...out/View/Helper/Proxy/HeadScriptProxy.php → src/View/Helper/Proxy/HeadScriptProxy.php
diff --git a/...yout/View/Helper/Proxy/HeadTitleProxy.php → src/View/Helper/Proxy/HeadTitleProxy.php b/...yout/View/Helper/Proxy/HeadTitleProxy.php → src/View/Helper/Proxy/HeadTitleProxy.php
diff --git a/...t/View/Helper/Proxy/InlineScriptProxy.php → src/View/Helper/Proxy/InlineScriptProxy.php b/...t/View/Helper/Proxy/InlineScriptProxy.php → src/View/Helper/Proxy/InlineScriptProxy.php
diff --git a/.../Proxy/ViewHelperProxyAbstractFactory.php → .../Proxy/ViewHelperProxyAbstractFactory.php b/.../Proxy/ViewHelperProxyAbstractFactory.php → .../Proxy/ViewHelperProxyAbstractFactory.php
diff --git a/src/ConLayout/View/Helper/Wrapper.php → src/View/Helper/Wrapper.php b/src/ConLayout/View/Helper/Wrapper.php → src/View/Helper/Wrapper.php
diff --git a/...nLayout/Zdt/Collector/LayoutCollector.php → src/Zdt/Collector/LayoutCollector.php b/...nLayout/Zdt/Collector/LayoutCollector.php → src/Zdt/Collector/LayoutCollector.php
diff --git a/.../Zdt/Collector/LayoutCollectorFactory.php → src/Zdt/Collector/LayoutCollectorFactory.php b/.../Zdt/Collector/LayoutCollectorFactory.php → src/Zdt/Collector/LayoutCollectorFactory.php
diff --git a/tests/ConLayoutTest/AbstractTest.php → tests/AbstractTest.php b/tests/ConLayoutTest/AbstractTest.php → tests/AbstractTest.php
diff --git a/tests/ConLayoutTest/Block/BlockPoolTest.php → tests/Block/BlockPoolTest.php b/tests/ConLayoutTest/Block/BlockPoolTest.php → tests/Block/BlockPoolTest.php
diff --git a/tests/ConLayoutTest/Block/ContainerTest.php → tests/Block/ContainerTest.php b/tests/ConLayoutTest/Block/ContainerTest.php → tests/Block/ContainerTest.php
diff --git a/...utTest/Block/Factory/BlockFactoryTest.php → tests/Block/Factory/BlockFactoryTest.php b/...utTest/Block/Factory/BlockFactoryTest.php → tests/Block/Factory/BlockFactoryTest.php
diff --git a/tests/ConLayoutTest/BlockManagerTest.php → tests/BlockManagerTest.php b/tests/ConLayoutTest/BlockManagerTest.php → tests/BlockManagerTest.php
diff --git a/tests/ConLayoutTest/Bootstrap.php → tests/Bootstrap.php b/tests/ConLayoutTest/Bootstrap.php → tests/Bootstrap.php
@@ -27,7 +27,7 @@ protected static function initServiceManager()
             ],
             'module_listener_options' => array(
                 'module_paths' => [
-                    dirname(dirname(__DIR__))
+                    dirname(__DIR__)
                 ],
             ),
         );
@@ -55,7 +55,7 @@ public static function getServiceManager()
 
     protected static function initAutoloader()
     {
-        $vendorPath = __DIR__ . '/../../vendor';
+        $vendorPath = __DIR__ . '/../vendor';
         if (is_readable($vendorPath . '/autoload.php')) {
             include $vendorPath . '/autoload.php';
         }

diff --git a/...t/Controller/Plugin/LayoutManagerTest.php → ...s/Controller/Plugin/LayoutManagerTest.php b/...t/Controller/Plugin/LayoutManagerTest.php → ...s/Controller/Plugin/LayoutManagerTest.php
diff --git a/...Controller/TestAsset/SampleController.php → ...Controller/TestAsset/SampleController.php b/...Controller/TestAsset/SampleController.php → ...Controller/TestAsset/SampleController.php
diff --git a/...nLayoutTest/Filter/BasePathFilterTest.php → tests/Filter/BasePathFilterTest.php b/...nLayoutTest/Filter/BasePathFilterTest.php → tests/Filter/BasePathFilterTest.php
diff --git a/...youtTest/Filter/CacheBusterFilterTest.php → tests/Filter/CacheBusterFilterTest.php b/...youtTest/Filter/CacheBusterFilterTest.php → tests/Filter/CacheBusterFilterTest.php
diff --git a/.../ConLayoutTest/Filter/DebugFilterTest.php → tests/Filter/DebugFilterTest.php b/.../ConLayoutTest/Filter/DebugFilterTest.php → tests/Filter/DebugFilterTest.php
diff --git a/...LayoutTest/Filter/TranslateFilterTest.php → tests/Filter/TranslateFilterTest.php b/...LayoutTest/Filter/TranslateFilterTest.php → tests/Filter/TranslateFilterTest.php
diff --git a/.../ConLayoutTest/Filter/_files/original.css → tests/Filter/_files/original.css b/.../ConLayoutTest/Filter/_files/original.css → tests/Filter/_files/original.css
diff --git a/tests/ConLayoutTest/Filter/_files/styles.css → tests/Filter/_files/styles.css b/tests/ConLayoutTest/Filter/_files/styles.css → tests/Filter/_files/styles.css
diff --git a/...outTest/Generator/BlocksGeneratorTest.php → tests/Generator/BlocksGeneratorTest.php b/...outTest/Generator/BlocksGeneratorTest.php → tests/Generator/BlocksGeneratorTest.php
diff --git a/...est/Generator/ViewHelperGeneratorTest.php → tests/Generator/ViewHelperGeneratorTest.php b/...est/Generator/ViewHelperGeneratorTest.php → tests/Generator/ViewHelperGeneratorTest.php
diff --git a/tests/ConLayoutTest/Handle/HandleTest.php → tests/Handle/HandleTest.php b/tests/ConLayoutTest/Handle/HandleTest.php → tests/Handle/HandleTest.php
diff --git a/tests/ConLayoutTest/Layout/Layout.php → tests/Layout/Layout.php b/tests/ConLayoutTest/Layout/Layout.php → tests/Layout/Layout.php
diff --git a/tests/ConLayoutTest/Layout/LayoutTest.php → tests/Layout/LayoutTest.php b/tests/ConLayoutTest/Layout/LayoutTest.php → tests/Layout/LayoutTest.php
diff --git a/...utTest/Layout/_files/layout-structure.php → tests/Layout/_files/layout-structure.php b/...utTest/Layout/_files/layout-structure.php → tests/Layout/_files/layout-structure.php
diff --git a/...st/Listener/ActionHandlesListenerTest.php → tests/Listener/ActionHandlesListenerTest.php b/...st/Listener/ActionHandlesListenerTest.php → tests/Listener/ActionHandlesListenerTest.php
diff --git a/...utTest/Listener/BodyClassListenerTest.php → tests/Listener/BodyClassListenerTest.php b/...utTest/Listener/BodyClassListenerTest.php → tests/Listener/BodyClassListenerTest.php
diff --git a/...tTest/Listener/LoadLayoutListenerTest.php → tests/Listener/LoadLayoutListenerTest.php b/...tTest/Listener/LoadLayoutListenerTest.php → tests/Listener/LoadLayoutListenerTest.php
diff --git a/...er/PrepareActionViewModelListenerTest.php → ...er/PrepareActionViewModelListenerTest.php b/...er/PrepareActionViewModelListenerTest.php → ...er/PrepareActionViewModelListenerTest.php
diff --git a/...Listener/_files/module1/area1/default.php → ...Listener/_files/module1/area1/default.php b/...Listener/_files/module1/area1/default.php → ...Listener/_files/module1/area1/default.php
diff --git a/...Listener/_files/module1/area2/default.php → ...Listener/_files/module1/area2/default.php b/...Listener/_files/module1/area2/default.php → ...Listener/_files/module1/area2/default.php
diff --git a/...tTest/Listener/_files/module1/default.php → tests/Listener/_files/module1/default.php b/...tTest/Listener/_files/module1/default.php → tests/Listener/_files/module1/default.php
diff --git a/...tTest/Listener/_files/module1/include.php → tests/Listener/_files/module1/include.php b/...tTest/Listener/_files/module1/include.php → tests/Listener/_files/module1/include.php
diff --git a/...stener/_files/module1/included-handle.php → ...stener/_files/module1/included-handle.php b/...stener/_files/module1/included-handle.php → ...stener/_files/module1/included-handle.php
diff --git a/...istener/_files/module2/another-handle.php → ...istener/_files/module2/another-handle.php b/...istener/_files/module2/another-handle.php → ...istener/_files/module2/another-handle.php
diff --git a/...tTest/Listener/_files/module2/default.php → tests/Listener/_files/module2/default.php b/...tTest/Listener/_files/module2/default.php → tests/Listener/_files/module2/default.php
diff --git a/tests/ConLayoutTest/ModuleTest.php → tests/ModuleTest.php b/tests/ConLayoutTest/ModuleTest.php → tests/ModuleTest.php
@@ -27,7 +27,6 @@ class ModuleTest extends AbstractTest
     public function testConfig()
     {
         $module = new Module();
-        $this->assertInternalType('array', $module->getAutoloaderConfig());
         $this->assertInternalType('array', $module->getConfig());
         $this->assertInternalType('array', $module->getServiceConfig());
         $this->assertInternalType('array', $module->getFilterConfig());

diff --git a/...nLayoutTest/Options/ModuleOptionsTest.php → tests/Options/ModuleOptionsTest.php b/...nLayoutTest/Options/ModuleOptionsTest.php → tests/Options/ModuleOptionsTest.php
diff --git a/...Updater/Collector/ConfigCollectorTest.php → ...Updater/Collector/ConfigCollectorTest.php b/...Updater/Collector/ConfigCollectorTest.php → ...Updater/Collector/ConfigCollectorTest.php
diff --git a/...ter/Collector/FilesystemCollectorTest.php → ...ter/Collector/FilesystemCollectorTest.php b/...ter/Collector/FilesystemCollectorTest.php → ...ter/Collector/FilesystemCollectorTest.php
diff --git a/...ter/Collector/_files/frontend/default.php → ...ter/Collector/_files/frontend/default.php b/...ter/Collector/_files/frontend/default.php → ...ter/Collector/_files/frontend/default.php
diff --git a/...dater/Collector/_files/global/default.php → ...dater/Collector/_files/global/default.php b/...dater/Collector/_files/global/default.php → ...dater/Collector/_files/global/default.php
diff --git a/...nLayoutTest/Updater/LayoutUpdaterTest.php → tests/Updater/LayoutUpdaterTest.php b/...nLayoutTest/Updater/LayoutUpdaterTest.php → tests/Updater/LayoutUpdaterTest.php
diff --git a/...youtTest/View/Helper/BlockFactoryTest.php → tests/View/Helper/BlockFactoryTest.php b/...youtTest/View/Helper/BlockFactoryTest.php → tests/View/Helper/BlockFactoryTest.php
diff --git a/...s/ConLayoutTest/View/Helper/BlockTest.php → tests/View/Helper/BlockTest.php b/...s/ConLayoutTest/View/Helper/BlockTest.php → tests/View/Helper/BlockTest.php
diff --git a/...nLayoutTest/View/Helper/BodyClassTest.php → tests/View/Helper/BodyClassTest.php b/...nLayoutTest/View/Helper/BodyClassTest.php → tests/View/Helper/BodyClassTest.php
diff --git a/...View/Helper/Proxy/AbstractFactoryTest.php → ...View/Helper/Proxy/AbstractFactoryTest.php b/...View/Helper/Proxy/AbstractFactoryTest.php → ...View/Helper/Proxy/AbstractFactoryTest.php
diff --git a/...t/View/Helper/Proxy/AbstractProxyTest.php → ...s/View/Helper/Proxy/AbstractProxyTest.php b/...t/View/Helper/Proxy/AbstractProxyTest.php → ...s/View/Helper/Proxy/AbstractProxyTest.php
diff --git a/...ConLayoutTest/View/Helper/WrapperTest.php → tests/View/Helper/WrapperTest.php b/...ConLayoutTest/View/Helper/WrapperTest.php → tests/View/Helper/WrapperTest.php
diff --git a/...est/Zdt/Collector/LayoutCollectorTest.php → tests/Zdt/Collector/LayoutCollectorTest.php b/...est/Zdt/Collector/LayoutCollectorTest.php → tests/Zdt/Collector/LayoutCollectorTest.php
diff --git a/tests/ConLayoutTest/_files/render-test.html → tests/_files/render-test.html b/tests/ConLayoutTest/_files/render-test.html → tests/_files/render-test.html
diff --git a/...ayoutTest/_files/rendered-test-block.html → tests/_files/rendered-test-block.html b/...ayoutTest/_files/rendered-test-block.html → tests/_files/rendered-test-block.html
diff --git a/...utTest/_files/rendered-widget-append.html → tests/_files/rendered-widget-append.html b/...utTest/_files/rendered-widget-append.html → tests/_files/rendered-widget-append.html
diff --git a/...ConLayoutTest/_files/rendered-widget.html → tests/_files/rendered-widget.html b/...ConLayoutTest/_files/rendered-widget.html → tests/_files/rendered-widget.html
diff --git a/tests/ConLayoutTest/_files/script.html → tests/_files/script.html b/tests/ConLayoutTest/_files/script.html → tests/_files/script.html
diff --git a/tests/ConLayoutTest/_files/styles.html → tests/_files/styles.html b/tests/ConLayoutTest/_files/styles.html → tests/_files/styles.html
diff --git a/tests/ConLayoutTest/_files/view/layout.phtml → tests/_files/view/layout.phtml b/tests/ConLayoutTest/_files/view/layout.phtml → tests/_files/view/layout.phtml
diff --git a/...st/_files/view/widget-content-after.phtml → tests/_files/view/widget-content-after.phtml b/...st/_files/view/widget-content-after.phtml → tests/_files/view/widget-content-after.phtml
diff --git a/...youtTest/_files/view/widget-content.phtml → tests/_files/view/widget-content.phtml b/...youtTest/_files/view/widget-content.phtml → tests/_files/view/widget-content.phtml
diff --git a/...s/ConLayoutTest/_files/view/widget1.phtml → tests/_files/view/widget1.phtml b/...s/ConLayoutTest/_files/view/widget1.phtml → tests/_files/view/widget1.phtml