From c815d171055698f3746cce81666623a0cca3c2ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20J=2E=20Garc=C3=ADa=20Lagar?= <ajgarcia@c17.net>
Date: Mon, 17 Mar 2025 13:23:29 +0100
Subject: [PATCH] New directory structure

---
 Resources/config/routes.php                      |  7 +++++++
 composer.json                                    |  1 +
 .../config => config}/access_token/default.php   |  0
 .../config => config}/access_token/null.php      |  0
 config/routes.php                                | 16 ++++++++++++++++
 {src/Resources/config => config}/services.php    |  0
 .../config => config}/storage/doctrine.php       |  0
 .../config => config}/storage/in_memory.php      |  0
 docs/index.md                                    |  2 +-
 phpunit.xml.dist                                 |  1 -
 .../LeagueOAuth2ServerExtension.php              |  2 +-
 src/LeagueOAuth2ServerBundle.php                 |  7 +++++++
 src/Resources/config/routes.php                  | 13 ++-----------
 tests/Fixtures/routes.php                        |  2 +-
 14 files changed, 36 insertions(+), 15 deletions(-)
 create mode 100644 Resources/config/routes.php
 rename {src/Resources/config => config}/access_token/default.php (100%)
 rename {src/Resources/config => config}/access_token/null.php (100%)
 create mode 100644 config/routes.php
 rename {src/Resources/config => config}/services.php (100%)
 rename {src/Resources/config => config}/storage/doctrine.php (100%)
 rename {src/Resources/config => config}/storage/in_memory.php (100%)

diff --git a/Resources/config/routes.php b/Resources/config/routes.php
new file mode 100644
index 00000000..02ed632c
--- /dev/null
+++ b/Resources/config/routes.php
@@ -0,0 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
+trigger_deprecation('league/oauth2-server-bundle', '0.11', 'Loading resource "@LeagueOAuth2ServerBundle/Resources/config/routes.php" is deprecated. Load "@LeagueOAuth2ServerBundle/config/routes.php" instead.');
+
+return require __DIR__ . '/../../config/routes.php';
diff --git a/composer.json b/composer.json
index b5b7ae9d..656ce58a 100644
--- a/composer.json
+++ b/composer.json
@@ -23,6 +23,7 @@
         "league/oauth2-server": "^9.2",
         "nyholm/psr7": "^1.4",
         "psr/http-factory": "^1.0",
+        "symfony/deprecation-contracts": "^3",
         "symfony/event-dispatcher": "^6.4|^7.0",
         "symfony/filesystem": "^6.4|^7.0",
         "symfony/framework-bundle": "^6.4|^7.0",
diff --git a/src/Resources/config/access_token/default.php b/config/access_token/default.php
similarity index 100%
rename from src/Resources/config/access_token/default.php
rename to config/access_token/default.php
diff --git a/src/Resources/config/access_token/null.php b/config/access_token/null.php
similarity index 100%
rename from src/Resources/config/access_token/null.php
rename to config/access_token/null.php
diff --git a/config/routes.php b/config/routes.php
new file mode 100644
index 00000000..ddce95d1
--- /dev/null
+++ b/config/routes.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+
+return function (RoutingConfigurator $routes) {
+    $routes
+        ->add('oauth2_authorize', '/authorize')
+        ->controller(['league.oauth2_server.controller.authorization', 'indexAction'])
+
+        ->add('oauth2_token', '/token')
+        ->controller(['league.oauth2_server.controller.token', 'indexAction'])
+        ->methods(['POST'])
+    ;
+};
diff --git a/src/Resources/config/services.php b/config/services.php
similarity index 100%
rename from src/Resources/config/services.php
rename to config/services.php
diff --git a/src/Resources/config/storage/doctrine.php b/config/storage/doctrine.php
similarity index 100%
rename from src/Resources/config/storage/doctrine.php
rename to config/storage/doctrine.php
diff --git a/src/Resources/config/storage/in_memory.php b/config/storage/in_memory.php
similarity index 100%
rename from src/Resources/config/storage/in_memory.php
rename to config/storage/in_memory.php
diff --git a/docs/index.md b/docs/index.md
index 15ec971c..b02c6fe9 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -136,7 +136,7 @@ security:
 
     ```yaml
     oauth2:
-        resource: '@LeagueOAuth2ServerBundle/Resources/config/routes.php'
+        resource: '@LeagueOAuth2ServerBundle/config/routes.php'
         type: php
     ```
 
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 2d369183..9b5a7741 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -35,7 +35,6 @@
             <directory>.</directory>
         </include>
         <exclude>
-            <directory>./resources</directory>
             <directory>./tests</directory>
             <directory>./vendor</directory>
         </exclude>
diff --git a/src/DependencyInjection/LeagueOAuth2ServerExtension.php b/src/DependencyInjection/LeagueOAuth2ServerExtension.php
index 3655542f..a6070073 100644
--- a/src/DependencyInjection/LeagueOAuth2ServerExtension.php
+++ b/src/DependencyInjection/LeagueOAuth2ServerExtension.php
@@ -55,7 +55,7 @@ final class LeagueOAuth2ServerExtension extends Extension implements PrependExte
      */
     public function load(array $configs, ContainerBuilder $container)
     {
-        $loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+        $loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../../config'));
         $loader->load('services.php');
 
         $config = $this->processConfiguration(new Configuration(), $configs);
diff --git a/src/LeagueOAuth2ServerBundle.php b/src/LeagueOAuth2ServerBundle.php
index 7d070c8f..0478860b 100644
--- a/src/LeagueOAuth2ServerBundle.php
+++ b/src/LeagueOAuth2ServerBundle.php
@@ -54,4 +54,11 @@ private function configureDoctrineExtension(ContainerBuilder $container): void
 
         $container->addCompilerPass(new EncryptionKeyPass());
     }
+
+    public function getPath(): string
+    {
+        $reflected = new \ReflectionObject($this);
+
+        return \dirname($reflected->getFileName() ?: __FILE__, 2);
+    }
 }
diff --git a/src/Resources/config/routes.php b/src/Resources/config/routes.php
index ddce95d1..6e9acc60 100644
--- a/src/Resources/config/routes.php
+++ b/src/Resources/config/routes.php
@@ -2,15 +2,6 @@
 
 declare(strict_types=1);
 
-use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+trigger_deprecation('league/oauth2-server-bundle', '0.11', 'Loading file "%s" is deprecated. Load "%s" instead.', __FILE__, realpath(__DIR__ . '/../../../config/routes.php'));
 
-return function (RoutingConfigurator $routes) {
-    $routes
-        ->add('oauth2_authorize', '/authorize')
-        ->controller(['league.oauth2_server.controller.authorization', 'indexAction'])
-
-        ->add('oauth2_token', '/token')
-        ->controller(['league.oauth2_server.controller.token', 'indexAction'])
-        ->methods(['POST'])
-    ;
-};
+return require __DIR__ . '/../../../config/routes.php';
diff --git a/tests/Fixtures/routes.php b/tests/Fixtures/routes.php
index 2e4d7679..2218c548 100644
--- a/tests/Fixtures/routes.php
+++ b/tests/Fixtures/routes.php
@@ -6,7 +6,7 @@
 use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
 
 return function (RoutingConfigurator $routes) {
-    $routes->import('@LeagueOAuth2ServerBundle/Resources/config/routes.php');
+    $routes->import('@LeagueOAuth2ServerBundle/config/routes.php');
 
     $routes
         ->add('security_test', '/security-test')