Merge pull request #375 from UN-OCHA/gms-site-d9-d10-upgrade

GMS D9-D10 Upgrade Changes
UN-OCHA · Nov 22, 2023 · bdb8aa7 · bdb8aa7
2 parents 37d41af + 628fa93
commit bdb8aa7
Show file tree

Hide file tree

Showing 198 changed files with 4,400 additions and 4,775 deletions.
diff --git a/.gitignore b/.gitignore
@@ -57,3 +57,7 @@ config/routes.yaml
 config/routes
 ###< symfony rubbish ###
 /.gitattributes
+
+###> phpstan/phpstan ###
+phpstan.neon
+###< phpstan/phpstan ###
diff --git a/PATCHES/features/3375425-deprication-warning-features.patch b/PATCHES/features/3375425-deprication-warning-features.patch
@@ -0,0 +1,36 @@
+diff --git a/src/FeaturesGenerationMethodManager.php b/src/FeaturesGenerationMethodManager.php
+index 9ede58e..25248ba 100644
+--- a/src/FeaturesGenerationMethodManager.php
++++ b/src/FeaturesGenerationMethodManager.php
+@@ -11,6 +11,13 @@ use Drupal\Core\Plugin\DefaultPluginManager;
+  */
+ class FeaturesGenerationMethodManager extends DefaultPluginManager {
+
++  /**
++   * The cacheKey prefix.
++   * 
++   * @var string
++   */
++  private $cacheKeyPrefix;
++
+   /**
+    * Constructs a new FeaturesGenerationMethodManager object.
+    *
+diff --git a/src/FeaturesManager.php b/src/FeaturesManager.php
+index b8b8dbf..6f2af59 100644
+--- a/src/FeaturesManager.php
++++ b/src/FeaturesManager.php
+@@ -130,6 +130,13 @@ class FeaturesManager implements FeaturesManagerInterface {
+    */
+   protected $featureInfoCache;
+
++  /**
++   * The features generator.
++   *
++   * @var \Drupal\features\FeaturesGeneratorInterface
++   */
++  protected $generator;
++
+   /**
+    * Constructs a FeaturesManager object.
+    *
diff --git a/composer.json b/composer.json
@@ -86,6 +86,30 @@
                     "composer/installers": "^1.2.0"
                 }
             }
+        },
+		{
+            "type": "package",
+            "package": {
+                "name": "unocha/common_design",
+                "version": "9.2.2",
+                "type": "drupal-theme",
+                "dist": {
+                    "url": "https://github.com/UN-OCHA/common_design/archive/refs/tags/v9.2.2.zip",
+                    "type": "zip"
+                }
+            }
+        },
+		{
+            "type": "package",
+            "package": {
+                "name": "drupaloverride/condition_query",
+                "version": "dev-master",
+                "type": "drupal-module",
+                "dist": {
+                    "url": "https://git.drupalcode.org/api/v4/projects/project%2Fcondition_query/repository/archive.zip?sha=e1de72",
+                    "type": "zip"
+                }
+            }
         }
     ],
     "require": {
@@ -97,53 +121,54 @@
         "ckeditor-plugin/panelbutton": "^4.11",
         "composer/installers": "^1.10",
         "cweagans/composer-patches": "^1.7",
-        "drupal/acl": "^1.0@beta",
+        "drupal/acl": "^2.0@beta",
         "drupal/admin_denied": "^2",
         "drupal/admin_toolbar": "^3.1",
         "drupal/anchor_link": "^2.5",
         "drupal/auto_config_form": "^1.0",
-        "drupal/block_class": "^1.3",
+        "drupal/back_to_top": "^3.0",
+        "drupal/block_class": "^2.0",
         "drupal/bootstrap": "^3.23",
-        "drupal/bootstrap_barrio": "5.1.5",
+        "drupal/bootstrap_barrio": "^5.5",
         "drupal/ckeditor_config": "^3.1",
         "drupal/ckeditor_font": "^1.2",
         "drupal/ckeditor_iframe": "^2.1",
         "drupal/colorbutton": "^1.3",
         "drupal/component_library": "^1.0.0-alpha",
         "drupal/components": "^3.0@beta",
-        "drupal/condition_query": "^1.3",
         "drupal/conditional_fields": "^4.0@alpha",
         "drupal/config_filter": "^2",
-        "drupal/config_split": "^2",
+        "drupal/config_split": "^2.0",
+        "drupal/config_update": "^2.0@alpha",
         "drupal/contact_storage": "^1.2",
-        "drupal/content_access": "^1.0@alpha",
-        "drupal/core-composer-scaffold": "^9.3",
-        "drupal/core-project-message": "^9.3",
-        "drupal/core-recommended": "^9.3",
+        "drupal/content_access": "^2.0",
+        "drupal/core-composer-scaffold": "^10.1",
+        "drupal/core-project-message": "^10.1",
+        "drupal/core-recommended": "^10.1",
         "drupal/csp": "^1.16",
         "drupal/ctools": "^4.0",
         "drupal/ds": "^3.13",
         "drupal/dxpr_theme": "^1.2",
         "drupal/entity_browser": "^2.6",
         "drupal/environment_indicator": "^4.0",
         "drupal/features": "^3.12",
-        "drupal/genpass": "^1.1",
+        "drupal/genpass": "^2.0",
         "drupal/google_tag": "^1.4",
-        "drupal/hook_event_dispatcher": "^3.2",
-        "drupal/http_client_manager": "^2.5",
-        "drupal/imce": "^2.4",
+        "drupal/hook_event_dispatcher": "^4.0@alpha",
+        "drupal/http_client_manager": "^9.3",
+        "drupal/imce": "^3.0",
         "drupal/inline_entity_form": "^1.0@RC",
         "drupal/jquery_ui": "^1.4",
         "drupal/libraries": "^4.0",
         "drupal/login_destination": "^2.0@beta",
         "drupal/mailcontrol": "^1.5",
-        "drupal/maintenance200": "^1.1",
+        "drupal/maintenance200": "^2.1",
         "drupal/media_entity_browser": "^2.0@alpha",
         "drupal/menu_block": "^1.7",
-        "drupal/menu_breadcrumb": "^1.16",
+        "drupal/menu_breadcrumb": "^2.0@alpha",
         "drupal/menu_entity_index": "^1.3",
         "drupal/menu_export": "^1.3",
-        "drupal/menu_firstchild": "^2.0",
+        "drupal/menu_firstchild": "^2.1",
         "drupal/menu_link_attributes": "^1.2",
         "drupal/metatag": "^1.16",
         "drupal/modules_weight": "^3.0",
@@ -152,17 +177,19 @@
         "drupal/override_node_options": "^2.6",
         "drupal/page_specific_class": "^2.0",
         "drupal/pathauto": "^1.8",
-        "drupal/pathologic": "^1.0@alpha",
+        "drupal/pathologic": "^2.0@alpha",
+        "drupal/quickedit": "^1.0",
+        "drupal/rdf": "^2.0",
         "drupal/redirect": "^1.6",
-        "drupal/scrollup": "^3.0",
         "drupal/search_api": "^1.28",
-        "drupal/semanticviews": "^2.3",
+        "drupal/semanticviews": "^3.0",
         "drupal/social_auth": "^3.0",
         "drupal/social_auth_hid": "^3.2",
         "drupal/social_auth_roles": "^1.4",
+        "drupal/stable": "^2.0",
         "drupal/stage_file_proxy": "^2.1",
         "drupal/superfish": "^1.6",
-        "drupal/tb_megamenu": "^1.3",
+        "drupal/tb_megamenu": "^3.0@alpha",
         "drupal/token": "^1.9",
         "drupal/token_filter": "^2.0",
         "drupal/tome": "^1.4",
@@ -173,19 +200,17 @@
         "drupal/views_base_url": "^2.0@beta",
         "drupal/views_block_area": "^1.0@beta",
         "drupal/votingapi": "^3.0@beta",
-        "drush/drush": "^10.3",
+        "drupaloverride/condition_query": "dev-master",
+        "drush/drush": "^11",
         "oomphinc/composer-installers-extender": "^2.0",
         "symfony/flex": "^1.17",
-        "unocha/common_design": "^4.0.0",
+        "unocha/common_design": "^9.2",
         "unocha/ocha_snap": "^8.3.0",
         "webflo/drupal-finder": "^1.2.2"
     },
     "require-dev": {
-        "drupal/coder": "^8.3.12",
-        "drupal/console": "^1.9.7",
-        "drupal/core-dev": "^9.3",
-        "drupal/devel": "^5.0.2",
-        "drupal/devel_php": "^1.3",
+        "drupal/coder": "^8.3",
+        "drupal/core-dev": "^10.1",
         "phpcompatibility/php-compatibility": "^9.3.5",
         "phpmd/phpmd": "^2.9.1",
         "phpunit/php-code-coverage": "^9.2",
@@ -209,7 +234,9 @@
             "drupal/console-extend-plugin": true,
             "oomphinc/composer-installers-extender": true,
             "symfony/flex": true,
-            "wikimedia/composer-merge-plugin": true
+            "wikimedia/composer-merge-plugin": true,
+            "phpstan/extension-installer": true,
+            "php-http/discovery": true
         }
     },
     "extra": {