Reorganize files to match the "Reusable Bundles" structure

.gitattributes

@@ -1,3 +1,3 @@
 .* export-ignore
-/Tests export-ignore
+/tests export-ignore
 /phpunit.xml.dist export-ignore

CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Unreleased
 
+## 3.11.0 unreleased
+
+* Reorganize files to match the "Reusable Bundles" structure
+* Migrate services configuration to PHP
+
 ## 3.10.0 (2023-11-06)
 
 * Add configuration support for SamplingHandler

composer.json

@@ -29,14 +29,9 @@
         "symfony/yaml": "^5.4 || ^6.0 || ^7.0"
     },
     "autoload": {
-        "psr-4": { "Symfony\\Bundle\\MonologBundle\\": "" },
-        "exclude-from-classmap": [
-            "/Tests/"
-        ]
+        "psr-4": { "Symfony\\Bundle\\MonologBundle\\": "src" }
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "3.x-dev"
-        }
+    "autoload-dev": {
+        "psr-4": { "Symfony\\Bundle\\MonologBundle\\Tests\\": "tests" }
     }
 }

phpunit.xml.dist

@@ -1,20 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <phpunit colors="true" bootstrap="vendor/autoload.php">
     <testsuites>
         <testsuite name="MonologBundle for the Symfony Framework">
-            <directory>./Tests</directory>
+            <directory>./tests</directory>
         </testsuite>
     </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>.</directory>
-            <exclude>
-                <directory>./Resources</directory>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+    <coverage>
+        <include>
+            <directory>./src/</directory>
+        </include>
+    </coverage>
 </phpunit>

DependencyInjection/MonologExtension.php → src/DependencyInjection/MonologExtension.php

@@ -61,7 +61,7 @@ public function load(array $configs, ContainerBuilder $container)
         $config = $this->processConfiguration($configuration, $configs);
 
         if (isset($config['handlers'])) {
-            $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+            $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../config'));
             $loader->load('monolog.php');
 
             if (!class_exists(DebugLoggerConfigurator::class)) {
@@ -149,7 +149,7 @@ public function load(array $configs, ContainerBuilder $container)
      */
     public function getXsdValidationBasePath()
     {
-        return __DIR__.'/../Resources/config/schema';
+        return __DIR__.'/../../config/schema';
     }
 
     public function getNamespace()

Tests/DependencyInjection/Compiler/AddProcessorsPassTest.php → tests/DependencyInjection/Compiler/AddProcessorsPassTest.php

@@ -42,7 +42,7 @@ public function testHandlerProcessors()
     public function testFailureOnHandlerWithoutPushProcessor()
     {
         $container = new ContainerBuilder();
-        $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
+        $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../../config'));
         $loader->load('monolog.php');
 
         $service = new Definition(NullHandler::class);
@@ -68,7 +68,7 @@ public function testFailureOnHandlerWithoutPushProcessor()
     protected function getContainer()
     {
         $container = new ContainerBuilder();
-        $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
+        $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../../config'));
         $loader->load('monolog.php');
 
         $definition = $container->getDefinition('monolog.logger_prototype');

Tests/DependencyInjection/Compiler/LoggerChannelPassTest.php → tests/DependencyInjection/Compiler/LoggerChannelPassTest.php

@@ -147,7 +147,7 @@ public function testChannelsConfigurationOptionSupportsAppChannel()
     private function getContainer()
     {
         $container = new ContainerBuilder();
-        $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
+        $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../../config'));
         $loader->load('monolog.php');
         $definition = $container->getDefinition('monolog.logger_prototype');
         $container->set('monolog.handler.test', new Definition('%monolog.handler.null.class%', [100, false]));
@@ -189,7 +189,7 @@ private function getContainer()
     private function getContainerWithSetter()
     {
         $container = new ContainerBuilder();
-        $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
+        $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../../config'));
         $loader->load('monolog.php');
         $definition = $container->getDefinition('monolog.logger_prototype');
         $container->set('monolog.handler.test', new Definition('%monolog.handler.null.class%', [100, false]));
@@ -222,7 +222,7 @@ private function getFunctionalContainer()
         $container->setParameter('monolog.handlers_to_channels', []);
         $container->setParameter('monolog.use_microseconds', true);
 
-        $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
+        $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../../config'));
         $loader->load('monolog.php');
 
         $container->addCompilerPass(new LoggerChannelPass());