Merge pull request #10 from 21TORR/next

Properly set up `Extension::getConfiguration()`

CHANGELOG.md

@@ -1,3 +1,9 @@
+2.3.1
+=====
+
+* (improvement) Properly set up `Extension::getConfiguration()` for the extensions.
+
+
 2.3.0
 =====
 

src/Bundle/BundleExtension.php

@@ -2,6 +2,7 @@
 
 namespace Torr\BundleHelpers\Bundle;
 
+use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -28,8 +29,9 @@ public function __construct (
 	}
 
 	/**
-	 * @inheritDoc
+	 *
 	 */
+	#[\Override]
 	public function load (array $configs, ContainerBuilder $container) : void
 	{
 		$configDir = "{$this->bundle->getPath()}/config";
@@ -42,8 +44,9 @@ public function load (array $configs, ContainerBuilder $container) : void
 	}
 
 	/**
-	 * @inheritDoc
+	 *
 	 */
+	#[\Override]
 	public function getAlias () : string
 	{
 		if (null !== $this->alias)
@@ -53,7 +56,7 @@ public function getAlias () : string
 
 		$className = \get_class($this->bundle);
 
-		if ('Bundle' !== substr($className, -6))
+		if (!str_ends_with($className, 'Bundle'))
 		{
 			throw new BundleHelpersException(sprintf(
 				"The bundle does not follow the naming convention; you must pass an explicit alias. Its name should end on 'Bundle', but it is '%s'.",
@@ -68,4 +71,13 @@ public function getAlias () : string
 
 		return Container::underscore($classBaseName);
 	}
+
+	/**
+	 *
+	 */
+	#[\Override]
+	public function getConfiguration (array $config, ContainerBuilder $container) : ?ConfigurationInterface
+	{
+		return null;
+	}
 }

src/Bundle/ConfigurableBundleExtension.php

@@ -33,13 +33,23 @@ public function __construct (
 	}
 
 	/**
-	 * @inheritDoc
+	 *
 	 */
+	#[\Override]
 	public function load (array $configs, ContainerBuilder $container) : void
 	{
 		parent::load($configs, $container);
 
 		$config = $this->processConfiguration($this->config, $configs);
 		($this->callback)($config, $container);
 	}
+
+	/**
+	 *
+	 */
+	#[\Override]
+	public function getConfiguration (array $config, ContainerBuilder $container) : ?ConfigurationInterface
+	{
+		return $this->config;
+	}
 }