From 091cdcc4296891a05e4133c6c998bda586e3e4a8 Mon Sep 17 00:00:00 2001 From: Daniel Bosen Date: Wed, 3 Aug 2022 11:46:47 +0200 Subject: [PATCH 01/13] ctools patch --- composer.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 09f42268f..366ea17af 100644 --- a/composer.json +++ b/composer.json @@ -34,6 +34,9 @@ "extra": { "installer-name": "thunder", "patches": { + "drupal/ctools": { + "[error] Drupal\\Component\\Plugin\\Exception\\ContextException: The context is not a valid context.": "https://www.drupal.org/files/issues/2022-08-02/3300682-43.patch" + }, "drupal/diff": { "Back button for comparison page": "https://www.drupal.org/files/issues/back_button_for-2853193-4.patch", "Deprecated function: strlen(): Passing null to parameter #1 ($string) of type string is deprecated": "https://git.drupalcode.org/project/diff/-/merge_requests/10.diff" @@ -73,7 +76,7 @@ "drupal/config_update": "^1.7", "drupal/content_lock": "^2.1", "drupal/crop": "^2.2", - "drupal/ctools": "^3.4", + "drupal/ctools": "3.10", "drupal/default_content": "^1.0-alpha7||^2.0@ALPHA", "drupal/diff": "1.0", "drupal/dropzonejs": "^2.1", From fe84ac069401722b552b1735ae46cf67aa8ba31f Mon Sep 17 00:00:00 2001 From: Daniel Bosen Date: Wed, 3 Aug 2022 12:23:13 +0200 Subject: [PATCH 02/13] update config --- config/install/editor.editor.basic_html.yml | 4 ---- config/install/editor.editor.full_html.yml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/config/install/editor.editor.basic_html.yml b/config/install/editor.editor.basic_html.yml index 757613007..903af812a 100644 --- a/config/install/editor.editor.basic_html.yml +++ b/config/install/editor.editor.basic_html.yml @@ -39,13 +39,9 @@ settings: items: - Source plugins: - stylescombo: - styles: '' drupallink: linkit_enabled: true linkit_profile: default - language: - language_list: un image_upload: status: true scheme: public diff --git a/config/install/editor.editor.full_html.yml b/config/install/editor.editor.full_html.yml index 938533f48..d6579dbbe 100644 --- a/config/install/editor.editor.full_html.yml +++ b/config/install/editor.editor.full_html.yml @@ -47,13 +47,9 @@ settings: - ShowBlocks - Source plugins: - stylescombo: - styles: '' drupallink: linkit_enabled: true linkit_profile: default - language: - language_list: un image_upload: status: true scheme: public From ca9ab4114d2aafb7bb61512f5d382e8b189aecdd Mon Sep 17 00:00:00 2001 From: Daniel Bosen Date: Wed, 3 Aug 2022 13:39:40 +0200 Subject: [PATCH 03/13] remove ctools --- composer.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/composer.json b/composer.json index 366ea17af..10281a574 100644 --- a/composer.json +++ b/composer.json @@ -34,9 +34,6 @@ "extra": { "installer-name": "thunder", "patches": { - "drupal/ctools": { - "[error] Drupal\\Component\\Plugin\\Exception\\ContextException: The context is not a valid context.": "https://www.drupal.org/files/issues/2022-08-02/3300682-43.patch" - }, "drupal/diff": { "Back button for comparison page": "https://www.drupal.org/files/issues/back_button_for-2853193-4.patch", "Deprecated function: strlen(): Passing null to parameter #1 ($string) of type string is deprecated": "https://git.drupalcode.org/project/diff/-/merge_requests/10.diff" @@ -76,7 +73,6 @@ "drupal/config_update": "^1.7", "drupal/content_lock": "^2.1", "drupal/crop": "^2.2", - "drupal/ctools": "3.10", "drupal/default_content": "^1.0-alpha7||^2.0@ALPHA", "drupal/diff": "1.0", "drupal/dropzonejs": "^2.1", From 85a574f666cc8b6e67ff163fb55dc38319a2ea42 Mon Sep 17 00:00:00 2001 From: Daniel Bosen Date: Wed, 3 Aug 2022 13:41:14 +0200 Subject: [PATCH 04/13] get patched ctools back --- composer.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/composer.json b/composer.json index 10281a574..366ea17af 100644 --- a/composer.json +++ b/composer.json @@ -34,6 +34,9 @@ "extra": { "installer-name": "thunder", "patches": { + "drupal/ctools": { + "[error] Drupal\\Component\\Plugin\\Exception\\ContextException: The context is not a valid context.": "https://www.drupal.org/files/issues/2022-08-02/3300682-43.patch" + }, "drupal/diff": { "Back button for comparison page": "https://www.drupal.org/files/issues/back_button_for-2853193-4.patch", "Deprecated function: strlen(): Passing null to parameter #1 ($string) of type string is deprecated": "https://git.drupalcode.org/project/diff/-/merge_requests/10.diff" @@ -73,6 +76,7 @@ "drupal/config_update": "^1.7", "drupal/content_lock": "^2.1", "drupal/crop": "^2.2", + "drupal/ctools": "3.10", "drupal/default_content": "^1.0-alpha7||^2.0@ALPHA", "drupal/diff": "1.0", "drupal/dropzonejs": "^2.1", From b575f315b23601653209f512034f10a195245e4d Mon Sep 17 00:00:00 2001 From: Daniel Bosen Date: Wed, 3 Aug 2022 13:42:31 +0200 Subject: [PATCH 05/13] empty From 96b3302a98f9f06020c863cc15ef6d222f5a45f2 Mon Sep 17 00:00:00 2001 From: Daniel Bosen Date: Wed, 3 Aug 2022 14:00:04 +0200 Subject: [PATCH 06/13] alternate fix --- composer.json | 4 ---- config/optional/pathauto.pattern.article.yml | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 366ea17af..10281a574 100644 --- a/composer.json +++ b/composer.json @@ -34,9 +34,6 @@ "extra": { "installer-name": "thunder", "patches": { - "drupal/ctools": { - "[error] Drupal\\Component\\Plugin\\Exception\\ContextException: The context is not a valid context.": "https://www.drupal.org/files/issues/2022-08-02/3300682-43.patch" - }, "drupal/diff": { "Back button for comparison page": "https://www.drupal.org/files/issues/back_button_for-2853193-4.patch", "Deprecated function: strlen(): Passing null to parameter #1 ($string) of type string is deprecated": "https://git.drupalcode.org/project/diff/-/merge_requests/10.diff" @@ -76,7 +73,6 @@ "drupal/config_update": "^1.7", "drupal/content_lock": "^2.1", "drupal/crop": "^2.2", - "drupal/ctools": "3.10", "drupal/default_content": "^1.0-alpha7||^2.0@ALPHA", "drupal/diff": "1.0", "drupal/dropzonejs": "^2.1", diff --git a/config/optional/pathauto.pattern.article.yml b/config/optional/pathauto.pattern.article.yml index ab0d223ae..cb51de190 100644 --- a/config/optional/pathauto.pattern.article.yml +++ b/config/optional/pathauto.pattern.article.yml @@ -9,7 +9,7 @@ type: 'canonical_entities:node' pattern: '[node:field_seo_title]' selection_criteria: 3dade791-a55f-4114-9fba-4b38c8f572f7: - id: node_type + id: entity_bundle:node negate: false uuid: 3dade791-a55f-4114-9fba-4b38c8f572f7 context_mapping: From f1eee090b24241a0b11bdfc0a9fdece8a964c309 Mon Sep 17 00:00:00 2001 From: Daniel Bosen Date: Wed, 3 Aug 2022 14:21:42 +0200 Subject: [PATCH 07/13] empty From 70d044eeee56bcc4469642d6c1369d6835d55810 Mon Sep 17 00:00:00 2001 From: Daniel Bosen Date: Wed, 3 Aug 2022 14:22:29 +0200 Subject: [PATCH 08/13] quote --- config/optional/pathauto.pattern.article.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/optional/pathauto.pattern.article.yml b/config/optional/pathauto.pattern.article.yml index cb51de190..cb9a77f53 100644 --- a/config/optional/pathauto.pattern.article.yml +++ b/config/optional/pathauto.pattern.article.yml @@ -9,7 +9,7 @@ type: 'canonical_entities:node' pattern: '[node:field_seo_title]' selection_criteria: 3dade791-a55f-4114-9fba-4b38c8f572f7: - id: entity_bundle:node + id: 'entity_bundle:node' negate: false uuid: 3dade791-a55f-4114-9fba-4b38c8f572f7 context_mapping: From 64a917daf77129d6a8bb168c0ac105ead63a70b9 Mon Sep 17 00:00:00 2001 From: Daniel Bosen Date: Wed, 3 Aug 2022 14:33:18 +0200 Subject: [PATCH 09/13] require d9 compatible and security fixed min version of ctools --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 10281a574..54b1fee5e 100644 --- a/composer.json +++ b/composer.json @@ -73,6 +73,7 @@ "drupal/config_update": "^1.7", "drupal/content_lock": "^2.1", "drupal/crop": "^2.2", + "drupal/ctools": "^3.6", "drupal/default_content": "^1.0-alpha7||^2.0@ALPHA", "drupal/diff": "1.0", "drupal/dropzonejs": "^2.1", From 40cb436310ba077a2dfcb3e5b46608c063b62f50 Mon Sep 17 00:00:00 2001 From: Daniel Bosen Date: Wed, 3 Aug 2022 15:17:53 +0200 Subject: [PATCH 10/13] Add code coverage report --- .github/workflows/tests.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 996d2fad7..f82f87086 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -19,10 +19,10 @@ env: DRUPAL_TESTING_TEST_PROFILE: thunder DRUPAL_TESTING_HTTP_PORT: 8888 DRUPAL_TESTING_VERBOSE: false - DRUPAL_TESTING_VERSION: "^1.0.36" + DRUPAL_TESTING_VERSION: "dev-code-coverage" THUNDER_ADMIN_BRANCH: 4.x PHPSTAN_MEMORY_LIMIT: 4G - DRUPAL_TESTING_PARALLEL_TESTING: true + DRUPAL_TESTING_PARALLEL_TESTING: false SIMPLETEST_BASE_URL: http://thunder-testing:8888 SKIP_TEST_CLEANUP: true @@ -121,7 +121,7 @@ jobs: fail-fast: false matrix: PHP_VERSION: [ '7.4', '8.1' ] - CHUNK: [ 1, 2, 3 ] + #CHUNK: [ 1, 2, 3 ] steps: - uses: actions/checkout@v1 @@ -130,7 +130,7 @@ jobs: with: coverage: none php-version: ${{ matrix.PHP_VERSION }} - extensions: :sodium, Imagick, gd, PDO, mysql, pdo_mysql, mbstring, xmlwriter, pdo, date, dom, filter, hash, json, pcre, session, SimpleXML, SPL, tokenizer, xml, curl + extensions: :sodium, Imagick, gd, PDO, mysql, pdo_mysql, mbstring, xmlwriter, pdo, date, dom, filter, hash, json, pcre, session, SimpleXML, SPL, tokenizer, xml, curl, pcov - name: Add host run: echo "127.0.0.1 thunder-testing" | sudo tee -a /etc/hosts @@ -161,9 +161,18 @@ jobs: - name: Run tests run: test-drupal-project run_tests env: - THUNDER_TEST_CHUNK: ${{ matrix.CHUNK }} + #THUNDER_TEST_CHUNK: ${{ matrix.CHUNK }} DRUPAL_TESTING_TEST_PATH: /tmp/test/thunder/install/docroot/profiles/contrib/thunder/tests/src/TestSuites/ThunderTestSuite.php + - name: Zip code coverage + run: cd /tmp; tar cfz coverage-${{ matrix.PHP_VERSION }}.tgz coverage; mv coverage-${{ matrix.PHP_VERSION }}.tgz ${GITHUB_WORKSPACE} + + - name: Upload build + uses: actions/upload-artifact@v2 + with: + name: coverage-${{ matrix.PHP_VERSION }} + path: coverage-${{ matrix.PHP_VERSION }}.tgz + test-upgrade: runs-on: ubuntu-20.04 From 4548356da7eab290d61ebb1d199e053b99173390 Mon Sep 17 00:00:00 2001 From: Daniel Bosen Date: Wed, 3 Aug 2022 17:31:32 +0200 Subject: [PATCH 11/13] tmate --- .github/workflows/tests.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f82f87086..26635b8b6 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -20,6 +20,7 @@ env: DRUPAL_TESTING_HTTP_PORT: 8888 DRUPAL_TESTING_VERBOSE: false DRUPAL_TESTING_VERSION: "dev-code-coverage" + DRUPAL_TESTING_TEST_FILTER: "EntitiesWithTermTest" THUNDER_ADMIN_BRANCH: 4.x PHPSTAN_MEMORY_LIMIT: 4G DRUPAL_TESTING_PARALLEL_TESTING: false @@ -163,6 +164,9 @@ jobs: env: #THUNDER_TEST_CHUNK: ${{ matrix.CHUNK }} DRUPAL_TESTING_TEST_PATH: /tmp/test/thunder/install/docroot/profiles/contrib/thunder/tests/src/TestSuites/ThunderTestSuite.php + # Start a debug session. + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 - name: Zip code coverage run: cd /tmp; tar cfz coverage-${{ matrix.PHP_VERSION }}.tgz coverage; mv coverage-${{ matrix.PHP_VERSION }}.tgz ${GITHUB_WORKSPACE} From 61e184068a3f61bd9470d29c8e92fbd38a42cf58 Mon Sep 17 00:00:00 2001 From: Daniel Bosen Date: Wed, 3 Aug 2022 17:33:44 +0200 Subject: [PATCH 12/13] tmate --- .github/workflows/tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 26635b8b6..e564e56fd 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -164,9 +164,10 @@ jobs: env: #THUNDER_TEST_CHUNK: ${{ matrix.CHUNK }} DRUPAL_TESTING_TEST_PATH: /tmp/test/thunder/install/docroot/profiles/contrib/thunder/tests/src/TestSuites/ThunderTestSuite.php + # Start a debug session. - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 + uses: mxschmitt/action-tmate@v3 - name: Zip code coverage run: cd /tmp; tar cfz coverage-${{ matrix.PHP_VERSION }}.tgz coverage; mv coverage-${{ matrix.PHP_VERSION }}.tgz ${GITHUB_WORKSPACE} From 5be0c7805cc99f471855c77cdac01f092fe508ca Mon Sep 17 00:00:00 2001 From: Daniel Bosen Date: Thu, 4 Aug 2022 10:32:26 +0200 Subject: [PATCH 13/13] empty