Merge pull request #64 from ASUWebPlatforms/release-2.15.0

Release 2.15.0

Author: bebaps

composer.json

@@ -49,7 +49,6 @@
         }
     ],
     "require": {
-        "drupal/ckeditor_responsive_plugin": "dev-2.1.x#22b2e1b",
         "pantheon-upstreams/upstream-configuration": "*",
         "webspark/custom-dependencies": "*"
     },
@@ -62,9 +61,17 @@
         "drupal/drupal-extension": "5.0.0",
         "genesis/behat-fail-aid": "3.7.5",
         "nuvoleweb/drupal-behat": "1.3.0",
-        "palantirnet/drupal-rector": "0.18.6",
+        "palantirnet/drupal-rector": "0.20.3",
+        "phpstan/phpstan-deprecation-rules": "^1.2",
         "sirbrillig/phpcs-changed": "v2.11.4"
     },
+    "replace": {
+        "asu_modules/asu_brand": "self.version",
+        "asu_modules/asu_config_utility": "self.version",
+        "asu_modules/asu_react_core": "self.version",
+        "asu_modules/asu_react_integration": "self.version",
+        "asu_modules/asu_user": "self.version"
+    },
     "conflict": {
         "drupal/drupal": "*"
     },
@@ -82,49 +89,27 @@
             "bower-asset"
         ],
         "installer-paths": {
-            "web/core": [
-                "type:drupal-core"
-            ],
+            "web/core": ["type:drupal-core"],
             "web/libraries/{$name}": [
                 "type:drupal-library",
                 "type:npm-asset",
                 "type:bower-asset"
             ],
-            "web/modules/composer/{$name}": [
-                "type:drupal-module"
-            ],
-            "web/profiles/composer/{$name}": [
-                "type:drupal-profile"
-            ],
-            "web/themes/composer/{$name}": [
-                "type:drupal-theme"
-            ],
-            "drush/Commands/contrib/{$name}": [
-                "type:drupal-drush"
-            ],
-            "web/modules/custom/{$name}": [
-                "type:drupal-custom-module"
-            ],
-            "web/profiles/custom/{$name}": [
-                "type:drupal-custom-profile"
-            ],
-            "web/themes/custom/{$name}": [
-                "type:drupal-custom-theme"
-            ],
-            "web/private/scripts/quicksilver/{$name}/": [
-                "type:quicksilver-script"
-            ],
-            "web/libraries/ckeditor/plugins/{$name}": [
-                "vendor:ckeditor-plugin"
-            ]
+            "web/modules/composer/{$name}": ["type:drupal-module"],
+            "web/profiles/composer/{$name}": ["type:drupal-profile"],
+            "web/themes/composer/{$name}": ["type:drupal-theme"],
+            "drush/Commands/contrib/{$name}": ["type:drupal-drush"],
+            "web/modules/custom/{$name}": ["type:drupal-custom-module"],
+            "web/profiles/custom/{$name}": ["type:drupal-custom-profile"],
+            "web/themes/custom/{$name}": ["type:drupal-custom-theme"],
+            "web/private/scripts/quicksilver/{$name}/": ["type:quicksilver-script"],
+            "web/libraries/ckeditor/plugins/{$name}": ["vendor:ckeditor-plugin"]
         },
         "drupal-scaffold": {
             "locations": {
                 "web-root": "./web"
             },
-            "allowed-packages": [
-                "pantheon-systems/drupal-integrations"
-            ],
+            "allowed-packages": ["pantheon-systems/drupal-integrations"],
             "file-mapping": {
                 "[project-root]/.editorconfig": false,
                 "[project-root]/pantheon.upstream.yml": false,
@@ -164,24 +149,16 @@
             "./vendor/bin/phpcs --standard=DrupalPractice --extensions=php,module,inc,install,test,profile,theme,css,info,txt,md --ignore=node_modules,bower_components,vendor ./web/modules/webspark",
             "./vendor/bin/phpcs --standard=DrupalPractice --extensions=php,module,inc,install,test,profile,theme,css,info,txt,md --ignore=node_modules,bower_components,vendor ./web/themes/webspark"
         ],
-        "pre-update-cmd": [
-            "DrupalComposerManaged\\ComposerScripts::preUpdate"
-        ],
-        "post-update-cmd": [
-            "DrupalComposerManaged\\ComposerScripts::postUpdate"
-        ],
-        "custom-require": [
-            "WebsparkCustomScripts\\CustomComposerScripts::customRequire"
-        ],
-        "custom-remove": [
-            "WebsparkCustomScripts\\CustomComposerScripts::customRemove"
-        ]
+        "pre-update-cmd": ["DrupalComposerManaged\\ComposerScripts::preUpdate"],
+        "post-update-cmd": ["DrupalComposerManaged\\ComposerScripts::postUpdate"],
+        "custom-require": ["WebsparkCustomScripts\\CustomComposerScripts::customRequire"],
+        "custom-remove": ["WebsparkCustomScripts\\CustomComposerScripts::customRemove"]
     },
     "config": {
         "preferred-install": "dist",
         "sort-packages": true,
         "platform": {
-            "php": "8.1.6"
+            "php": "8.3.0"
         },
         "allow-plugins": {
             "composer/installers": true,
@@ -192,7 +169,7 @@
             "phpstan/extension-installer": true,
             "zaporylie/composer-drupal-optimizations": true,
             "php-http/discovery": true,
-            "tbachert/spi": false
+            "tbachert/spi": true
         }
     }
 }

