New directory structure

Author: ajgarlag

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';

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",

src/Resources/config/access_token/default.php renamed to config/access_token/default.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'])
+    ;
+};

src/Resources/config/access_token/null.php renamed to config/access_token/null.php

@@ -136,7 +136,7 @@ security:
 
     ```yaml
     oauth2:
-        resource: '@LeagueOAuth2ServerBundle/Resources/config/routes.php'
+        resource: '@LeagueOAuth2ServerBundle/config/routes.php'
         type: php
     ```
 

config/routes.php

@@ -35,7 +35,6 @@
             <directory>.</directory>
         </include>
         <exclude>
-            <directory>./resources</directory>
             <directory>./tests</directory>
             <directory>./vendor</directory>
         </exclude>

src/Resources/config/services.php renamed to config/services.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);

src/Resources/config/storage/doctrine.php renamed to config/storage/doctrine.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);
+    }
 }

src/Resources/config/storage/in_memory.php renamed to config/storage/in_memory.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';

docs/index.md

@@ -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')