diff --git a/modules/pdb_ng2/components/ng2_example_1/ng2_example_1.info.yml b/modules/pdb_ng2/components/ng2_example_1/ng2_example_1.info.yml index 33e75e8..d64bb48 100644 --- a/modules/pdb_ng2/components/ng2_example_1/ng2_example_1.info.yml +++ b/modules/pdb_ng2/components/ng2_example_1/ng2_example_1.info.yml @@ -4,6 +4,6 @@ type: pdb description: 'NG 2 Example Component 1' category: NG2 version: '1.0.0' -core_version_requirement: ^8 || ^9 +core_version_requirement: ^9 || ^10 module_status: active presentation: ng2 diff --git a/modules/pdb_ng2/components/ng2_example_2/ng2_example_2.info.yml b/modules/pdb_ng2/components/ng2_example_2/ng2_example_2.info.yml index f2dec4a..9574648 100644 --- a/modules/pdb_ng2/components/ng2_example_2/ng2_example_2.info.yml +++ b/modules/pdb_ng2/components/ng2_example_2/ng2_example_2.info.yml @@ -4,6 +4,6 @@ type: pdb description: 'NG 2 Example Component 2' category: NG2 version: '1.0.0' -core_version_requirement: ^8 || ^9 +core_version_requirement: ^9 || ^10 module_status: active presentation: ng2 diff --git a/modules/pdb_ng2/components/ng2_example_configuration/ng2_example_configuration.info.yml b/modules/pdb_ng2/components/ng2_example_configuration/ng2_example_configuration.info.yml index c11744a..a60eb06 100644 --- a/modules/pdb_ng2/components/ng2_example_configuration/ng2_example_configuration.info.yml +++ b/modules/pdb_ng2/components/ng2_example_configuration/ng2_example_configuration.info.yml @@ -4,7 +4,7 @@ type: pdb description: 'NG 2 Example Component Configuration' category: NG2 version: '1.0.0' -core_version_requirement: ^8 || ^9 +core_version_requirement: ^9 || ^10 module_status: active presentation: ng2 configuration: diff --git a/modules/pdb_ng2/components/ng2_example_node/ng2_example_node.info.yml b/modules/pdb_ng2/components/ng2_example_node/ng2_example_node.info.yml index d2d4d8e..ca0611d 100644 --- a/modules/pdb_ng2/components/ng2_example_node/ng2_example_node.info.yml +++ b/modules/pdb_ng2/components/ng2_example_node/ng2_example_node.info.yml @@ -4,7 +4,7 @@ type: pdb description: 'NG 2 Example Component Node' category: NG2 version: '1.0.0' -core_version_requirement: ^8 || ^9 +core_version_requirement: ^9 || ^10 module_status: active presentation: ng2 contexts: diff --git a/modules/pdb_ng2/components/ng2_hero/ng2_hero.info.yml b/modules/pdb_ng2/components/ng2_hero/ng2_hero.info.yml index b72ba6f..5279e4b 100644 --- a/modules/pdb_ng2/components/ng2_hero/ng2_hero.info.yml +++ b/modules/pdb_ng2/components/ng2_hero/ng2_hero.info.yml @@ -4,6 +4,6 @@ type: pdb description: 'NG 2 Hero block, a basic example' category: NG2 version: '1.0.0' -core_version_requirement: ^8 || ^9 +core_version_requirement: ^9 || ^10 module_status: active presentation: ng2 diff --git a/modules/pdb_ng2/components/ng2_todo/ng2_todo.info.yml b/modules/pdb_ng2/components/ng2_todo/ng2_todo.info.yml index 5836d1e..fef011b 100644 --- a/modules/pdb_ng2/components/ng2_todo/ng2_todo.info.yml +++ b/modules/pdb_ng2/components/ng2_todo/ng2_todo.info.yml @@ -4,6 +4,6 @@ type: pdb description: 'NG 2 ToDo example component' category: NG2 version: '1.0.0' -core_version_requirement: ^8 || ^9 +core_version_requirement: ^9 || ^10 module_status: active presentation: ng2 diff --git a/modules/pdb_ng2/pdb_ng2.info.yml b/modules/pdb_ng2/pdb_ng2.info.yml index 0998542..5656496 100644 --- a/modules/pdb_ng2/pdb_ng2.info.yml +++ b/modules/pdb_ng2/pdb_ng2.info.yml @@ -3,6 +3,6 @@ type: module description: 'Turns on Angular 2 framework for use by PDB' package: PDB configure: pdb_ng2.form -core_version_requirement: ^8 || ^9 +core_version_requirement: ^9 || ^10 dependencies: - pdb diff --git a/modules/pdb_ng2/src/Plugin/Block/Ng2Block.php b/modules/pdb_ng2/src/Plugin/Block/Ng2Block.php index dfe34b2..c61e425 100644 --- a/modules/pdb_ng2/src/Plugin/Block/Ng2Block.php +++ b/modules/pdb_ng2/src/Plugin/Block/Ng2Block.php @@ -2,7 +2,9 @@ namespace Drupal\pdb_ng2\Plugin\Block; +use Drupal\Core\Extension\ExtensionPathResolver; use Drupal\pdb\Plugin\Block\PdbBlock; +use Symfony\Component\DependencyInjection\ContainerInterface; /** * Exposes an Angular 2 component as a block. @@ -15,6 +17,42 @@ use Drupal\pdb\Plugin\Block\PdbBlock; */ class Ng2Block extends PdbBlock { + /** + * The extension path resolver. + * + * @var \Drupal\Core\Extension\ExtensionPathResolver + */ + protected $extensionPathResolver; + + /** + * PdbBlock constructor. + * + * @param array $configuration + * Plugin configuration. + * @param string $plugin_id + * The plugin ID. + * @param mixed $plugin_definition + * The plugin definition. + * @param \Drupal\Core\Extension\ExtensionPathResolver $extensionPathResolver + * The extension path resolver. + */ + public function __construct(array $configuration, $plugin_id, $plugin_definition, ExtensionPathResolver $extensionPathResolver) { + parent::__construct($configuration, $plugin_id, $plugin_definition); + $this->extensionPathResolver = $extensionPathResolver; + } + + /** + * {@inheritdoc} + */ + public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) { + return new static( + $configuration, + $plugin_id, + $plugin_definition, + $container->get('extension.path.resolver') + ); + } + /** * {@inheritdoc} */ @@ -59,7 +97,7 @@ class Ng2Block extends PdbBlock { 'ngClassName' => $component['ng_class_name'], ]; } - $attached['drupalSettings']['pdb']['ng2']['module_path'] = drupal_get_path('module', 'pdb_ng2'); + $attached['drupalSettings']['pdb']['ng2']['module_path'] = $this->extensionPathResolver->getPath('module', 'pdb_ng2'); $config_settings = \Drupal::config('pdb_ng2.settings'); if (isset($config_settings)) { diff --git a/modules/pdb_react/components/react_example_1/react_example_1.info.yml b/modules/pdb_react/components/react_example_1/react_example_1.info.yml index b8ac2b3..b84f30e 100644 --- a/modules/pdb_react/components/react_example_1/react_example_1.info.yml +++ b/modules/pdb_react/components/react_example_1/react_example_1.info.yml @@ -4,7 +4,7 @@ type: pdb description: 'React Example Component 1' category: React version: '1.0.0' -core_version_requirement: ^8 || ^9 +core_version_requirement: ^9 || ^10 module_status: active presentation: react add_js: diff --git a/modules/pdb_react/components/react_todo/react_todo.info.yml b/modules/pdb_react/components/react_todo/react_todo.info.yml index 783f2d9..baeb3fe 100644 --- a/modules/pdb_react/components/react_todo/react_todo.info.yml +++ b/modules/pdb_react/components/react_todo/react_todo.info.yml @@ -4,7 +4,7 @@ type: pdb description: 'React ToDo' category: React version: '1.0.0' -core: '8.x' +core_version_requirement: ^9 || ^10 module_status: active presentation: react add_js: diff --git a/modules/pdb_react/pdb_react.info.yml b/modules/pdb_react/pdb_react.info.yml index 055d202..32a276d 100644 --- a/modules/pdb_react/pdb_react.info.yml +++ b/modules/pdb_react/pdb_react.info.yml @@ -2,6 +2,6 @@ name: PDB React type: module description: 'Turns on react framework for use by PDB' package: PDB -core_version_requirement: ^8 || ^9 +core_version_requirement: ^9 || ^10 dependencies: - pdb diff --git a/pdb.info.yml b/pdb.info.yml index 8916b3a..35f4a13 100644 --- a/pdb.info.yml +++ b/pdb.info.yml @@ -2,4 +2,4 @@ name: Progressively Decoupled Blocks (PDB) type: module description: 'Build stuff with javascript frameworks as blocks.' package: PDB -core_version_requirement: ^8 || ^9 +core_version_requirement: ^9 || ^10 diff --git a/src/Event/PdbDiscoveryEvent.php b/src/Event/PdbDiscoveryEvent.php index e651039..1f06d81 100644 --- a/src/Event/PdbDiscoveryEvent.php +++ b/src/Event/PdbDiscoveryEvent.php @@ -2,7 +2,7 @@ namespace Drupal\pdb\Event; -use Symfony\Component\EventDispatcher\Event; +use Symfony\Contracts\EventDispatcher\Event; /** * Provides an event to handle user custom search dirs.