Modernize bundle structure

Author: norkunas

README.md

@@ -69,7 +69,12 @@
   },
   "autoload": {
     "psr-4": {
-      "Bazinga\\GeocoderBundle\\": ""
+      "Bazinga\\GeocoderBundle\\": "src/"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Bazinga\\GeocoderBundle\\Tests\\": "tests"
     }
   },
   "scripts": {

composer.json

@@ -3,4 +3,4 @@ services:
     class: Bazinga\GeocoderBundle\DataCollector\GeocoderDataCollector
     public: false
     tags:
-      - { name: data_collector, template: "@BazingaGeocoder/Collector/geocoder.html.twig", id: "geocoder"  }
+      - { name: data_collector, template: '@BazingaGeocoder/Collector/geocoder.html.twig', id: 'geocoder' }

Resources/config/profiling.yml config/profiling.yml

@@ -12,7 +12,7 @@ services:
     Geocoder\Dumper\Wkt: ~
 
     Bazinga\GeocoderBundle\ProviderFactory\:
-        resource: '../../ProviderFactory'
+        resource: '../src/ProviderFactory'
         public: false
         autowire: true
         autoconfigure: true

Resources/config/services.yml config/services.yml

@@ -8,26 +8,22 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         bootstrap="Tests/bootstrap.php"
-        >
+         bootstrap="tests/bootstrap.php"
+>
     <testsuites>
         <testsuite name="main">
-            <directory>./Tests</directory>
-            <exclude>./Tests/Doctrine</exclude>
+            <directory>./tests</directory>
+            <exclude>./tests/Doctrine</exclude>
         </testsuite>
+
         <testsuite name="doctrine">
-            <directory>./Tests/Doctrine</directory>
+            <directory>./tests/Doctrine</directory>
         </testsuite>
     </testsuites>
 
     <filter>
         <whitelist>
-            <directory>.</directory>
-            <exclude>
-                <directory>./Resources</directory>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
+            <directory>src</directory>
         </whitelist>
     </filter>
 </phpunit>

Resources/doc/cache.md doc/cache.md

@@ -36,4 +36,12 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new AddProvidersPass());
         $container->addCompilerPass(new FactoryValidatorPass());
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getPath(): string
+    {
+        return \dirname(__DIR__);
+    }
 }

Resources/doc/custom-provider.md doc/custom-provider.md

@@ -13,7 +13,6 @@
 namespace Bazinga\GeocoderBundle\DataCollector;
 
 use Bazinga\GeocoderBundle\Plugin\ProfilingPlugin;
-use Geocoder\Collection;
 use Geocoder\Query\Query;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;

Resources/doc/doctrine.md doc/doctrine.md

@@ -50,7 +50,7 @@ public function load(array $configs, ContainerBuilder $container)
         $configuration = $this->getConfiguration($configs, $container);
         $config = $processor->processConfiguration($configuration, $configs);
 
-        $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../../config'));
         $loader->load('services.yml');
 
         if (true === $config['profiling']['enabled']) {

Resources/doc/index.md doc/index.md

@@ -53,7 +53,9 @@ protected static function createKernel(array $options = []): KernelInterface
 
     public function testInitBundle(): void
     {
-        $kernel = self::bootKernel();
+        $kernel = self::bootKernel(['config' => static function (TestKernel $kernel) {
+            $kernel->addTestConfig(__DIR__.'/config/framework.yml');
+        }]);
 
         $container = method_exists(__CLASS__, 'getContainer') ? self::getContainer() : $kernel->getContainer();
 
@@ -66,6 +68,7 @@ public function testInitBundle(): void
     public function testBundleWithOneProviderConfiguration(): void
     {
         $kernel = self::bootKernel(['config' => static function (TestKernel $kernel) {
+            $kernel->addTestConfig(__DIR__.'/config/framework.yml');
             $kernel->addTestConfig(__DIR__.'/config/simple.yml');
         }]);
 
@@ -80,6 +83,7 @@ public function testBundleWithOneProviderConfiguration(): void
     public function testBundleWithCachedProvider(): void
     {
         $kernel = self::bootKernel(['config' => static function (TestKernel $kernel) {
+            $kernel->addTestConfig(__DIR__.'/config/framework.yml');
             $kernel->addTestConfig(__DIR__.'/config/cache.yml');
         }]);
 
@@ -96,6 +100,7 @@ public function testBundleWithCachedProvider(): void
     public function testCacheLifetimeCanBeNull(): void
     {
         $kernel = self::bootKernel(['config' => static function (TestKernel $kernel) {
+            $kernel->addTestConfig(__DIR__.'/config/framework.yml');
             $kernel->addTestConfig(__DIR__.'/config/cache_without_lifetime.yml');
         }]);
 
@@ -120,6 +125,7 @@ public function testCacheLifetimeCanBeNull(): void
     public function testBundleWithPluginsYml(): void
     {
         $kernel = self::bootKernel(['config' => static function (TestKernel $kernel) {
+            $kernel->addTestConfig(__DIR__.'/config/framework.yml');
             $kernel->addTestConfig(__DIR__.'/config/service_plugin.yml');
         }]);
 
@@ -136,6 +142,7 @@ public function testBundleWithPluginsYml(): void
     public function testBundleWithPluginXml(): void
     {
         $kernel = self::bootKernel(['config' => static function (TestKernel $kernel) {
+            $kernel->addTestConfig(__DIR__.'/config/framework.yml');
             $kernel->addTestConfig(__DIR__.'/config/service_plugin.xml');
         }]);
 
@@ -151,7 +158,9 @@ public function testBundleWithPluginXml(): void
 
     public function testBundleHasRegisteredDumpers(): void
     {
-        $kernel = self::bootKernel();
+        $kernel = self::bootKernel(['config' => static function (TestKernel $kernel) {
+            $kernel->addTestConfig(__DIR__.'/config/framework.yml');
+        }]);
 
         $container = method_exists(__CLASS__, 'getContainer') ? self::getContainer() : $kernel->getContainer();
 

Resources/doc/plugins.md doc/plugins.md

@@ -74,6 +74,7 @@ protected static function createKernel(array $options = []): KernelInterface
     public function testProviderConfiguration($class, $serviceNames): void
     {
         $kernel = self::bootKernel(['config' => static function (TestKernel $kernel) use ($class) {
+            $kernel->addTestConfig(__DIR__.'/config/framework.yml');
             $kernel->addTestConfig(__DIR__.'/config/provider/'.strtolower(substr($class, strrpos($class, '\\') + 1)).'.yml');
         }]);
 

Resources/doc/profiler-page.png doc/profiler-page.png

@@ -0,0 +1,2 @@
+framework:
+    http_method_override: false

Resources/doc/services.md doc/services.md

@@ -5,4 +5,4 @@ bazinga_geocoder:
     acme:
       factory: Bazinga\GeocoderBundle\ProviderFactory\MaxMindBinaryFactory
       options:
-        dat_file: '%kernel.project_dir%/Tests/DependencyInjection/Fixtures/maxmind.dat'
+        dat_file: '%kernel.project_dir%/tests/DependencyInjection/Fixtures/maxmind.dat'

Resources/doc/toolbar.png doc/toolbar.png

@@ -1,3 +1,5 @@
+framework:
+    http_method_override: false
 
 bazinga_geocoder:
   profiling: