Commit b2eb4850 authored by Gaus Surahman's avatar Gaus Surahman Committed by Gaus Surahman
Browse files

Issue #3254692 by gausarts: Drupal 10, identify deprecation, etc

parent 174d912c

blazy.services.yml

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ services: 
    calls:

      # @todo remove and use DI instead after sub-module updates, and put as the

      # last argument only if to support careless users ignoring hook_update().

      - [setRoot, ['@app.root']]

      - [setRoot, ['%app.root%']]

      - [setLanguageManager, ['@language_manager']]



  blazy.manager:

blazy_ui/blazy_ui.info.yml

+1 −1
Original line number Diff line number Diff line 
name: Blazy UI

type: module

description: 'Provides Blazy configuration UI.'

core_version_requirement: ^8.8 || ^9

core_version_requirement: ^9.2 || ^10

package: Blazy

configure: blazy.settings

dependencies:

src/BlazyManagerBase.php

+2 −2
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ abstract class BlazyManagerBase implements BlazyManagerInterface { 
    );



    // @todo remove and use DI at 2.x+ post sub-classes updates.

    $instance->setRoot($container->get('app.root'));

    $instance->setRoot($container->getParameter('app.root'));

    $instance->setLanguageManager($container->get('language_manager'));

    return $instance;

  }
@@ -125,7 +125,7 @@ abstract class BlazyManagerBase implements BlazyManagerInterface { 
   * @todo remove and use DI at 3.x+ post sub-classes updates.

   */

  public function setRoot($root) {

    $this->root = $root;

    $this->root = (string) $root;

    return $this;

  }

src/Plugin/Filter/BlazyFilterBase.php

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ abstract class BlazyFilterBase extends FilterBase implements BlazyFilterInterfac 
  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {

    $instance = new static($configuration, $plugin_id, $plugin_definition);



    $instance->root = isset($instance->root) ? $instance->root : $container->get('app.root');

    $instance->root = isset($instance->root) ? $instance->root : $container->getParameter('app.root');

    $instance->entityFieldManager = isset($instance->entityFieldManager) ? $instance->entityFieldManager : $container->get('entity_field.manager');

    $instance->filterManager = isset($instance->filterManager) ? $instance->filterManager : $container->get('plugin.manager.filter');

    $instance->blazyAdmin = isset($instance->blazyAdmin) ? $instance->blazyAdmin : $container->get('blazy.admin');

tests/src/FunctionalJavascript/BlazyFilterJavaScriptTest.php

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ class BlazyFilterJavaScriptTest extends WebDriverTestBase { 


    $this->setUpVariables();



    $this->root                   = $this->container->get('app.root');

    $this->root                   = $this->container->getParameter('app.root');

    $this->fileSystem             = $this->container->get('file_system');

    $this->entityFieldManager     = $this->container->get('entity_field.manager');

    $this->formatterPluginManager = $this->container->get('plugin.manager.field.formatter');