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.

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

D11 compatibility #823

Merged
merged 50 commits into from
Jan 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
a44f0fd
D11 compatibility
Jul 15, 2024
16c9358
Moar
Jul 15, 2024
3f6763a
Merge branch '8.0.x' into d11-compatibility
chrfritsch Aug 30, 2024
fd67cdf
Update modules
Aug 30, 2024
d0579c4
Merge branch '8.0.x' into d11-compatibility
chrfritsch Aug 30, 2024
1c4ece8
Allow drush 13
Aug 30, 2024
b0607ae
Lenient paragraphs_features
Aug 30, 2024
36ead36
Add lenient
Aug 30, 2024
17eb259
Add our modules :(
Aug 30, 2024
e81c53f
ignore
Sep 2, 2024
d379be3
Try lenient
Sep 2, 2024
17320fc
ERA release
Sep 2, 2024
03f7250
Use dev version
Sep 3, 2024
540eba8
Fix deprecations
Sep 3, 2024
3106bc9
Allow d11
Sep 3, 2024
3d52282
Select2 patch
Sep 3, 2024
4164f2d
dev
Sep 3, 2024
6742609
Add admin_toolbar patch
Sep 3, 2024
5eeb592
Other drupal testing
Sep 3, 2024
6609f2f
Try chunks
Sep 4, 2024
99298bc
Foo
Sep 4, 2024
79dbb92
demo
Sep 4, 2024
8f22ee7
Fix
Sep 4, 2024
2910e16
Add ivw patch
Sep 4, 2024
6ba179e
Foo
Sep 4, 2024
4dd3388
Foo
Sep 4, 2024
8d2158c
Fix
Sep 5, 2024
0bba8f7
Fix
Sep 5, 2024
7080bef
Merge branch '7.3.x' into d11-compatibility
Oct 30, 2024
c9c7ca5
Remove more modules from lenient
Oct 30, 2024
4448beb
Fix
Nov 14, 2024
2a6b3bd
Merge branch '7.4.x' into d11-compatibility
Jan 7, 2025
3f16821
Merge branch '8.0.x' into d11-compatibility
Jan 8, 2025
790dc41
Remove paste from lenient
Jan 8, 2025
949cecd
Some fixes
Jan 8, 2025
366c379
Fixes test
Jan 8, 2025
420bfae
Try
Jan 8, 2025
e156318
Don't test removed tags
Jan 8, 2025
27e9d0d
Fix
Jan 8, 2025
7266ca5
Fixes
Jan 8, 2025
7785a40
Pararllelize
Jan 9, 2025
5ed7ef9
Fix
Jan 9, 2025
5fcba74
Add env
Jan 9, 2025
d8b4d98
Try
Jan 9, 2025
7db26c0
Fix
Jan 9, 2025
65c65fd
Use select2 2
Jan 9, 2025
13a8534
Update composer.json
chrfritsch Jan 10, 2025
c1d862a
Remove patch
Jan 10, 2025
8695ed4
Releases
Jan 10, 2025
3a14bcf
More to remove
Jan 10, 2025
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
16 changes: 6 additions & 10 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,16 @@ env:
DRUPAL_TESTING_DATABASE_ENGINE: mysql
DRUPAL_TESTING_TEST_CODING_STYLES: false
DRUPAL_TESTING_TEST_PROFILE: thunder
DRUPAL_TESTING_TEST_CONFIGURATION: /tmp/test/thunder/install/docroot/profiles/contrib/thunder/
DRUPAL_TESTING_HTTP_PORT: 8888
DRUPAL_TESTING_VERBOSE: false
DRUPAL_TESTING_VERSION: "^1.0.42"
DRUPAL_TESTING_VERSION: "^1.0.45"
DRUPAL_TESTING_TEST_FILTER: ""
DRUPAL_TESTING_SELENIUM_HOST: 127.0.0.1
DRUPAL_TESTING_SELENIUM_PORT: 9515
PHPSTAN_MEMORY_LIMIT: 4G
DRUPAL_TESTING_PARALLEL_TESTING: false
MINK_DRIVER_ARGS_WEBDRIVER: '["chrome", {"browserName":"chrome","chromeOptions":{"args":["--disable-gpu","--headless", "--no-sandbox", "--disable-dev-shm-usage"]}}, "http://127.0.0.1:9515"]'
MINK_DRIVER_ARGS_WEBDRIVER: '["chrome", {"browserName":"chrome","goog:chromeOptions":{"args":["--disable-gpu","--headless", "--no-sandbox", "--disable-dev-shm-usage"]}}, "http://127.0.0.1:9515"]'
SIMPLETEST_BASE_URL: http://thunder-testing:8888
BROWSERTEST_OUTPUT_DIRECTORY: /tmp
SKIP_TEST_CLEANUP: true
Expand Down Expand Up @@ -127,7 +128,7 @@ jobs:
fail-fast: false
matrix:
PHP_VERSION: [ '8.3' ]
CHUNK: [ 1, 2, 3 ]
DRUPAL_TESTING_TEST_SUITE: [ 'kernel', 'functional', 'functional-javascript' ]

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -167,14 +168,13 @@ jobs:
- name: Run tests
run: test-drupal-project run_tests
env:
THUNDER_TEST_CHUNK: ${{ matrix.CHUNK }}
DRUPAL_TESTING_TEST_PATH: /tmp/test/thunder/install/docroot/profiles/contrib/thunder/tests/src/TestSuites/ThunderTestSuite.php
DRUPAL_TESTING_TEST_SUITE: ${{ matrix.DRUPAL_TESTING_TEST_SUITE }}

- name: Upload test output
uses: actions/upload-artifact@v4
if: success() || failure()
with:
name: text-max-output-${{ matrix.CHUNK }}-${{ matrix.PHP_VERSION }}
name: text-max-output-${{ matrix.DRUPAL_TESTING_TEST_SUITE }}-${{ matrix.PHP_VERSION }}
path: /tmp/test/thunder/install/docroot/sites/simpletest/browser_output/

test-upgrade:
Expand Down Expand Up @@ -202,7 +202,6 @@ jobs:

env:
DRUPAL_TESTING_TEST_GROUP_EXCLUDE: "NoUpdate"
DRUPAL_TESTING_TEST_GROUP: Thunder

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -309,9 +308,6 @@ jobs:

if: ${{ contains(github.event.pull_request.labels.*.name, 'test-min') || github.event_name == 'schedule' }}

env:
DRUPAL_TESTING_TEST_GROUP: Thunder

steps:
- uses: actions/checkout@v3

Expand Down
40 changes: 20 additions & 20 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,60 +57,60 @@
"drupal/autofill": "^1.1",
"drupal/autosave_form": "1.7",
"drupal/checklistapi": "^2.1.3",
"drupal/core-recommended": "~10.4.0@stable",
"drupal/config_selector": "^2.1",
"drupal/config_update": "^1.7 || ^2.0",
"drupal/core-recommended": "~11.1.0",
"drupal/config_selector": "^3.0",
"drupal/config_update": "^2.0-alpha4",
"drupal/content_lock": "^3.0.0-alpha2",
"drupal/crop": "^2.2",
"drupal/diff": "1.8",
"drupal/dropzonejs": "^2.8",
"drupal/empty_fields": "^1.0-alpha1",
"drupal/empty_fields": "^1.0",
"drupal/entity_reference_actions": "^1.1.1",
"drupal/entity_reference_revisions": "^1.3",
"drupal/field_group": "3.6",
"drupal/focal_point": "^2.1.2",
"drupal/facets": "^2.0.7",
"drupal/gin": "3.0-rc15",
"drupal/gin": "^3.0-rc15",
"drupal/gin_toolbar": "^1.0-rc6",
"drupal/graphql": "^4.7",
"drupal/inline_entity_form": "^3.0.0@rc",
"drupal/inline_entity_form": "^3.0.0-rc20",
"drupal/ivw_integration": "^2.0",
"drupal/length_indicator": "^1.2",
"drupal/linkit": "^6.0-beta4",
"drupal/media_entity_instagram": "^3.0.3",
"drupal/linkit": "^7.0.0-alpha1",
"drupal/media_entity_instagram": "^4.0",
"drupal/media_entity_pinterest": "^2.7",
"drupal/media_entity_slideshow": "^2.0-alpha1",
"drupal/media_entity_twitter": "^2.5",
"drupal/media_expire": "^2.6",
"drupal/media_library_media_modify": "^1.0.0",
"drupal/media_library_media_modify": "^2.0.0-beta1",
"drupal/media_file_delete": "^1.2",
"drupal/metatag": "^1.26",
"drupal/metatag": "^2.0.2",
"drupal/metatag_async_widget": "^1.0-alpha2",
"drupal/paragraphs": "^1.12",
"drupal/paragraphs_features": "^2.0.0-beta3",
"drupal/paragraphs": "^1.18",
"drupal/paragraphs_features": "^2.1.0",
"drupal/paragraphs_paste": "^2.0-beta3",
"drupal/password_policy": "^4.0.3",
"drupal/pathauto": "^1.12",
"drupal/responsive_preview": "^2.1",
"drupal/redirect": "^1.7",
"drupal/scheduler": "^2.0.2",
"drupal/scheduler_content_moderation_integration": "^2.0||^3.0",
"drupal/schema_metatag": "^2.5",
"drupal/select2": "^1.7",
"drupal/scheduler": "^2.1.0",
"drupal/scheduler_content_moderation_integration": "^3.0.1",
"drupal/schema_metatag": "^3.0.3",
"drupal/select2": "^2.0",
"drupal/search_api_mark_outdated": "^1.0",
"drupal/simple_sitemap": "^4.1.6",
"drupal/simple_sitemap": "^4.2.1",
"drupal/token": "^1.7",
"drupal/update_helper": "^2.0||^3.0.3||^4.0",
"drupal/search_api": "^1.29",
"drupal/views_bulk_edit": "^2.5",
"drupal/views_bulk_edit": "^3.0",
"drupal/views_bulk_operations": "^4.2.7",
"drupal/vgwort": "^2.0@beta",
"drupal/vgwort": "^3.0@beta",
"drupal/xymatic": "^1.0@beta",
"npm-asset/dropzone": "^5.5.1",
"npm-asset/exif-js": "^2.3.0",
"npm-asset/blazy": "^1.8",
"npm-asset/slick-carousel": "^1.8",
"npm-asset/select2": "^4.0.7",
"npm-asset/select2": "dev-develop",
"caxy/php-htmldiff": "^0.1.14",
"webonyx/graphql-php": "^14.11.8"
},
Expand Down
3 changes: 0 additions & 3 deletions config/optional/metatag.metatag_defaults.node__article.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ dependencies: { }
id: node__article
label: 'Content: Article'
tags:
content_language: '[node:langcode]'
description: '[node:field_teaser_text]'
image_src: '[node:field_teaser_media:entity:field_image]'
referrer: no-referrer
Expand All @@ -22,8 +21,6 @@ tags:
og_url: '[node:url]'
twitter_cards_description: '[node:field_teaser_text]'
twitter_cards_image: '[node:field_teaser_media:entity:field_image:twitter]'
twitter_cards_image_height: '[node:field_teaser_media:entity:field_image:twitter:height]'
twitter_cards_image_width: '[node:field_teaser_media:entity:field_image:twitter:width]'
twitter_cards_type: summary_large_image
schema_article_about: '[node:field_channel:entity:name]'
schema_article_date_modified: '[node:changed:html_datetime]'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ dependencies:
id: node__news_article
label: 'Content: News Article'
tags:
content_language: '[node:langcode]'
description: '[node:field_teaser_text]'
image_src: '[node:field_teaser_media:entity:field_image]'
referrer: no-referrer
Expand All @@ -24,8 +23,6 @@ tags:
og_url: '[node:url]'
twitter_cards_description: '[node:field_teaser_text]'
twitter_cards_image: '[node:field_teaser_media:entity:field_image:twitter]'
twitter_cards_image_height: '[node:field_teaser_media:entity:field_image:twitter:height]'
twitter_cards_image_width: '[node:field_teaser_media:entity:field_image:twitter:width]'
twitter_cards_type: summary_large_image
schema_article_about: '[node:field_channel:entity:name]'
schema_article_date_modified: '[node:changed:html_datetime]'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Drupal\Core\Breadcrumb\Breadcrumb;
use Drupal\Core\Breadcrumb\BreadcrumbBuilderInterface;
use Drupal\Core\Cache\CacheableMetadata;
use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\Entity\EntityRepositoryInterface;
use Drupal\Core\Entity\EntityTypeManagerInterface;
Expand Down Expand Up @@ -45,7 +46,7 @@ public function __construct(EntityTypeManagerInterface $entityTypeManager, prote
/**
* {@inheritdoc}
*/
public function applies(RouteMatchInterface $route_match): bool {
public function applies(RouteMatchInterface $route_match, ?CacheableMetadata $cacheable_metadata = NULL): bool {
// This breadcrumb apply only for all articles.
$parameters = $route_match->getParameters()->all();
if (($route_match->getRouteName() === 'entity.node.canonical') && is_object($parameters['node'])) {
Expand Down
2 changes: 1 addition & 1 deletion modules/thunder_article/thunder_article.info.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Thunder Article'
description: 'Provide Article content type for Thunder.'
type: module
core_version_requirement: ^10
core_version_requirement: ^11
package: Thunder
dependencies:
- drupal:node
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,14 @@ public function testMetatagsCacheInvalidation(): void {
$this->assertEquals('New teaser text', $descriptionData['content'], 'The meta tag has the wrong content.');

// Assert that changing the site config invalidates the cache.
$descriptionData = $this->jsonDecode($responseData[7]['attributes']);
$descriptionData = $this->jsonDecode($responseData[6]['attributes']);
$this->assertEquals('og:site_name', $descriptionData['property'], 'The meta tag for og:site_name is not the seventh tag in the response.');
$this->assertEquals('Drush Site-Install', $descriptionData['content'], 'The meta tag has the wrong content.');

$this->setSiteName('Drupal Test Installation');

$responseData = $this->getResponseData($query, $variables)['metatags'];
$descriptionData = $this->jsonDecode($responseData[7]['attributes']);
$descriptionData = $this->jsonDecode($responseData[6]['attributes']);

$this->assertEquals('og:site_name', $descriptionData['property'], 'The meta tag for og:site_name is not the seventh tag in the response.');
$this->assertEquals('Drupal Test Installation', $descriptionData['content'], 'The meta tag has the wrong content.');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ public function testEntityWithTerms(array $parameterMapping, array $expectedResu
*
* @see ::testEntityWithTerms()
*/
public function providerEntityWithTerms() : array {
public static function providerEntityWithTerms() : array {
return [
'query without depth' => [
[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Drupal\Tests\thunder_gqls\Kernel\DataProducer;

use Drupal\node\NodeInterface;
use Drupal\Tests\graphql\Kernel\GraphQLTestBase;
use Drupal\node\Entity\Node;
use Drupal\node\Entity\NodeType;
Expand All @@ -13,6 +14,13 @@
*/
class EntityLinksTest extends GraphQLTestBase {

/**
* The node entity.
*
* @var \Drupal\node\Entity\Node
*/
protected NodeInterface $node;

/**
* {@inheritdoc}
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,19 @@ class DecoratableTypeResolverTest extends GraphQLTestBase {
*/
public function setUp(): void {
parent::setUp();
$this->resolver = $this->getMockForAbstractClass(DecoratableTypeResolver::class, [NULL]);
$this->resolver = $this->getMockBuilder(DecoratableTypeResolver::class)
->setConstructorArgs([NULL])
->onlyMethods(['resolve'])
->getMock();
$this->resolver->method('resolve')
->willReturnCallback(function ($object) {
return ucfirst($object->bundle());
});

$this->decoratedResolver = $this->getMockForAbstractClass(DecoratableTypeResolver::class, [$this->resolver]);
$this->decoratedResolver = $this->getMockBuilder(DecoratableTypeResolver::class)
->setConstructorArgs([$this->resolver])
->onlyMethods(['resolve'])
->getMock();
$this->decoratedResolver->method('resolve')
->willReturnCallback(function ($object) {
if ($object->bundle(
Expand Down
2 changes: 1 addition & 1 deletion modules/thunder_gqls/thunder_gqls.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ package: Thunder Optional
dependencies:
- graphql:graphql
- drupal:node
core_version_requirement: ^10
core_version_requirement: ^11
2 changes: 1 addition & 1 deletion modules/thunder_ivw/thunder_ivw.info.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Thunder IVW'
description: 'Enable your site to track page views for the german Information Community for the Assessment of the Circulation of Media.'
type: module
core_version_requirement: ^10
core_version_requirement: ^11
package: Thunder Optional
dependencies:
- ivw_integration:ivw_integration
2 changes: 1 addition & 1 deletion modules/thunder_media/thunder_media.info.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Thunder Media'
description: 'Provides media bundles for thunder.'
type: module
core_version_requirement: ^10
core_version_requirement: ^11
dependencies:
- drupal:image
package: Thunder
Expand Down
2 changes: 1 addition & 1 deletion modules/thunder_news_article/thunder_news_article.info.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Thunder News Article'
description: 'Provide News Article content type for Thunder.'
type: module
core_version_requirement: ^10
core_version_requirement: ^11
package: Thunder
dependencies:
- drupal:node
2 changes: 1 addition & 1 deletion modules/thunder_paragraphs/thunder_paragraphs.info.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'Thunder Paragraphs'
description: 'Provide paragaphs functions for Thunder.'
type: module
core_version_requirement: ^10
core_version_requirement: ^11
package: Thunder
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Thunder Paragraphs Paste'
description: 'Add paste area to the article content type to easily import text from other sources.'
type: module
core_version_requirement: ^10
core_version_requirement: ^11
package: Thunder Optional
dependencies:
- paragraphs_paste:paragraphs_paste
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Thunder Password Policy'
description: 'Full integration for more sophisticated password policies.'
type: module
core_version_requirement: ^10
core_version_requirement: ^11
package: Thunder Optional
dependencies:
- password_policy:password_policy
Expand Down
2 changes: 1 addition & 1 deletion modules/thunder_search/thunder_search.info.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Thunder Search API'
description: 'Integrates with the Search API module'
type: module
core_version_requirement: ^10
core_version_requirement: ^11
package: Thunder Optional
dependencies:
- search_api:search_api_db
Expand Down
2 changes: 1 addition & 1 deletion modules/thunder_taxonomy/thunder_taxonomy.info.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Thunder Taxonomy'
description: 'Provide taxonomy functions for Thunder.'
type: module
core_version_requirement: ^10
core_version_requirement: ^11
package: Thunder
dependencies:
- drupal:taxonomy
2 changes: 1 addition & 1 deletion modules/thunder_translation/thunder_translation.info.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Thunder Translation'
description: 'Enable your editors to translate your content in multiple languages.'
type: module
core_version_requirement: ^10
core_version_requirement: ^11
package: Thunder Optional
dependencies:
- drupal:content_translation
2 changes: 1 addition & 1 deletion modules/thunder_vgwort/thunder_vgwort.info.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Thunder VG Wort integration
type: module
description: 'VG Wort integration for the Thunder distribution.'
core_version_requirement: ^10
core_version_requirement: ^11
package: Thunder Optional
dependencies:
- vgwort:vgwort
2 changes: 1 addition & 1 deletion modules/thunder_workflow/thunder_workflow.info.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Thunder Workflow'
description: 'Get an advanced content creation workflow with scheduling functionality.'
type: module
core_version_requirement: ^10
core_version_requirement: ^11
package: Thunder Optional
dependencies:
- drupal:content_moderation
Expand Down
2 changes: 1 addition & 1 deletion modules/thunder_xymatic/thunder_xymatic.info.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Thunder Xymatic integration
type: module
description: 'Xymatic integration for the Thunder distribution.'
core_version_requirement: ^10
core_version_requirement: ^11
package: Thunder Optional
dependencies:
- xymatic:xymatic
Loading
Loading