From c4ddba186c5446fcd3011c00a30c3b7b05a2bcbc Mon Sep 17 00:00:00 2001
From: Claudiu Cristea <clau.cristea@gmail.com>
Date: Wed, 8 Jan 2025 12:54:06 +0200
Subject: [PATCH 1/5] Update ddev/ddev-drupal-contrib
---
.ddev/addon-metadata/ddev-drupal-contrib/manifest.yaml | 4 ++--
.ddev/commands/web/eslint | 4 ++--
.ddev/commands/web/expand-composer-json | 7 +++++++
.ddev/commands/web/phpcbf | 2 +-
.ddev/commands/web/phpcs | 2 +-
.ddev/commands/web/phpstan | 1 -
.ddev/commands/web/stylelint | 8 +++++---
.ddev/config.contrib.yaml | 5 +++--
8 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/.ddev/addon-metadata/ddev-drupal-contrib/manifest.yaml b/.ddev/addon-metadata/ddev-drupal-contrib/manifest.yaml
index 2d5ec6e..ed050e8 100644
--- a/.ddev/addon-metadata/ddev-drupal-contrib/manifest.yaml
+++ b/.ddev/addon-metadata/ddev-drupal-contrib/manifest.yaml
@@ -1,7 +1,7 @@
name: ddev-drupal-contrib
repository: ddev/ddev-drupal-contrib
-version: 1.0.0-rc22
-install_date: "2024-11-12T16:30:11Z"
+version: 1.0.0-rc23
+install_date: "2025-01-08T12:51:57+02:00"
project_files:
- commands/web/eslint
- commands/web/expand-composer-json
diff --git a/.ddev/commands/web/eslint b/.ddev/commands/web/eslint
index bef2335..fb663f6 100755
--- a/.ddev/commands/web/eslint
+++ b/.ddev/commands/web/eslint
@@ -13,8 +13,8 @@ if "$DDEV_DOCROOT/core/node_modules/.bin/eslint" --version >/dev/null ; then
test -e .prettierignore || echo '*.yml' > .prettierignore
# Change directory to the project root folder
cd "$DDEV_DOCROOT/modules/custom/${DDEV_SITENAME//-/_}" || exit
- "$DDEV_COMPOSER_ROOT/$DDEV_DOCROOT/core/node_modules/.bin/eslint" --no-error-on-unmatched-pattern --ignore-pattern="*.es6.js" --resolve-plugins-relative-to=$DDEV_COMPOSER_ROOT/$DDEV_DOCROOT/core --ext=.js,.yml . "$@"
+ "$DDEV_COMPOSER_ROOT/$DDEV_DOCROOT/core/node_modules/.bin/eslint" --config="../../../core/.eslintrc.passing.json" --no-error-on-unmatched-pattern --ignore-pattern="*.es6.js" --resolve-plugins-relative-to=$DDEV_COMPOSER_ROOT/$DDEV_DOCROOT/core --ext=.js,.yml . "$@"
else
- echo "eslint is not available. You may need to 'ddev yarn --cwd $DDEV_DOCROOT/core install'"
+ echo "eslint is not available. You may need to 'ddev exec \"cd $DDEV_DOCROOT/core && yarn install\"'"
exit 1
fi
diff --git a/.ddev/commands/web/expand-composer-json b/.ddev/commands/web/expand-composer-json
index d24d8a0..48a8840 100755
--- a/.ddev/commands/web/expand-composer-json
+++ b/.ddev/commands/web/expand-composer-json
@@ -10,5 +10,12 @@
export _WEB_ROOT=$DDEV_DOCROOT
cd "$DDEV_COMPOSER_ROOT" || exit
curl -OL https://git.drupalcode.org/project/gitlab_templates/-/raw/default-ref/scripts/expand_composer_json.php
+if [[ ! -f composer.json ]]; then
+ echo "{}" > composer.json
+ _ddev_drupal_contrib_empty_composer=true
+fi
php expand_composer_json.php "$DDEV_SITENAME"
rm -f expand_composer_json.php
+if [ "$_ddev_drupal_contrib_empty_composer" = true ]; then
+ rm -f composer.json
+fi
diff --git a/.ddev/commands/web/phpcbf b/.ddev/commands/web/phpcbf
index 9c1013c..756d2b4 100755
--- a/.ddev/commands/web/phpcbf
+++ b/.ddev/commands/web/phpcbf
@@ -12,4 +12,4 @@ if ! command -v phpcbf >/dev/null; then
exit 1
fi
test -e phpcs.xml.dist || curl -OL https://git.drupalcode.org/project/gitlab_templates/-/raw/default-ref/assets/phpcs.xml.dist
-phpcbf -s --report-full --report-summary --report-source web/modules/custom "$@"
+phpcbf -s --report-full --report-summary --report-source $DDEV_DOCROOT/modules/custom "$@"
diff --git a/.ddev/commands/web/phpcs b/.ddev/commands/web/phpcs
index 6728886..5df1fa9 100755
--- a/.ddev/commands/web/phpcs
+++ b/.ddev/commands/web/phpcs
@@ -12,4 +12,4 @@ if ! command -v phpcs >/dev/null; then
exit 1
fi
test -e phpcs.xml.dist || curl -OL https://git.drupalcode.org/project/gitlab_templates/-/raw/default-ref/assets/phpcs.xml.dist
-phpcs -s --report-full --report-summary --report-source web/modules/custom --ignore=*/.ddev/* "$@"
+phpcs -s --report-full --report-summary --report-source $DDEV_DOCROOT/modules/custom --ignore=*/.ddev/* "$@"
diff --git a/.ddev/commands/web/phpstan b/.ddev/commands/web/phpstan
index ae151f6..01fa27d 100755
--- a/.ddev/commands/web/phpstan
+++ b/.ddev/commands/web/phpstan
@@ -5,7 +5,6 @@
## Description: Run phpstan inside the web container
## Usage: phpstan [flags] [args]
## Example: "ddev phpstan" or "ddev phpstan -n"
-## ProjectTypes: drupal,drupal8,drupal9,drupal10
## ExecRaw: true
if ! command -v phpstan >/dev/null; then
diff --git a/.ddev/commands/web/stylelint b/.ddev/commands/web/stylelint
index d7d43f4..99d082c 100755
--- a/.ddev/commands/web/stylelint
+++ b/.ddev/commands/web/stylelint
@@ -7,9 +7,11 @@
## Example: "ddev stylelint"
## ExecRaw: true
-if yarn --cwd "$DDEV_DOCROOT/core" stylelint --version >/dev/null ; then
- yarn --color --cwd "$DDEV_DOCROOT/core" --config ./.stylelintrc.json stylelint ../modules/custom/**/*.css "$@"
+if $DDEV_DOCROOT/core/node_modules/.bin/stylelint --version >/dev/null ; then
+ # Change directory to the project root folder
+ cd "$DDEV_DOCROOT/modules/custom/${DDEV_SITENAME//-/_}" || exit
+ "$DDEV_COMPOSER_ROOT/$DDEV_DOCROOT/core/node_modules/.bin/stylelint" --color --config "$DDEV_COMPOSER_ROOT/$DDEV_DOCROOT/core/.stylelintrc.json" "./**/*.css" "$@"
else
- echo "stylelint is not available. You may need to 'ddev yarn --cwd $DDEV_DOCROOT/core install'"
+ echo "stylelint is not available. You may need to 'ddev exec \"cd $DDEV_DOCROOT/core && yarn install\"'"
exit 1
fi
diff --git a/.ddev/config.contrib.yaml b/.ddev/config.contrib.yaml
index aa78389..e9e7b24 100644
--- a/.ddev/config.contrib.yaml
+++ b/.ddev/config.contrib.yaml
@@ -1,8 +1,9 @@
#ddev-generated
## Command provided by https://github.com/ddev/ddev-drupal-contrib
web_environment:
- # If desired, override to a different version of Drupal core in via the project's DDEV config
- - DRUPAL_CORE=^10
+ # To change the Drupal core version, see the README:
+ # https://github.com/ddev/ddev-drupal-contrib/blob/main/README.md#changing-the-drupal-core-version
+ - DRUPAL_CORE=^11
- SIMPLETEST_DB=mysql://db:db@db/db
- SIMPLETEST_BASE_URL=http://web
- BROWSERTEST_OUTPUT_DIRECTORY=/tmp
--
GitLab
From 14bb526bd484871de2b9410a3928f4d739838339 Mon Sep 17 00:00:00 2001
From: Claudiu Cristea <clau.cristea@gmail.com>
Date: Wed, 8 Jan 2025 12:55:35 +0200
Subject: [PATCH 2/5] Anticipate
https://github.com/ddev/ddev-drupal-contrib/pull/99
---
.ddev/commands/web/phpstan | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.ddev/commands/web/phpstan b/.ddev/commands/web/phpstan
index 01fa27d..7c73132 100755
--- a/.ddev/commands/web/phpstan
+++ b/.ddev/commands/web/phpstan
@@ -12,6 +12,8 @@ if ! command -v phpstan >/dev/null; then
exit 1
fi
test -e phpstan.neon || curl -OL https://git.drupalcode.org/project/gitlab_templates/-/raw/default-ref/assets/phpstan.neon
+# See https://git.drupalcode.org/project/gitlab_templates/-/commit/a107b7f1f79af12e0b09f70be47b68e3f69b4504
+sed -i 's/BASELINE_PLACEHOLDER/phpstan-baseline.neon/g' phpstan.neon
# Add an empty baseline file to ensure it exists.
test -e phpstan-baseline.neon || touch phpstan-baseline.neon
phpstan analyse $DDEV_DOCROOT/modules/custom "$@"
--
GitLab
From 7d48dadbe215d676f64f786d9aaa2c811730ab0a Mon Sep 17 00:00:00 2001
From: Claudiu Cristea <clau.cristea@gmail.com>
Date: Wed, 8 Jan 2025 12:57:18 +0200
Subject: [PATCH 3/5] Ignore recipes/ dir
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index 297bccc..5d1c5d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,6 @@
/phpcs.xml.dist
/phpstan-baseline.neon
/phpstan.neon
+/recipes/
/vendor/
/web/
--
GitLab
From 093240ad86c7ded117839beb5a7084888f13ae85 Mon Sep 17 00:00:00 2001
From: Claudiu Cristea <clau.cristea@gmail.com>
Date: Wed, 8 Jan 2025 13:02:55 +0200
Subject: [PATCH 4/5] CSpell addition
---
.cspell-project-words.txt | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.cspell-project-words.txt b/.cspell-project-words.txt
index 809f089..20263a5 100644
--- a/.cspell-project-words.txt
+++ b/.cspell-project-words.txt
@@ -12,3 +12,6 @@ triplestore
# UK style
serialise
Serialiser
+
+# DB schema
+varchar
--
GitLab
From 66b2f6399df7fd90e2a2249632066e430a29de68 Mon Sep 17 00:00:00 2001
From: Claudiu Cristea <clau.cristea@gmail.com>
Date: Wed, 8 Jan 2025 13:03:31 +0200
Subject: [PATCH 5/5] PHPStan new check
---
...ncSynchronization.php => RdfSyncSynchronizationTest.php} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename tests/src/Kernel/{RdfSyncSynchronization.php => RdfSyncSynchronizationTest.php} (95%)
diff --git a/tests/src/Kernel/RdfSyncSynchronization.php b/tests/src/Kernel/RdfSyncSynchronizationTest.php
similarity index 95%
rename from tests/src/Kernel/RdfSyncSynchronization.php
rename to tests/src/Kernel/RdfSyncSynchronizationTest.php
index e35640c..7185d52 100644
--- a/tests/src/Kernel/RdfSyncSynchronization.php
+++ b/tests/src/Kernel/RdfSyncSynchronizationTest.php
@@ -10,10 +10,10 @@ use Drupal\Tests\rdf_sync\Traits\RdfSyncTestingDataTrait;
use Drupal\rdf_sync\Model\SyncMethod;
/**
- * @covers \Drupal\rdf_sync\RdfSyncSynchronizer
+ * @coversDefaultClass \Drupal\rdf_sync\RdfSyncSynchronizer
* @group rdf_sync
*/
-class RdfSyncSynchronization extends KernelTestBase {
+class RdfSyncSynchronizationTest extends KernelTestBase {
use RdfSyncTestingDataTrait;
use RdfSyncTestTrait;
@@ -51,7 +51,7 @@ class RdfSyncSynchronization extends KernelTestBase {
}
/**
- * @covers
+ * @covers ::synchronize
* @dataProvider providerConnectorTestCases
*
* @param string $connectorId
--
GitLab