Merge pull request #29 from antistatique/feature/phpunit-fix

fix phpunit Drupal 9.5 Schema errors for views.view.profiles

Author: WengerK

.cspell-project-words.txt

@@ -42,3 +42,4 @@ wapmorgan
 wengerk
 ZRNRFI
 ZRNRFP
+multilanguage

.github/workflows/ci.yml

@@ -12,20 +12,29 @@ jobs:
 
     strategy:
       matrix:
-        drupal_version: ['9.5', '10.3', '10.4']
+        drupal_version: ['10.3', '10.4', '11.0', '11.1']
         module: ['commerce_trustedshops']
         experimental: [ false ]
-        # include:
-        #   - drupal_version: '11.0'
-        #     module: 'commerce_trustedshops'
-        #     experimental: true
+        include:
+          - drupal_version: '10.5'
+            module: 'commerce_trustedshops'
+            experimental: true
+          - drupal_version: '11.2'
+            module: 'commerce_trustedshops'
+            experimental: true
 
     steps:
       - uses: actions/checkout@v4
       - run: docker compose -f docker-compose.yml pull --include-deps drupal
       - name: Build the docker compose stack
         run: docker compose -f docker-compose.yml build --pull --build-arg BASE_IMAGE_TAG=${{ matrix.drupal_version }} drupal
         continue-on-error: ${{ matrix.experimental }}
+      - name: Up a persistent Docker Container
+        run: docker compose -f docker-compose.yml up -d drupal
+      - name: wait on Docker to be ready, especially Apache that takes many seconds to be up
+        run: docker compose exec -T drupal wait-for-it drupal:80 -t 60
+      - name: wait on Docker to be ready, especially MariaDB that takes many seconds to be up
+        run: docker compose exec -T drupal wait-for-it db:3306 -t 60
       - name: Run unit tests
         run: docker compose -f docker-compose.yml run -u www-data drupal phpunit --no-coverage --group=${{ matrix.module }} --exclude-group=${{ matrix.module }}_functional --configuration=/var/www/html/phpunit.xml
         continue-on-error: ${{ matrix.experimental }}
@@ -37,21 +46,24 @@ jobs:
 
     strategy:
       matrix:
-        drupal_version: ['9.5', '10.3', '10.4']
+        drupal_version: ['10.3', '10.4', '11.0', '11.1']
         module: [ 'commerce_trustedshops' ]
-        experimental: [ false ]
-        # include:
-        #   - drupal_version: '11.0'
-        #     module: 'commerce_trustedshops'
-        #     experimental: true
+        experimental: [false]
+        include:
+          - drupal_version: '10.5'
+            module: 'commerce_trustedshops'
+            experimental: true
+          - drupal_version: '11.2'
+            module: 'commerce_trustedshops'
+            experimental: true
 
     steps:
       - uses: actions/checkout@v4
       - run: docker compose -f docker-compose.yml pull --include-deps drupal
       - name: Build the docker compose stack
         run: docker compose -f docker-compose.yml build --pull --build-arg BASE_IMAGE_TAG=${{ matrix.drupal_version }} drupal
         continue-on-error: ${{ matrix.experimental }}
-      - name: Up a persistant Docker Container
+      - name: Up a persistent Docker Container
         run: docker compose -f docker-compose.yml up -d drupal
       - name: wait on Docker to be ready, especially Apache that takes many seconds to be up
         run: docker compose exec -T drupal wait-for-it drupal:80 -t 60
@@ -71,7 +83,7 @@ jobs:
 
     strategy:
       matrix:
-        drupal_version: ['10.3']
+        drupal_version: ['10.4']
         module: ['commerce_trustedshops']
 
     steps:
@@ -89,8 +101,6 @@ jobs:
         run: docker compose -f docker-compose.yml exec -T -u www-data drupal drush site-install standard --db-url="mysql://drupal:drupal@db/drupal" -y
       - name: Enable upgrade status
         run: docker compose exec -T drupal wait-for-it db:3306 -- ./vendor/bin/drush en upgrade_status -y
-      - name: Disable incompatible module
-        run: docker compose exec -T drupal wait-for-it db:3306 -- ./vendor/bin/drush pmu page_cache -y
       - name: Enable the module
         run: docker compose exec -T drupal wait-for-it db:3306 -- ./vendor/bin/drush en ${{ matrix.module }} -y
       - name: Run upgrade status

.gitlab-ci.yml

@@ -32,19 +32,19 @@ variables:
   SKIP_ESLINT: '1'
   # Opt in to testing current minor against max supported PHP version.
   OPT_IN_TEST_MAX_PHP: '1'
-  # Opt in to testing previous & next minor (Drupal 10.0.x and 10.3.x).
+  # Opt in to testing previous minor (Drupal 11.0.x).
   OPT_IN_TEST_PREVIOUS_MINOR: '1'
+  # Opt in to testing next minor (Drupal 11.2.x).
   OPT_IN_TEST_NEXT_MINOR: '1'
 
-  # Opt out to testing $CORE_PREVIOUS_MAJOR (currently Drupal 9.5).
-  # Uncomment to opt in.
-  # OPT_IN_TEST_PREVIOUS_MAJOR: '1'
+  # Opt in to testing $CORE_PREVIOUS_MAJOR (currently Drupal 10.4).
+  OPT_IN_TEST_PREVIOUS_MAJOR: '1'
 
   # The 3.x branch of the module requires PHP >=8.1, rather than core's >=7.4.
   CORE_PREVIOUS_PHP_MIN: '8.1'
 
