Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/SRM-871 d10 update #89

Merged
merged 45 commits into from
Nov 15, 2023
Merged

Feature/SRM-871 d10 update #89

Show file tree
Hide file tree
Changes from 43 commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
30ecab0
[SRM-871] Updated to d10.
MdNadimHossain May 30, 2023
13c391b
[SRM-871] Updated composer.
MdNadimHossain May 30, 2023
fec3a40
Revert "[SRM-871] Updated composer."
MdNadimHossain May 31, 2023
d258a4c
Added password_strength repo.
MdNadimHossain Jun 5, 2023
2c8b7a2
Updated symfony/filesystem to match with d10 requirement.
MdNadimHossain Jun 5, 2023
7d68352
Added drush 10 dependency:.
MdNadimHossain Jun 5, 2023
564925a
Updated drush 10 dependency.
MdNadimHossain Jun 5, 2023
ba18258
Updated to drush 11.
MdNadimHossain Jun 5, 2023
11c5e7b
Added fork version of drupal console to be compatible with d10.
MdNadimHossain Jun 6, 2023
c0e9d61
Updated drupal-extension to latest version.
MdNadimHossain Jun 6, 2023
895cd63
Updated composer.
MdNadimHossain Jun 6, 2023
ddddc0c
Empty-Commit
MdNadimHossain Jun 6, 2023
14d07e8
Added dependency repo in the composer.
MdNadimHossain Jun 6, 2023
6eb80ea
Updated drupal core-dev version.
MdNadimHossain Jun 6, 2023
16ba4ea
Locking drupal/core-dev version.
MdNadimHossain Jun 6, 2023
477cf6f
Added fork repo for drupal/console-extend-plugin.
MdNadimHossain Jun 6, 2023
2bcc9f2
Updated guzzlehttp/psr7 to be compatible with d10.
MdNadimHossain Jun 6, 2023
9b068ec
Locking the drupal core version.
MdNadimHossain Jun 6, 2023
234859a
Updated scripthandler path.
MdNadimHossain Jun 6, 2023
f058d03
Added new plugin to be allowed.
MdNadimHossain Jun 6, 2023
a4b884d
Added forked version of ckeditor_templates.
MdNadimHossain Jun 7, 2023
7211af7
Fixed composer syntax error.
MdNadimHossain Jun 7, 2023
f0a07b5
Added tide_test temporary.
MdNadimHossain Jun 13, 2023
2e5cc73
Added tide_core d10 compatible version.
MdNadimHossain Jun 13, 2023
f8499b4
Updated info.
MdNadimHossain Jun 13, 2023
5085c5e
Updated the test package version.
MdNadimHossain Jun 13, 2023
ffdd633
Sorted the testing trait alphabetically.
MdNadimHossain Jun 13, 2023
ac776ea
Fixed lint issue.
MdNadimHossain Jun 13, 2023
8eb0d3d
Updated drupal-core and added core-recommended.
MdNadimHossain Jun 19, 2023
15a655a
Removed drupal/core-recommended.
MdNadimHossain Jun 19, 2023
1513c86
Reverted the changes.
MdNadimHossain Jun 19, 2023
fcb1f67
Locked php-http/message.
MdNadimHossain Jun 19, 2023
1d7967e
Merge branch 'develop' into feature/SRM-871-d10-update
MdNadimHossain Jun 22, 2023
7c49486
Updated drupal core to 10.1.x.
MdNadimHossain Jun 27, 2023
38535bc
Locked drupal core to a stable version.
MdNadimHossain Jun 28, 2023
e57446d
Updated guzzlehttp/psr7 to be compatible with drupal core.
MdNadimHossain Jun 28, 2023
f330a83
exclude drupal/create_menus_permission
vincent-gao Jun 29, 2023
35a9d8a
fix: drush can’t find the path
vincent-gao Jul 3, 2023
ac7dedc
Merge branch 'develop' into feature/SRM-871-d10-update
MdNadimHossain Jul 24, 2023
9cb8eb4
SRM-871] Updated drupal/core to the latest.
MdNadimHossain Aug 15, 2023
ee4d9f8
[SRM-870] Updated drupal core.
MdNadimHossain Sep 21, 2023
7a39673
Updated with develop.
MdNadimHossain Sep 21, 2023
0ab7c67
Added local patch provided by tide_core.
MdNadimHossain Nov 2, 2023
a72b4cb
Removed redundant patch.
MdNadimHossain Nov 14, 2023
a48505e
Reverted temp changes.
MdNadimHossain Nov 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 44 additions & 56 deletions composer.dev.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a release now that supports this? I expect since D10 isn't as new now, there may well be

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@krakerag there is still a open PR for this - hechoendrupal/drupal-console#4348

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm sad that they haven't merged it yet, I guess that will have to do. As long as we lock a working version in the lock file we should be fine.

"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": {
Expand All @@ -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",
Expand All @@ -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,
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"license": "GPL-2.0-or-later",
"type": "drupal-module",
"require": {
"dpc-sdp/tide_core": "^3.1.0"
"dpc-sdp/tide_core": "dev-feature/SRM-870-d10-update"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just remember to clean this up before merge (or after merge in a new PR etc)

},
"suggest": {
"dpc-sdp/tide_media:^3.0.0": "Media and related configuration for Tide Drupal 8 distribution"
Expand Down
2 changes: 1 addition & 1 deletion devtools.info.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
122 changes: 122 additions & 0 deletions patches/entity_embed/3396133-ckeditor-5-interface_26.patch
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion scripts/composer/ScriptHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion scripts/drupal-init-module.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:-dev-feature/SRM-929-d10-update}
URI=${LOCALDEV_URL:-dev}

echo "==> COMPOSER_MEMORY_LIMIT=$COMPOSER_MEMORY_LIMIT"
Expand Down
12 changes: 6 additions & 6 deletions tests/behat/bootstrap/FeatureContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

}