From 4da7b73e5e29110734c2eb5724ac4aac782d78d4 Mon Sep 17 00:00:00 2001 From: Bart Jaskulski <bjaskulski@protonmail.com> Date: Sat, 9 Mar 2024 04:22:42 +0100 Subject: [PATCH] refactor: simplify loading bindings from config value Signed-off-by: Bart Jaskulski <bjaskulski@protonmail.com> --- .../Loader/ConfigurationBindingLoader.php | 24 ------------------- src/Extension/ConfigExtension.php | 9 +++---- 2 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 src/Binding/Loader/ConfigurationBindingLoader.php diff --git a/src/Binding/Loader/ConfigurationBindingLoader.php b/src/Binding/Loader/ConfigurationBindingLoader.php deleted file mode 100644 index ea3ce28..0000000 --- a/src/Binding/Loader/ConfigurationBindingLoader.php +++ /dev/null @@ -1,24 +0,0 @@ -<?php -declare( strict_types=1 ); - -namespace WPDesk\Init\Binding\Loader; - -use WPDesk\Init\Configuration\ReadableConfig; -use WPDesk\Init\Loader\PhpFileLoader; -use WPDesk\Init\Util\Path; - -class ConfigurationBindingLoader extends DirectoryBasedLoader { - - public function __construct( - ReadableConfig $config, - string $plugin_path, - PhpFileLoader $loader, - DefinitionFactory $def_factory - ) { - parent::__construct( - ( new Path( $config->get( 'hook_resources_path' ) ) )->absolute( $plugin_path ), - $loader, - $def_factory - ); - } -} diff --git a/src/Extension/ConfigExtension.php b/src/Extension/ConfigExtension.php index 4a469e3..c623dbb 100644 --- a/src/Extension/ConfigExtension.php +++ b/src/Extension/ConfigExtension.php @@ -8,7 +8,7 @@ use Psr\Container\ContainerInterface; use WPDesk\Init\Binding\DefinitionFactory; use WPDesk\Init\Binding\Loader\ArrayBindingLoader; use WPDesk\Init\Binding\Loader\BindingDefinitions; -use WPDesk\Init\Binding\Loader\ConfigurationBindingLoader; +use WPDesk\Init\Binding\Loader\DirectoryBasedLoader; use WPDesk\Init\Configuration\Configuration; use WPDesk\Init\Configuration\ReadableConfig; use WPDesk\Init\DependencyInjection\ContainerBuilder; @@ -21,11 +21,8 @@ class ConfigExtension implements Extension { public function bindings( ContainerInterface $c ): BindingDefinitions { $config = $c->get( Configuration::class ); if ( $config->has( 'hook_resources_path' ) ) { - return new ConfigurationBindingLoader( - $c->get( Configuration::class ), - $c->get( Plugin::class )->get_path(), - new PhpFileLoader(), - new DefinitionFactory() + return new DirectoryBasedLoader( + ( new Path( $config->get( 'hook_resources_path' ) ) )->absolute( $c->get( Plugin::class )->get_path() ) ); } -- GitLab