-  # Opt out to testing $CORE_MAJOR_DEVELOPMENT (currently Drupal 11).
-  # OPT_IN_TEST_NEXT_MAJOR: '1'
+  # Opt in to testing $CORE_MAJOR_DEVELOPMENT (currently Drupal 11).
+  OPT_IN_TEST_NEXT_MAJOR: '1'
 
 # This module wants to strictly comply with Drupal's coding standards.
 phpcs:

CHANGELOG.md

@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- add official support of drupal 10.4
+- add official support of drupal 11.1
+
 ### Security
 - update antistatique/trustedshops-php-sdk (1.0.0 => 1.1.0)
 
@@ -16,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 - drop testing on Drupal 10.0, 10.1 & 10.2
+- drop support of Drupal 9.5
 
 ## [3.0.1] - 2024-06-25
 ### Removed

CONTRIBUTING.md

@@ -33,7 +33,7 @@ globally on your environment:
 
 Once run, you will be able to access to your fresh installed Drupal on `localhost::8888`.
 
-    docker compose build --pull --build-arg BASE_IMAGE_TAG=10.1 drupal
+    docker compose build --pull --build-arg BASE_IMAGE_TAG=10.4 drupal
     (get a coffee, this will take some time...)
     docker compose up -d drupal
     docker compose exec -u www-data drupal drush site-install standard --db-url="mysql://drupal:drupal@db/drupal" -y

Dockerfile

@@ -1,4 +1,4 @@
-ARG BASE_IMAGE_TAG=10.1
+ARG BASE_IMAGE_TAG=10.4
 FROM wengerk/drupal-for-contrib:${BASE_IMAGE_TAG}
 
 # Drupal Commerce 2.20+ requires bcmath extensions.
@@ -10,7 +10,7 @@ ENV COMPOSER_MEMORY_LIMIT=-1
 ENV SYMFONY_DEPRECATIONS_HELPER=disabled
 
 # Install Drupal Commerce as required by the module
-RUN composer require drupal/commerce:^2.39 'drupal/inline_entity_form:^1.0@RC'
+RUN composer require "drupal/commerce:^2.39||^3.0" 'drupal/inline_entity_form:^1.0@RC||^3.0@RC'
 
 # Install the TrustedShops PHP SDK as required by the module
 RUN composer require antistatique/trustedshops-php-sdk:^1.0.0

README.md

@@ -48,6 +48,7 @@ Commerce TrustedShops is available for both Drupal 8 & Drupal 9 & Drupal 10 !
 |    8.8.x    | 2.x                   | 2.8             |
 |     9.x     | 2.x                   | 2.33            |
 |    10.x     | 3.x                   | 2.33            |
+|    11.x     | 3.x                   | 3.0             |
 
 ## Dependencies
 

commerce_trustedshops.info.yml

@@ -2,7 +2,7 @@ name: Commerce TrustedShops
 description: 'Provides Commerce integration for TrustedShops.'
 package: 'Commerce (contrib)'
 type: module
-core_version_requirement: ^9.5 || ^10 || ^11
+core_version_requirement: ^10 || ^11
 
 dependencies:
   - drupal:commerce

tests/src/Functional/InviteReviewMultilanguageTest.php

@@ -39,15 +39,14 @@ class InviteReviewMultilanguageTest extends OrderBrowserTestBase {
    * @var array
    */
   protected static $modules = [
-    'locale',
     'language',
     'commerce_trustedshops',
   ];
 
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'starterkit_theme';
+  protected $defaultTheme = 'stark';
 
   /**
    * {@inheritdoc}

tests/src/Functional/InviteReviewTest.php

@@ -41,7 +41,7 @@ class InviteReviewTest extends OrderBrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'starterkit_theme';
+  protected $defaultTheme = 'stark';
 
   /**
    * {@inheritdoc}

tests/src/Functional/ShopAdminTest.php

@@ -27,7 +27,7 @@ class ShopAdminTest extends CommerceBrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'starterkit_theme';
+  protected $defaultTheme = 'stark';
 
   /**
    * {@inheritdoc}

tests/src/Kernel/DefaultShopResolverTest.php

@@ -130,7 +130,7 @@ public function testResolve($store_id, LanguageInterface $language, $expected_sh
    * @return array
    *   An array of each store/language variation.
    */
-  public function providerDefaultShopAndLanguage() {
+  public static function providerDefaultShopAndLanguage() {
     return [
       [1, new Language(['id' => 'en']), 1,
         'R9H9J8ETR1PBFYZ1564ODXCII6EU9ZRNRFI8SC',

tests/src/Unit/Resolver/ChainOrderLanguageResolverTest.php

@@ -36,7 +36,7 @@ public function setUp(): void {
    *
    * @covers ::addResolver
    * @covers ::getResolvers
-   * @covers ::resolve.
+   * @covers ::resolve
    */
   public function testResolver() {
     $container = new ContainerBuilder();

tests/src/Unit/Resolver/ChainShopResolverTest.php

@@ -34,7 +34,7 @@ public function setUp(): void {
    *
    * @covers ::addResolver
    * @covers ::getResolvers
-   * @covers ::resolve.
+   * @covers ::resolve
    */
   public function testResolver() {
     $container = new ContainerBuilder();