Feature/SRM-871 d10 update (#89)

* [SRM-871] Updated to be D10 compatible. --------- Co-authored-by: Vincent Gao <[email protected]>
dpc-sdp · Nov 15, 2023 · 6e7f276 · 6e7f276
1 parent aaa5c39
commit 6e7f276
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 67 deletions.
diff --git a/composer.dev.json b/composer.dev.json
@@ -6,32 +6,35 @@
         "composer/installers": "^1.9",
         "cweagans/composer-patches": "^1.6.0",
         "drupal/core-composer-scaffold": "^10.0",
-        "drupal/core": "9.5.x",
-        "drush/drush": "^10",
+        "drupal/core": "10.1.4",
+        "drupal/core-recommended": "10.1.4",
+        "drush/drush": "^11",
         "vlucas/phpdotenv": "^4.1",
         "webflo/drupal-finder": "^1.0"
     },
     "require-dev": {
         "behat/behat": "^3.5",
         "behat/mink-selenium2-driver": "^1.4",
+        "chi-teck/drupal-code-generator": "^2.6.2",
         "squizlabs/php_codesniffer": "3.7.1",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7",
         "drupal/coder": "^8.3.10",
-        "drupal/console": "^1.0",
-        "drupal/drupal-extension": "^4.1",
+        "drupal/console": "dev-feature/Symfony-config-d10-compatibility",
+        "drupal/drupal-extension": "^5.0.0rc1",
         "drevops/behat-screenshot": "^1.0",
         "drevops/behat-steps": "^1.2.0",
         "phpcompatibility/php-compatibility": "^9.1",
         "ubirak/rest-api-behat-extension": "dev-rename_ambiguous_match as 8.2.0",
-        "symfony/filesystem": "^4.4",
+        "symfony/filesystem": "^6.2",
         "php-http/curl-client": "*",
         "phpunit/phpunit": "^8.5.14 || ^9",
-        "drupal/core-dev":"9.5.x",
+        "drupal/core-dev":"10.1.0",
         "phpspec/prophecy-phpunit":"^2",
         "weitzman/drupal-test-traits": "^1.5",
-        "php-http/message": "^1.16",
+        "php-http/message": "~1.13",
         "php-http/message-factory": "^1.1",
-        "guzzlehttp/psr7": "^1.9",
+        "guzzlehttp/psr7": "~2.5.0",
+        "dpc-sdp/tide_test": "dev-feature/SRM-929-d10-update",
         "drupal/test_helpers": "^1.2"
     },
     "provide": {
@@ -54,14 +57,15 @@
           "cweagans/composer-patches": true,
           "zaporylie/composer-drupal-optimizations": false,
           "dealerdirect/phpcodesniffer-composer-installer": true,
-          "php-http/discovery": true
+          "php-http/discovery": true,
+          "phpstan/extension-installer": true
         }
     },
     "repositories": {
         "drupal": {
             "type": "composer",
             "url": "https://packages.drupal.org/8",
-            "exclude": ["drupal/token_conditions"]
+            "exclude": ["drupal/token_conditions", "drupal/password_strength", "drupal/console", "drupal/console-core", "drupal/console-extend-plugin", "drupal/ckeditor_templates", "drupal/create_menus_permission"]
         },
         "asset-packagist": {
             "type": "composer",
@@ -72,6 +76,11 @@
             "no-api": true,
             "url": "https://github.com/dpc-sdp/tide.git"
         },
+        "drupal/create_menus_permission": {
+            "type": "vcs",
+            "no-api": true,
+            "url": "https://github.com/dpc-sdp/create_menus_permission.git"
+        },
         "dpc-sdp/tide_alert": {
             "type": "vcs",
             "no-api": true,
@@ -216,37 +225,6 @@
                 }
             }
         },
-        "ckeditor/iframe": {
-            "type": "package",
-            "package": {
-                "name": "ckeditor/iframe",
-                "type": "drupal-library",
-                "version": "4.5.11",
-                "dist": {
-                    "type": "zip",
-                    "url": "https://download.ckeditor.com/iframe/releases/iframe_4.5.11.zip"
-                },
-                "require": {
-                    "composer/installers": "~1.0"
-                }
-            }
-        },
-        "ckeditor/fakeobjects": {
-            "_webform": true,
-            "type": "package",
-            "package": {
-                "name": "ckeditor/fakeobjects",
-                "version": "4.16.1",
-                "type": "drupal-library",
-                "dist": {
-                    "url": "https://download.ckeditor.com/fakeobjects/releases/fakeobjects_4.16.1.zip",
-                    "type": "zip"
-                },
-                "require": {
-                    "composer/installers": "~1.0"
-                }
-            }
-        },
         "ckeditor.image": {
             "_webform": true,
             "type": "package",
@@ -279,21 +257,6 @@
                 }
             }
         },
