From ca5dff27a26e56094401a5c4948fba98d1af950e Mon Sep 17 00:00:00 2001
From: Jesse Rushlow <jr@rushlow.dev>
Date: Tue, 11 Jun 2024 06:58:09 -0400
Subject: [PATCH] modernize bundle config

---
 {src/Resources/config => config}/services.xml       |  0
 .../KnpUOAuth2ClientExtension.php                   | 13 ++++++++++++-
 src/KnpUOAuth2ClientBundle.php                      |  4 ++--
 3 files changed, 14 insertions(+), 3 deletions(-)
 rename {src/Resources/config => config}/services.xml (100%)

diff --git a/src/Resources/config/services.xml b/config/services.xml
similarity index 100%
rename from src/Resources/config/services.xml
rename to config/services.xml
diff --git a/src/DependencyInjection/KnpUOAuth2ClientExtension.php b/src/DependencyInjection/KnpUOAuth2ClientExtension.php
index 6c95e907..f7a4a4c0 100644
--- a/src/DependencyInjection/KnpUOAuth2ClientExtension.php
+++ b/src/DependencyInjection/KnpUOAuth2ClientExtension.php
@@ -73,6 +73,7 @@
 use KnpU\OAuth2ClientBundle\DependencyInjection\Providers\YahooProviderConfigurator;
 use KnpU\OAuth2ClientBundle\DependencyInjection\Providers\YandexProviderConfigurator;
 use KnpU\OAuth2ClientBundle\DependencyInjection\Providers\ZendeskProviderConfigurator;
+use KnpU\OAuth2ClientBundle\KnpUOAuth2ClientBundle;
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
@@ -172,11 +173,13 @@ public function __construct($checkExternalClassExistence = true)
      */
     public function load(array $configs, ContainerBuilder $container): void
     {
+        trigger_deprecation('OA2CBundle', '99999', 'Load() deprecated... Moving to %s', KnpUOAuth2ClientBundle::class);
+
         $processor = new Processor();
         $configuration = new Configuration();
         $config = $processor->processConfiguration($configuration, $configs);
 
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader = new XmlFileLoader($container, new FileLocator(dirname(__DIR__, 2).'/config'));
         $loader->load('services.xml');
 
         $httpClient = $config['http_client'];
@@ -311,6 +314,8 @@ private function configureProviderAndClient(ContainerBuilder $container, $provid
 
     public static function getAllSupportedTypes(): array
     {
+        trigger_deprecation('OA2CBundle', '99999', 'getAllSupportedTypes() deprecated... Moving to %s', KnpUOAuth2ClientBundle::class);
+
         return array_keys(self::$supportedProviderTypes);
     }
 
@@ -319,6 +324,8 @@ public static function getAllSupportedTypes(): array
      */
     public function getConfigurator($type): ProviderConfiguratorInterface
     {
+        trigger_deprecation('OA2CBundle', '99999', 'getConfigurator() deprecated... Moving to %s', KnpUOAuth2ClientBundle::class);
+
         if (!isset($this->configurators[$type])) {
             $class = self::$supportedProviderTypes[$type];
 
@@ -333,6 +340,8 @@ public function getConfigurator($type): ProviderConfiguratorInterface
      */
     public function getAlias(): string
     {
+        trigger_deprecation('OA2CBundle', '99999', 'getAlias() deprecated... Moving to %s', KnpUOAuth2ClientBundle::class);
+
         return 'knpu_oauth2_client';
     }
 
@@ -366,6 +375,8 @@ private function buildConfigurationForType(NodeDefinition $node, $type)
      */
     public static function configuratorNeedsClientSecret(ProviderConfiguratorInterface $configurator): bool
     {
+        trigger_deprecation('OA2CBundle', '99999', 'configuratorNeedsClientSecret() deprecated... Moving to %s', KnpUOAuth2ClientBundle::class);
+
         if (!$configurator instanceof ProviderWithoutClientSecretConfiguratorInterface) {
             return true;
         }
diff --git a/src/KnpUOAuth2ClientBundle.php b/src/KnpUOAuth2ClientBundle.php
index 70549026..d4da4481 100644
--- a/src/KnpUOAuth2ClientBundle.php
+++ b/src/KnpUOAuth2ClientBundle.php
@@ -12,9 +12,9 @@
 
 use KnpU\OAuth2ClientBundle\DependencyInjection\KnpUOAuth2ClientExtension;
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
-use Symfony\Component\HttpKernel\Bundle\Bundle;
+use Symfony\Component\HttpKernel\Bundle\AbstractBundle;
 
-class KnpUOAuth2ClientBundle extends Bundle
+class KnpUOAuth2ClientBundle extends AbstractBundle
 {
     /**
      * Overridden to allow for the custom extension alias.