diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index 59d23b8..e16f676 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -35,8 +35,7 @@ ]) ->setFinder( PhpCsFixer\Finder::create() - ->in(__DIR__) - ->exclude('vendor') + ->in([__DIR__.'/src', __DIR__.'/tests']) ->name('*.php') ) ->setCacheFile(__DIR__.'/.php_cs.cache') diff --git a/composer.json b/composer.json index cf6ceea..179d14e 100644 --- a/composer.json +++ b/composer.json @@ -28,13 +28,10 @@ "monolog/monolog": "^3.0" }, "autoload": { - "psr-4": { "Ekino\\NewRelicBundle\\": "" }, - "exclude-from-classmap": [ - "/Tests/" - ] + "psr-4": { "Ekino\\NewRelicBundle\\": "src/" } }, "autoload-dev": { - "psr-4": { "Ekino\\NewRelicBundle\\Tests\\": "Tests/" } + "psr-4": { "Ekino\\NewRelicBundle\\Tests\\": "tests/" } }, "extra": { "branch-alias": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 72adc52..2bdc764 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -12,19 +12,9 @@ bootstrap="vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" > - - - ./ - - - ./Tests/ - ./Resources/ - ./vendor/ - - - ./Tests + ./tests diff --git a/Command/NotifyDeploymentCommand.php b/src/Command/NotifyDeploymentCommand.php similarity index 100% rename from Command/NotifyDeploymentCommand.php rename to src/Command/NotifyDeploymentCommand.php diff --git a/DependencyInjection/Compiler/MonologHandlerPass.php b/src/DependencyInjection/Compiler/MonologHandlerPass.php similarity index 100% rename from DependencyInjection/Compiler/MonologHandlerPass.php rename to src/DependencyInjection/Compiler/MonologHandlerPass.php diff --git a/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php similarity index 100% rename from DependencyInjection/Configuration.php rename to src/DependencyInjection/Configuration.php diff --git a/DependencyInjection/EkinoNewRelicExtension.php b/src/DependencyInjection/EkinoNewRelicExtension.php similarity index 100% rename from DependencyInjection/EkinoNewRelicExtension.php rename to src/DependencyInjection/EkinoNewRelicExtension.php diff --git a/EkinoNewRelicBundle.php b/src/EkinoNewRelicBundle.php similarity index 100% rename from EkinoNewRelicBundle.php rename to src/EkinoNewRelicBundle.php diff --git a/Exception/DeprecationException.php b/src/Exception/DeprecationException.php similarity index 100% rename from Exception/DeprecationException.php rename to src/Exception/DeprecationException.php diff --git a/Listener/CommandListener.php b/src/Listener/CommandListener.php similarity index 100% rename from Listener/CommandListener.php rename to src/Listener/CommandListener.php diff --git a/Listener/DeprecationListener.php b/src/Listener/DeprecationListener.php similarity index 100% rename from Listener/DeprecationListener.php rename to src/Listener/DeprecationListener.php diff --git a/Listener/ExceptionListener.php b/src/Listener/ExceptionListener.php similarity index 100% rename from Listener/ExceptionListener.php rename to src/Listener/ExceptionListener.php diff --git a/Listener/RequestListener.php b/src/Listener/RequestListener.php similarity index 100% rename from Listener/RequestListener.php rename to src/Listener/RequestListener.php diff --git a/Listener/ResponseListener.php b/src/Listener/ResponseListener.php similarity index 100% rename from Listener/ResponseListener.php rename to src/Listener/ResponseListener.php diff --git a/Logging/AdaptiveHandler.php b/src/Logging/AdaptiveHandler.php similarity index 100% rename from Logging/AdaptiveHandler.php rename to src/Logging/AdaptiveHandler.php diff --git a/NewRelic/AdaptiveInteractor.php b/src/NewRelic/AdaptiveInteractor.php similarity index 100% rename from NewRelic/AdaptiveInteractor.php rename to src/NewRelic/AdaptiveInteractor.php diff --git a/NewRelic/BlackholeInteractor.php b/src/NewRelic/BlackholeInteractor.php similarity index 100% rename from NewRelic/BlackholeInteractor.php rename to src/NewRelic/BlackholeInteractor.php diff --git a/NewRelic/Config.php b/src/NewRelic/Config.php similarity index 100% rename from NewRelic/Config.php rename to src/NewRelic/Config.php diff --git a/NewRelic/LoggingInteractorDecorator.php b/src/NewRelic/LoggingInteractorDecorator.php similarity index 100% rename from NewRelic/LoggingInteractorDecorator.php rename to src/NewRelic/LoggingInteractorDecorator.php diff --git a/NewRelic/NewRelicInteractor.php b/src/NewRelic/NewRelicInteractor.php similarity index 100% rename from NewRelic/NewRelicInteractor.php rename to src/NewRelic/NewRelicInteractor.php diff --git a/NewRelic/NewRelicInteractorInterface.php b/src/NewRelic/NewRelicInteractorInterface.php similarity index 100% rename from NewRelic/NewRelicInteractorInterface.php rename to src/NewRelic/NewRelicInteractorInterface.php diff --git a/Resources/config/command_listener.xml b/src/Resources/config/command_listener.xml similarity index 100% rename from Resources/config/command_listener.xml rename to src/Resources/config/command_listener.xml diff --git a/Resources/config/deprecation_listener.xml b/src/Resources/config/deprecation_listener.xml similarity index 100% rename from Resources/config/deprecation_listener.xml rename to src/Resources/config/deprecation_listener.xml diff --git a/Resources/config/exception_listener.xml b/src/Resources/config/exception_listener.xml similarity index 100% rename from Resources/config/exception_listener.xml rename to src/Resources/config/exception_listener.xml diff --git a/Resources/config/http_listener.xml b/src/Resources/config/http_listener.xml similarity index 100% rename from Resources/config/http_listener.xml rename to src/Resources/config/http_listener.xml diff --git a/Resources/config/monolog.xml b/src/Resources/config/monolog.xml similarity index 100% rename from Resources/config/monolog.xml rename to src/Resources/config/monolog.xml diff --git a/Resources/config/services.xml b/src/Resources/config/services.xml similarity index 100% rename from Resources/config/services.xml rename to src/Resources/config/services.xml diff --git a/Resources/config/twig.xml b/src/Resources/config/twig.xml similarity index 100% rename from Resources/config/twig.xml rename to src/Resources/config/twig.xml diff --git a/TransactionNamingStrategy/ControllerNamingStrategy.php b/src/TransactionNamingStrategy/ControllerNamingStrategy.php similarity index 100% rename from TransactionNamingStrategy/ControllerNamingStrategy.php rename to src/TransactionNamingStrategy/ControllerNamingStrategy.php diff --git a/TransactionNamingStrategy/RouteNamingStrategy.php b/src/TransactionNamingStrategy/RouteNamingStrategy.php similarity index 100% rename from TransactionNamingStrategy/RouteNamingStrategy.php rename to src/TransactionNamingStrategy/RouteNamingStrategy.php diff --git a/TransactionNamingStrategy/TransactionNamingStrategyInterface.php b/src/TransactionNamingStrategy/TransactionNamingStrategyInterface.php similarity index 100% rename from TransactionNamingStrategy/TransactionNamingStrategyInterface.php rename to src/TransactionNamingStrategy/TransactionNamingStrategyInterface.php diff --git a/Twig/NewRelicExtension.php b/src/Twig/NewRelicExtension.php similarity index 100% rename from Twig/NewRelicExtension.php rename to src/Twig/NewRelicExtension.php diff --git a/Tests/AppKernel.php b/tests/AppKernel.php similarity index 100% rename from Tests/AppKernel.php rename to tests/AppKernel.php diff --git a/Tests/BundleInitializationTest.php b/tests/BundleInitializationTest.php similarity index 100% rename from Tests/BundleInitializationTest.php rename to tests/BundleInitializationTest.php diff --git a/Tests/DependencyInjection/Compiler/MonologHandlerPassTest.php b/tests/DependencyInjection/Compiler/MonologHandlerPassTest.php similarity index 100% rename from Tests/DependencyInjection/Compiler/MonologHandlerPassTest.php rename to tests/DependencyInjection/Compiler/MonologHandlerPassTest.php diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/tests/DependencyInjection/ConfigurationTest.php similarity index 100% rename from Tests/DependencyInjection/ConfigurationTest.php rename to tests/DependencyInjection/ConfigurationTest.php diff --git a/Tests/DependencyInjection/EkinoNewRelicExtensionTest.php b/tests/DependencyInjection/EkinoNewRelicExtensionTest.php similarity index 100% rename from Tests/DependencyInjection/EkinoNewRelicExtensionTest.php rename to tests/DependencyInjection/EkinoNewRelicExtensionTest.php diff --git a/Tests/Listener/CommandListenerTest.php b/tests/Listener/CommandListenerTest.php similarity index 100% rename from Tests/Listener/CommandListenerTest.php rename to tests/Listener/CommandListenerTest.php diff --git a/Tests/Listener/DeprecationListenerTest.php b/tests/Listener/DeprecationListenerTest.php similarity index 100% rename from Tests/Listener/DeprecationListenerTest.php rename to tests/Listener/DeprecationListenerTest.php diff --git a/Tests/Listener/ExceptionListenerTest.php b/tests/Listener/ExceptionListenerTest.php similarity index 100% rename from Tests/Listener/ExceptionListenerTest.php rename to tests/Listener/ExceptionListenerTest.php diff --git a/Tests/Listener/RequestListenerTest.php b/tests/Listener/RequestListenerTest.php similarity index 100% rename from Tests/Listener/RequestListenerTest.php rename to tests/Listener/RequestListenerTest.php diff --git a/Tests/Listener/ResponseListenerTest.php b/tests/Listener/ResponseListenerTest.php similarity index 100% rename from Tests/Listener/ResponseListenerTest.php rename to tests/Listener/ResponseListenerTest.php diff --git a/Tests/NewRelic/ConfigTest.php b/tests/NewRelic/ConfigTest.php similarity index 100% rename from Tests/NewRelic/ConfigTest.php rename to tests/NewRelic/ConfigTest.php diff --git a/Tests/NewRelic/LoggingInteractorDecoratorTest.php b/tests/NewRelic/LoggingInteractorDecoratorTest.php similarity index 100% rename from Tests/NewRelic/LoggingInteractorDecoratorTest.php rename to tests/NewRelic/LoggingInteractorDecoratorTest.php diff --git a/Tests/TransactionNamingStrategy/ControllerNamingStrategyTest.php b/tests/TransactionNamingStrategy/ControllerNamingStrategyTest.php similarity index 100% rename from Tests/TransactionNamingStrategy/ControllerNamingStrategyTest.php rename to tests/TransactionNamingStrategy/ControllerNamingStrategyTest.php diff --git a/Tests/Twig/NewRelicExtensionTest.php b/tests/Twig/NewRelicExtensionTest.php similarity index 100% rename from Tests/Twig/NewRelicExtensionTest.php rename to tests/Twig/NewRelicExtensionTest.php