-        "ckeditor/liststyle": {
-            "type": "package",
-            "package": {
-                "name": "ckeditor/liststyle",
-                "version": "4.8.0",
-                "type": "drupal-library",
-                "extra": {
-                    "installer-name": "ckeditor/plugins/liststyle"
-                },
-                "dist": {
-                    "url": "https://download.ckeditor.com/liststyle/releases/liststyle_4.8.0.zip",
-                    "type": "zip"
-                }
-            }
-        },
         "ckeditor/templates": {
             "type": "package",
             "package": {
@@ -448,6 +411,31 @@
             "type": "vcs",
             "no-api": true,
             "url": "https://github.com/dpc-sdp/token_conditions.git"
+        },
+        "drupal/password_strength": {
+            "type": "vcs",
+            "no-api": true,
+            "url": "https://github.com/dpc-sdp/password_strength.git"
+        },
+        "drupal/ckeditor_templates": {
+            "type": "vcs",
+            "no-api": true,
+            "url": "https://github.com/dpc-sdp/ckeditor_templates.git"
+        },
+        "drupal/console": {
+            "type": "vcs",
+            "no-api": true,
+            "url": "https://github.com/dpc-sdp/drupal-console.git"
+        },
+        "drupal/console-core": {
+            "type": "vcs",
+            "no-api": true,
+            "url": "https://github.com/dpc-sdp/drupal-console-core.git"
+        },
+        "drupal/console-extend-plugin": {
+            "type": "vcs",
+            "no-api": true,
+            "url": "https://github.com/dpc-sdp/drupal-console-extend-plugin.git"
         }
     },
     "scripts": {

diff --git a/composer.json b/composer.json
@@ -4,9 +4,9 @@
     "license": "GPL-2.0-or-later",
     "type": "drupal-module",
     "require": {
-        "dpc-sdp/tide_core": "^3.1.0"
+        "dpc-sdp/tide_core": "^4.0.0"
     },
     "suggest": {
-        "dpc-sdp/tide_media:^3.0.0": "Media and related configuration for Tide Drupal 8 distribution"
+        "dpc-sdp/tide_media:^4.0.0": "Media and related configuration for Tide Drupal 10 distribution"
     }
 }
diff --git a/devtools.info.yml b/devtools.info.yml
@@ -3,4 +3,4 @@ description: Test module for Dev Tools.
 package: Custom
 
 type: module
-core_version_requirement: ^8.9 || ^9
+core_version_requirement: ^9 || ^10
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -38,6 +38,7 @@ x-environment:
   # Local dev URL populated from the environment. Do not override here. Instead,
   # specify the value in .env file.
   LAGOON_LOCALDEV_URL: ${LOCALDEV_URL:-http://mysite.docker.amazee.io}
+  LAGOON_ROUTE: ${LOCALDEV_URL:-http://mysite.docker.amazee.io}
   GITHUB_TOKEN: ${GITHUB_TOKEN:-}
   BAY_KEY: ${BAY_KEY:-}
   BAY_IMAGE_VERSION: ${BAY_IMAGE_VERSION:-5.x}

diff --git a/scripts/composer/ScriptHandler.php b/scripts/composer/ScriptHandler.php
@@ -6,7 +6,7 @@
 use Composer\Semver\Comparator;
 use DrupalFinder\DrupalFinder;
 use Symfony\Component\Filesystem\Filesystem;
-use Webmozart\PathUtil\Path;
+use Symfony\Component\Filesystem\Path;
 
 /**
  * Class Script Handler.

diff --git a/scripts/drupal-init-module.sh b/scripts/drupal-init-module.sh
@@ -14,7 +14,7 @@ COMPOSER=${COMPOSER:-composer.build.json}
 APP=${APP:-/app}
 WEBROOT=${WEBROOT:-docroot}
 TEST_PACKAGE_NAME=${TEST_PACKAGE_NAME:-tide_test}
-TEST_PACKAGE_VERSION=${TEST_PACKAGE_VERSION:-^3.0}
+TEST_PACKAGE_VERSION=${TEST_PACKAGE_VERSION:-^4.0}
 URI=${LOCALDEV_URL:-dev}
 
 echo "==> COMPOSER_MEMORY_LIMIT=$COMPOSER_MEMORY_LIMIT"

diff --git a/tests/behat/bootstrap/FeatureContext.php b/tests/behat/bootstrap/FeatureContext.php
@@ -23,19 +23,19 @@
  */
 class FeatureContext extends DrupalContext {
 
-  use LinkTrait;
-  use PathTrait;
-  use FieldTrait;
   use ContentTrait;
+  use FieldTrait;
+  use JsTrait;
+  use LinkTrait;
   use MediaTrait;
   use MenuTrait;
-  use TaxonomyTrait;
+  use PathTrait;
   use ResponseTrait;
+  use TaxonomyTrait;
   use TideCommonTrait;
   use TideExtensionsTrait;
   use TideEntityTrait;
-  use WatchdogTrait;
-  use JsTrait;
   use VisibilityTrait;
+  use WatchdogTrait;
 
 }