monorepo-builder.php

@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+use Symplify\MonorepoBuilder\Config\MBConfig;
+
+return static function (MBConfig $mbConfig): void {
+    $mbConfig->packageDirectories([__DIR__ . '/web/modules/asu_modules/']);
+};

pantheon.upstream.yml

@@ -2,10 +2,12 @@ api_version: 1
 web_docroot: true
 # See https://pantheon.io/docs/pantheon-yml/#enforce-https--hsts for valid values
 enforce_https: transitional
-php_version: 8.1
+php_version: 8.3
 database:
-  version: 10.4
+  version: 10.6
 drush_version: 10
+# The drush version is kept at 10 because Pantheon does not support Drush
+# at a higher version at the platform level, so we have to use composer.
 build_step: true
 protected_web_paths:
   - /private/

phpstan.neon

@@ -1,10 +1,15 @@
 parameters:
 	customRulesetUsed: true
+	level: 0
+	paths:
+	  - web/modules/webspark/
+	  - web/themes/webspark/renovation
 	ignoreErrors:
-		- '#Plugin definitions cannot be altered.#'
-		- '#Missing cache backend declaration for performance.#'
-		- '#Plugin manager has cache backend specified but does not declare cache tags.#'
-		- '#Unsafe usage of new static.#'
+	  - '#\Drupal calls should be avoided in classes, use dependency injection instead#'
+	  - '#Plugin definitions cannot be altered.#'
+	  - '#Missing cache backend declaration for performance.#'
+	  - '#Plugin manager has cache backend specified but does not declare cache tags.#'
+	  - '#Unsafe usage of new static.#'
 
 	# FROM mglaman/drupal-check/phpstan/base_config.neon
 	reportUnmatchedIgnoredErrors: false

rector.php

@@ -9,27 +9,27 @@
 use Rector\Config\RectorConfig;
 
 return static function (RectorConfig $rectorConfig): void {
-    // Adjust the set lists to be more granular to your Drupal requirements.
-    // @todo find out how to only load the relevant rector rules.
-    //   Should we try and load \Drupal::VERSION and check?
-    $rectorConfig->sets([
-        Drupal8SetList::DRUPAL_8,
-        Drupal9SetList::DRUPAL_9,
-        Drupal10SetList::DRUPAL_10,
-    ]);
+  // Adjust the set lists to be more granular to your Drupal requirements.
+  // @todo find out how to only load the relevant rector rules.
+  //   Should we try and load \Drupal::VERSION and check?
+  $rectorConfig->sets([
+    Drupal8SetList::DRUPAL_8,
+    Drupal9SetList::DRUPAL_9,
+    Drupal10SetList::DRUPAL_10,
+  ]);
 
-    $drupalFinder = new DrupalFinder();
-    $drupalFinder->locateRoot(__DIR__);
-    $drupalRoot = $drupalFinder->getDrupalRoot();
-    $rectorConfig->autoloadPaths([
-        $drupalRoot . '/core',
-        $drupalRoot . '/modules',
-        $drupalRoot . '/profiles',
-        $drupalRoot . '/themes'
-    ]);
+  $drupalFinder = new DrupalFinder();
+  $drupalFinder->locateRoot(__DIR__);
+  $drupalRoot = $drupalFinder->getDrupalRoot();
+  $rectorConfig->autoloadPaths([
+    $drupalRoot . '/core',
+    $drupalRoot . '/modules',
+    $drupalRoot . '/profiles',
+    $drupalRoot . '/themes'
+  ]);
 
-    $rectorConfig->skip(['*/upgrade_status/tests/modules/*']);
-    $rectorConfig->fileExtensions(['php', 'module', 'theme', 'install', 'profile', 'inc', 'engine']);
-    $rectorConfig->importNames(true, false);
-    $rectorConfig->importShortClasses(false);
+  $rectorConfig->skip(['*/upgrade_status/tests/modules/*']);
+  $rectorConfig->fileExtensions(['php', 'module', 'theme', 'install', 'profile', 'inc', 'engine']);
+  $rectorConfig->importNames(true, false);
+  $rectorConfig->importShortClasses(false);
 };

