Skip to content
Snippets Groups Projects
Verified Commit d0ae395b authored by Bartek Jaskulski's avatar Bartek Jaskulski
Browse files

refactor: rename loader to definitions

parent c481c2f2
No related branches found
No related tags found
2 merge requests!3improve into wp-hook and some additional unfinished things,!21.x
This commit is part of merge request !2. Comments created here will be created in the context of that merge request.
......@@ -7,7 +7,7 @@ use WPDesk\Init\Binding\DefinitionFactory;
use WPDesk\Init\Configuration\ReadableConfig;
use WPDesk\Init\Plugin\Plugin;
class ArrayBindingLoader implements BindingDefinitions {
class ArrayDefinitions implements BindingDefinitions {
/** @var array */
private $bindings;
......
......@@ -45,6 +45,6 @@ class FilesystemDefinitions implements BindingDefinitions {
$hooks = [ $filename->get_filename_without_extension() => $hooks ];
}
yield from (new ArrayBindingLoader( $hooks ) )->load();
yield from (new ArrayDefinitions( $hooks ) )->load();
}
}
......@@ -11,7 +11,7 @@ use Monolog\Processor\PsrLogMessageProcessor;
use Monolog\Processor\UidProcessor;
use Psr\Container\ContainerInterface;
use Psr\Log\LoggerInterface;
use WPDesk\Init\Binding\Loader\ArrayBindingLoader;
use WPDesk\Init\Binding\Loader\ArrayDefinitions;
use WPDesk\Init\Binding\Loader\BindingDefinitions;
use WPDesk\Init\Configuration\ReadableConfig;
use WPDesk\Init\DependencyInjection\ContainerBuilder;
......@@ -33,7 +33,7 @@ class ConditionalExtension implements Extension {
$bindings[] = WPDeskTrackerBridge::class;
}
return new ArrayBindingLoader( $bindings );
return new ArrayDefinitions( $bindings );
}
public function build( ContainerBuilder $builder, Plugin $plugin, ReadableConfig $config ): void {
......
......@@ -5,7 +5,7 @@ declare(strict_types=1);
namespace WPDesk\Init\Extension;
use Psr\Container\ContainerInterface;
use WPDesk\Init\Binding\Loader\ArrayBindingLoader;
use WPDesk\Init\Binding\Loader\ArrayDefinitions;
use WPDesk\Init\Binding\Loader\BindingDefinitions;
use WPDesk\Init\Binding\Loader\FilesystemDefinitions;
use WPDesk\Init\Configuration\Configuration;
......@@ -24,7 +24,7 @@ class ConfigExtension implements Extension {
);
}
return new ArrayBindingLoader( [] );
return new ArrayDefinitions( [] );
}
public function build( ContainerBuilder $builder, Plugin $plugin, ReadableConfig $config ): void {
......
......@@ -5,7 +5,6 @@ declare(strict_types=1);
namespace WPDesk\Init\Extension;
use Psr\Container\ContainerInterface;
use WPDesk\Init\Binding\Loader\ArrayBindingLoader;
use WPDesk\Init\Binding\Loader\BindingDefinitions;
use WPDesk\Init\Configuration\ReadableConfig;
use WPDesk\Init\DependencyInjection\ContainerBuilder;
......
......@@ -3,18 +3,18 @@ declare( strict_types=1 );
namespace WPDesk\Init\Tests\Binding;
use WPDesk\Init\Binding\Loader\ArrayBindingLoader;
use WPDesk\Init\Binding\Loader\ArrayDefinitions;
use WPDesk\Init\Tests\TestCase;
class ArrayBindingLoaderTest extends TestCase {
public function test_loading_empty_bindings(): void {
$a = new ArrayBindingLoader([]);
$a = new ArrayDefinitions([]);
$this->assertEquals(0, iterator_count($a->load()));
}
public function test_loading_structured_bindings(): void {
$a = new ArrayBindingLoader([
$a = new ArrayDefinitions([
'hook' => [
'bind1',
'bind2',
......@@ -38,7 +38,7 @@ class ArrayBindingLoaderTest extends TestCase {
}
public function test_loading_unstructured_bindings(): void {
$a = new ArrayBindingLoader([
$a = new ArrayDefinitions([
'bind1',
'bind2',
'hook' => 'bind3',
......@@ -51,7 +51,7 @@ class ArrayBindingLoaderTest extends TestCase {
iterator_to_array($a->load())
);
$a = new ArrayBindingLoader([
$a = new ArrayDefinitions([
'bind1',
'not_a_hook' => 'bind2',
'hook' => ['bind3'],
......
......@@ -3,20 +3,20 @@ declare( strict_types=1 );
namespace WPDesk\Init\Tests\Binding;
use WPDesk\Init\Binding\Loader\ArrayBindingLoader;
use WPDesk\Init\Binding\Loader\ArrayDefinitions;
use WPDesk\Init\Binding\Loader\CompositeBindingLoader;
use WPDesk\Init\Tests\TestCase;
class CompositeBindingLoaderTest extends TestCase {
public function test_loading_empty_bindings(): void {
$a = new CompositeBindingLoader(new ArrayBindingLoader([]));
$a = new CompositeBindingLoader(new ArrayDefinitions([]));
$this->assertEquals(0, iterator_count($a->load()));
}
public function test_loading_structured_bindings(): void {
$a = new CompositeBindingLoader(
new ArrayBindingLoader(
new ArrayDefinitions(
[
'hook' => [
'bind1',
......@@ -24,7 +24,7 @@ class CompositeBindingLoaderTest extends TestCase {
],
]
),
new ArrayBindingLoader(
new ArrayDefinitions(
[
'hook2' => [
'bind3',
......@@ -48,13 +48,13 @@ class CompositeBindingLoaderTest extends TestCase {
public function test_loading_unstructured_bindings(): void {
$a = new CompositeBindingLoader(
new ArrayBindingLoader( [
new ArrayDefinitions( [
'bind1',
]),
new ArrayBindingLoader([
new ArrayDefinitions([
'bind2',
]),
new ArrayBindingLoader([
new ArrayDefinitions([
'hook' => 'bind3',
])
);
......@@ -71,13 +71,13 @@ class CompositeBindingLoaderTest extends TestCase {
);
$a = new CompositeBindingLoader(
new ArrayBindingLoader([
new ArrayDefinitions([
'bind1',
]),
new ArrayBindingLoader([
new ArrayDefinitions([
'not_a_hook' => 'bind2',
]),
new ArrayBindingLoader([
new ArrayDefinitions([
'hook' => ['bind3'],
]),
);
......
......@@ -4,7 +4,7 @@ declare( strict_types=1 );
namespace WPDesk\Init\Tests\Binding;
use WPDesk\Init\Binding\Definition\UnknownDefinition;
use WPDesk\Init\Binding\Loader\DirectoryBasedLoader;
use WPDesk\Init\Binding\Loader\FilesystemDefinitions;
use WPDesk\Init\Configuration\Configuration;
use WPDesk\Init\Tests\TestCase;
......@@ -12,13 +12,13 @@ class DirectoryBasedLoaderTest extends TestCase {
public function xtest_throws_when_configuration_entry_is_missing(): void {
$this->expectException(\InvalidArgumentException::class);
$a = new DirectoryBasedLoader(new Configuration([]));
$a = new FilesystemDefinitions(new Configuration([]));
$a->load();
}
public function test_loading_empty_bindings(): void {
$this->initTempPlugin('hook-bindings');
$a = new DirectoryBasedLoader('./');
$a = new FilesystemDefinitions('./');
$actual = iterator_to_array($a->load(), false);
$this->assertEquals(
[
......@@ -32,7 +32,7 @@ class DirectoryBasedLoaderTest extends TestCase {
public function test_load_illogical_bindings(): void {
$this->initTempPlugin('borked-bindings');
$a = new DirectoryBasedLoader('./');
$a = new FilesystemDefinitions('./');
$actual = iterator_to_array($a->load(), false);
$this->assertEquals(
......
......@@ -8,7 +8,7 @@ use WPDesk\Init\Binding\ObservableBinder;
use WPDesk\Init\HookDriver\GenericDriver;
use WPDesk\Init\Configuration\Configuration;
use Psr\Container\ContainerInterface;
use WPDesk\Init\Binding\Loader\ArrayBindingLoader;
use WPDesk\Init\Binding\Loader\ArrayDefinitions;
use WPDesk\Init\Binding\StoppableBinder;
use WPDesk\Init\Tests\TestCase;
......@@ -59,7 +59,7 @@ class GenericDriverTest extends TestCase {
/** @dataProvider provider */
public function test_register_hooks( array $hook_bindings, callable $assertion ): void {
$driver = new GenericDriver( new ArrayBindingLoader(array_keys($hook_bindings)) );
$driver = new GenericDriver( new ArrayDefinitions(array_keys($hook_bindings)) );
$driver->register_hooks( new Configuration([]), $this->getContainer($hook_bindings) );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment