diff --git a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Internal.php b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Internal.php index df306ef..02049b6 100644 --- a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Internal.php +++ b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Internal.php @@ -34,6 +34,23 @@ class Internal extends CKEditorPluginBase implements ContainerFactoryPluginInter protected $cache; /** + * Constructs a \Drupal\ckeditor\Plugin\CKEditorPlugin\Internal object. + * + * @param array $configuration + * A configuration array containing information about the plugin instance. + * @param string $plugin_id + * The plugin_id for the plugin instance. + * @param mixed $plugin_definition + * The plugin implementation definition. + * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend + * The cache backend. + */ + public function __construct(array $configuration, $plugin_id, $plugin_definition, CacheBackendInterface $cache_backend) { + $this->cache = $cache_backend; + parent::__construct($configuration, $plugin_id, $plugin_definition); + } + + /** * Creates an instance of the plugin. * * @param \Symfony\Component\DependencyInjection\ContainerInterface $container @@ -58,23 +75,6 @@ public static function create(ContainerInterface $container, array $configuratio } /** - * Constructs a \Drupal\ckeditor\Plugin\CKEditorPlugin\Internal object. - * - * @param array $configuration - * A configuration array containing information about the plugin instance. - * @param string $plugin_id - * The plugin_id for the plugin instance. - * @param mixed $plugin_definition - * The plugin implementation definition. - * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend - * The cache backend. - */ - public function __construct(array $configuration, $plugin_id, $plugin_definition, CacheBackendInterface $cache_backend) { - $this->cache = $cache_backend; - parent::__construct($configuration, $plugin_id, $plugin_definition); - } - - /** * Implements \Drupal\ckeditor\Plugin\CKEditorPluginInterface::isInternal(). */ public function isInternal() { diff --git a/core/modules/editor/src/Plugin/Filter/EditorFileReference.php b/core/modules/editor/src/Plugin/Filter/EditorFileReference.php index c7b3526..b22bda6 100644 --- a/core/modules/editor/src/Plugin/Filter/EditorFileReference.php +++ b/core/modules/editor/src/Plugin/Filter/EditorFileReference.php @@ -36,18 +36,6 @@ class EditorFileReference extends FilterBase implements ContainerFactoryPluginIn protected $entityManager; /** - * {@inheritdoc} - */ - static public function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) { - return new static( - $configuration, - $plugin_id, - $plugin_definition, - $container->get('entity.manager') - ); - } - - /** * Constructs a \Drupal\editor\Plugin\Filter\EditorFileReference object. * * @param array $configuration @@ -67,6 +55,18 @@ public function __construct(array $configuration, $plugin_id, $plugin_definition /** * {@inheritdoc} */ + static public function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) { + return new static( + $configuration, + $plugin_id, + $plugin_definition, + $container->get('entity.manager') + ); + } + + /** + * {@inheritdoc} + */ public function process($text, $langcode) { $result = new FilterProcessResult($text);