upstream-configuration/README.md

@@ -1,11 +1,11 @@
 # Upstream Configuration
 
-If you are working on your custom upstream, use this folder for upstream specific stuff. 
+If you are working on your custom upstream, use this folder for upstream specific stuff.
 
 You can require the `pantheon-systems/upstream-management` [composer package](https://packagist.org/packages/pantheon-systems/upstream-management) to get access to some upstream management tools. Require it with composer like this:
 
 ```
 composer require pantheon-systems/upstream-management:^1
 ```
 
-Read project description for more information about the tools that it contains.
+Read project description for more information about the tools that it contains

upstream-configuration/composer.json

@@ -3,18 +3,19 @@
     "type": "project",
     "require": {
         "composer/installers": "v2.0.0",
-        "cweagans/composer-patches": "1.7.1",
+        "cweagans/composer-patches": "1.7.3",
         "drupal/admin_toolbar": "3.4.2",
         "drupal/allowed_formats": "3.0.0",
         "drupal/anchor_link": "3.0.0-alpha2",
         "drupal/block_field": "1.0.0-rc4",
         "drupal/captcha": "2.0.5",
         "drupal/cas": "2.3.2",
+        "drupal/ckeditor_responsive_plugin": "2.1.0-beta1",
         "drupal/components": "3.0.0-beta3",
         "drupal/config_readonly": "1.0.0-beta5",
         "drupal/config_update": "2.0.0-alpha3",
-        "drupal/core-composer-scaffold": "10.2.10",
-        "drupal/core-recommended": "10.2.10",
+        "drupal/core-composer-scaffold": "10.3.11",
+        "drupal/core-recommended": "10.3.11",
         "drupal/crop": "2.3.0",
         "drupal/ctools": "4.1.0",
         "drupal/current_page_crumb": "1.5.0",
@@ -47,7 +48,7 @@
         "drupal/simple_sitemap": "4.2.1",
         "drupal/smtp": "1.2.0",
         "drupal/webform": "6.2.3",
-        "drush/drush": "^11 || ^12.4.3",
+        "drush/drush": "^12.4.3 || ^13.0",
         "drush-ops/behat-drush-endpoint": "9.4.1",
         "fontawesome/fontawesome": "6.4.2",
         "npm-asset/fonticonpicker--fonticonpicker": "3.1.1",
@@ -56,7 +57,7 @@
         "drupal/pantheon_advanced_page_cache": "2.2.0",
         "pantheon-systems/drupal-integrations": "9.0.2",
         "pantheon-systems/quicksilver-pushback": "2.1.1",
-        "php": ">=8.1.6",
+        "php": ">=8.3.0",
         "zaporylie/composer-drupal-optimizations": "1.2.0",
         "drupal/editor_advanced_link": "2.2.4",
         "drupal/ckeditor": "1.0.2",
@@ -67,5 +68,5 @@
     "config": {
         "sort-packages": true
     },
-    "version": "2.14.2"
+    "version": "2.15.0"
 }

upstream-configuration/patches.webspark.json

@@ -1,14 +1,17 @@
 {
     "drupal/core": {
         "#2951547: Fix issue with layout overflow": "https://www.drupal.org/files/issues/2022-07-13/f245f21ea664f22c81d8d28c6f0f4a42fb9a5890.patch",
-        "3109650: Refactor Xss::attributes() to allow filtering of style attribute values": "https://www.drupal.org/files/issues/2024-05-16/core-10.2.3-xss-refactor_filter_attributes-3109650-74.patch",
-        "#3415961: Fix issue with focus after inserting media via the modal dialog": "https://www.drupal.org/files/issues/2024-02-15/3415961.patch"
+        "#3109650: Refactor Xss::attributes() to allow filtering of style attribute values": "https://www.drupal.org/files/issues/2024-05-16/core-10.2.3-xss-refactor_filter_attributes-3109650-74.patch",
+        "#3415961: Fix issue with focus after inserting media via the modal dialog": "https://www.drupal.org/files/issues/2024-02-15/3415961.patch",
+        "#3386605: Add CKEditor 5 support for WebP images": "https://www.drupal.org/files/issues/2024-08-14/3386605-9-add-ckeditor5-support-for-webp.patch"
     },
     "drupal/config_readonly": {
         "#3085001: Config blacklist to only block some configuration while in read only mode": "https://www.drupal.org/files/issues/2019-10-31/config_readonly-3085001-2.patch"
     },
     "drupal/field_states_ui": {
-        "#3225009: Cant add custom block with field states ui using layout builder": "https://www.drupal.org/files/issues/2023-06-21/3225009-6.patch"
+        "#3225009: Cant add custom block with field states ui using layout builder": "https://www.drupal.org/files/issues/2023-06-21/3225009-6.patch",
+        "#3371927: PluginNotFoundException: The \"\" plugin does not exist": "upstream-configuration/patches/field_states_ui_3371927_mr_10.patch",
+        "3442166: Unable to change either the Target or Comparison elements": "https://www.drupal.org/files/issues/2024-09-27/resolve_fields_states_ui.patch"
     },
     "drupal/linkit": {
         "2877535: Fix issue with path alias": "https://www.drupal.org/files/issues/2023-10-05/linkit-2877535-64.patch"
@@ -27,8 +30,5 @@
     },
     "drupal/paragraphs": {
         "#3090200: Paragraphs do not render: access check for view fail when using layout builder": "https://www.drupal.org/files/issues/2022-10-26/3084934-13_combine_3090200-22.patch"
-    },
-    "drupal/ckeditor_responsive_plugin": {
-        "#3334636 : Add content after injecting the grid ": "https://www.drupal.org/files/issues/2023-08-22/ckeditor_responsive_plugin_2-1.patch"
     }
 }

upstream-configuration/patches/field_states_ui_3371927_mr_10.patch

@@ -0,0 +1,27 @@
+From c4b8790af6a10a1a12e49573a290c0917cdfc0e0 Mon Sep 17 00:00:00 2001
+From: Jo Fitzgerald <[email protected]>
+Date: Fri, 19 Apr 2024 17:27:13 +0000
+Subject: [PATCH] Include type as a hidden form element to ake it available in
+ $form_state
+
+---
+ src/FieldStateManager.php | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/FieldStateManager.php b/src/FieldStateManager.php
+index 3db119b..768bad2 100644
+--- a/src/FieldStateManager.php
++++ b/src/FieldStateManager.php
+@@ -414,6 +414,9 @@ class FieldStateManager extends DefaultPluginManager {
+         $title = t('Add new field state: @type', ['@type' => $field_state->label()]);
+         $submit_label = t('Add');
+         $op = 'new';
++
++        $element['form']['type']['#type'] = 'hidden';
++        $element['form']['type']['#title'] = $type;
+       }
+       $element['form']['edit'] = $field_state->buildConfigurationForm([], $form_state);
+       $element['form']['edit']['#type'] = 'fieldset';
+-- 
+GitLab
+

upstream-configuration/scripts/ComposerScripts.php

@@ -158,6 +158,12 @@ public static function applyComposerJsonUpdates(Event $event) {
         $io->write("<info>Allow phpstan/extension-installer in preparation for Drupal 10</info>");
         $composerJson['config']['allow-plugins']['phpstan/extension-installer'] = true;
       }
+
+      // allow php-http/discovery
+      if(! isset($composerJson['config']['allow-plugins']['php-http/discovery'])) {
+        $io->write("<info>Allow php-http/discovery</info>");
+        $composerJson['config']['allow-plugins']['php-http/discovery'] = true;
+      }
     }
 
     if(serialize($composerJson) == serialize($originalComposerJson)) {
@@ -236,6 +242,7 @@ private static function bestPhpPatchVersion($pantheonPhpVersion) {
     // Drupal 9 requires PHP 7.3 at a minimum.
     // Integrated Composer requires PHP 7.1 at a minimum.
     $patchVersions = [
+      '8.3' => '8.3.0',
       '8.2' => '8.2.0',
       '8.1' => '8.1.13',
       '8.0' => '8.0.26',