Issue #3293210 by slucero: Fix PHPCS, deprecations, and test failures to enable DrupalCI testing

Author: slucero

composer.json

@@ -14,18 +14,15 @@
     ],
     "license": "MIT",
     "require": {
-        "php": ">=7.1.3",
+        "php": ">=7.4.0",
+        "ext-json": "*",
         "swaggest/json-schema": "^0.12",
         "symfony/finder": "^3.4 || ^4.0",
         "symfony/yaml": "^3.4 || ^4.0"
     },
     "require-dev": {
-        "drupal/core-recommended": "^8.8"
-    },
-    "config": {
-        "platform": {
-            "php": "7.1.3"
-        }
+        "drupal/core-recommended": "^9",
+        "drupal/core-dev": "^9"
     },
     "extra": {
         "drush": {

modules/patternkit_media_library/patternkit_media_library.install

@@ -23,6 +23,7 @@ function patternkit_media_library_requirements($phase) {
 
   return $requirements;
 }
+
 /**
  * Sets default value for new config item 'patternkit_media_library.settings'.
  */

modules/patternkit_media_library/patternkit_media_library.services.yml

@@ -1,4 +1,4 @@
 services:
   patternkit.opener.jsonlibrary:
     class: Drupal\patternkit_media_library\MediaLibraryJSONLibraryOpener
-    arguments: ['@entity_type.manager']
+    arguments: ['@entity_type.manager', '@file_url_generator']

modules/patternkit_media_library/src/Form/MediaLibrarySettingsForm.php

@@ -2,11 +2,8 @@
 
 namespace Drupal\patternkit_media_library\Form;
 
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Settings form for configuring Patternkit's media library integration.
@@ -23,12 +20,12 @@ class MediaLibrarySettingsForm extends ConfigFormBase {
   /**
    * Implements buildForm().
    *
-   * {@inheritDoc}
+   * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) :array {
     $config = $this->config(static::SETTINGS);
 
-    $form['use_styles'] = array(
+    $form['use_styles'] = [
       '#type' => 'checkbox',
       '#title' => t('Use bundled styles for the media library modal window'),
       '#description' => t('If checked, then Patternkit will load some styles for
@@ -37,20 +34,20 @@ public function buildForm(array $form, FormStateInterface $form_state) :array {
         Media Library Theme Reset</a>, so enable that module if you want to use
         these styles.'),
       '#default_value' => $config->get('use_styles') ?? FALSE,
-    );
+    ];
 
     return parent::buildForm($form, $form_state);
   }
 
   /**
-   * {@inheritDoc}
+   * {@inheritdoc}
    */
   protected function getEditableConfigNames() :array {
     return [static::SETTINGS];
   }
 
   /**
-   * {@inheritDoc}
+   * {@inheritdoc}
    */
   public function getFormId() :string {
     return 'patternkit_media_library_settings_form';
@@ -59,7 +56,7 @@ public function getFormId() :string {
   /**
    * {@inheritdoc}
    */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
+  public function submitForm(array &$form, FormStateInterface $form_state): void {
     $form_values = $form_state->getValues();
     $config = $this->config(self::SETTINGS);
 

modules/patternkit_media_library/src/MediaLibraryJSONLibraryOpener.php

@@ -5,6 +5,7 @@
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Ajax\AjaxResponse;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\File\FileUrlGeneratorInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\media_library\MediaLibraryOpenerInterface;
 use Drupal\media_library\MediaLibraryState;
@@ -22,14 +23,24 @@ class MediaLibraryJSONLibraryOpener implements MediaLibraryOpenerInterface {
    */
   protected $entityTypeManager;
 
+  /**
+   * The file url generator service.
+   *
+   * @var \Drupal\Core\File\FileUrlGeneratorInterface
+   */
+  protected $fileUrlGenerator;
+
   /**
    * MediaLibraryFieldWidgetOpener constructor.
    *
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
    *   The entity type manager.
+   * @param \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator
+   *   The file url generator service.
    */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager) {
+  public function __construct(EntityTypeManagerInterface $entity_type_manager, FileUrlGeneratorInterface $file_url_generator) {
     $this->entityTypeManager = $entity_type_manager;
+    $this->fileUrlGenerator = $file_url_generator;
   }
 
   /**
@@ -71,7 +82,7 @@ public function getSelectionResponse(MediaLibraryState $state, array $selected_i
         $url = $file->toUrl()->setAbsolute(FALSE);
       }
       elseif ($file->access('download')) {
-        $url = file_url_transform_relative(file_create_url($file->getFileUri()));
+        $url = $this->fileUrlGenerator->generateString($file->getFileUri());
       }
       else {
         $url = $file->label();

patternkit.info.yml

@@ -2,10 +2,9 @@ name: Patternkit
 description: Adds Patternkit patterns as blocks.
 type: module
 package: Presentation Framework
-core: 8.x
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^9
 configure: patternkit.settings
 dependencies:
   - drupal:block_content
   - drupal:ckeditor
-php: 7.3
+php: 7.4

patternkit.install

@@ -22,7 +22,7 @@ use Drupal\views\EntityViewsData;
 /**
  * Implements hook_requirements().
  */
-function patternkit_requirements($phase) {
+function patternkit_requirements($phase): array {
   $requirements = [];
 
   if (version_compare(\Drupal::VERSION, 8.9, '<')) {
@@ -163,7 +163,8 @@ function patternkit_update_8003(&$sandbox) {
  */
 function patternkit_update_8004(&$sandbox) {
   $config_key = 'patternkit.settings';
-  $source = new FileStorage(drupal_get_path('module', 'patternkit') . '/config/install');
+  $patternkit_module_path = \Drupal::service('extension.list.module')->getPath('patternkit');
+  $source = new FileStorage($patternkit_module_path . '/config/install');
   $config_install = $source->read($config_key);
   $config_current = \Drupal::configFactory()->getEditable($config_key);
 

patternkit.module

@@ -31,6 +31,7 @@ function patternkit_help($route_name, RouteMatchInterface $route_match) {
   <dd>Users with the <em>Administer blocks</em> permission can add Patternkit blocks to the site block layout.</dd>
 </dl>
 HTML;
+      // phpcs:ignore Drupal.Semantics.FunctionT.NotLiteralString
       return t($output, [
         ':patternkit_example' => $patternkit_example,
         ':patternkit_media_library' => $patternkit_media_library,
@@ -44,7 +45,7 @@ HTML;
 /**
  * Implements hook_theme().
  */
-function patternkit_theme($existing, $type, $theme, $path) {
+function patternkit_theme($existing, $type, $theme, $path): array {
   return [
     'patternkit_add_list' => [
       'variables' => ['content' => NULL],

patternkit.services.yml

@@ -8,16 +8,19 @@ services:
       - { name: path_processor_inbound, priority: 200 }
   patternkit.asset.library:
     class: Drupal\patternkit\Asset\Library
-    arguments: ['@cache.discovery', '@config.factory', '@plugin.manager.library.pattern', '@lock', '@module_handler', '@app.root', '@theme.manager']
+    arguments: ['@cache.discovery', '@config.factory', '@plugin.manager.library.pattern', '@lock', '@module_handler', '%app.root%', '@theme.manager', '@extension.path.resolver']
+  patternkit.asset.library.parser.base:
+    abstract: true
+    arguments: [ '@serialization.json', '%app.root%', '@module_handler', '@theme.manager', '@stream_wrapper_manager', '@library.libraries_directory_file_finder', '@extension.path.resolver' ]
   patternkit.asset.library.parser.file:
+    parent: patternkit.asset.library.parser.base
     class: Drupal\patternkit\Asset\PatternLibraryParser\FilePatternLibraryParser
-    arguments: ['@serialization.json', '@app.root', '@module_handler', '@theme.manager', '@stream_wrapper_manager']
   patternkit.asset.library.parser.json:
+    parent: patternkit.asset.library.parser.base
     class: Drupal\patternkit\Asset\PatternLibraryParser\JSONPatternLibraryParser
-    arguments: ['@serialization.json', '@app.root', '@module_handler', '@theme.manager', '@stream_wrapper_manager']
   patternkit.asset.library.parser.twig:
+    parent: patternkit.asset.library.parser.base
     class: Drupal\patternkit\Asset\PatternLibraryParser\TwigPatternLibraryParser
-    arguments: ['@serialization.json', '@app.root', '@module_handler', '@theme.manager', '@stream_wrapper_manager']
   plugin.manager.library.pattern:
     class: Drupal\patternkit\PatternLibraryPluginManager
     arguments: ['@container.namespaces', '@cache.discovery', '@module_handler', '@theme_handler']

src/AJAX/PatternkitEditorUpdateCommand.php

@@ -46,7 +46,7 @@ public function __construct($selector, $value) {
   }
 
   /**
-   * {@inheritDoc}
+   * {@inheritdoc}
    */
   public function render(): array {
     return [

src/Annotation/PatternLibrary.php

@@ -28,7 +28,7 @@ class PatternLibrary extends Plugin {
    *
    * @var string
    */
-  public $id;
+  public string $id;
 
   /**
    * The human-readable name.
@@ -37,7 +37,7 @@ class PatternLibrary extends Plugin {
    *
    * @ingroup plugin_translatable
    */
-  public $label;
+  public string $label;
 
   /**
    * An optional description for advanced layouts.
@@ -51,7 +51,7 @@ class PatternLibrary extends Plugin {
    *
    * @ingroup plugin_translatable
    */
-  public $description;
+  public string $description;
 
   /**
    * The human-readable category.
@@ -62,7 +62,7 @@ class PatternLibrary extends Plugin {
    *
    * @ingroup plugin_translatable
    */
-  public $category;
+  public string $category;
 
   /**
    * The layout plugin class.
@@ -72,12 +72,12 @@ class PatternLibrary extends Plugin {
    *
    * @var string
    */
-  public $class = PatternLibraryPluginDefault::class;
+  public string $class = PatternLibraryPluginDefault::class;
 
   /**
    * {@inheritdoc}
    */
-  public function get() {
+  public function get(): PatternLibraryPluginDefinition {
     return new PatternLibraryPluginDefinition($this->definition);
   }