Skip to content
Snippets Groups Projects
Commit b87e40bd authored by jurgenhaas's avatar jurgenhaas
Browse files

Merge remote-tracking branch 'origin/develop' into develop

parents c01362b2 3f383c76
No related branches found
No related tags found
1 merge request!89Merging develop into main
Pipeline #1172451 passed with warnings
include: include:
- project: 'gitlab-ci-cd/composer-packages' - project: 'gitlab-ci-cd/drupal'
ref: main ref: main
file: '/composer-packages.yml' file: '/private-modules.yml'
...@@ -45,17 +45,20 @@ ...@@ -45,17 +45,20 @@
"ext-json": "*", "ext-json": "*",
"composer-plugin-api": "^2", "composer-plugin-api": "^2",
"henrywhitaker3/healthchecks-io": "^1.0", "henrywhitaker3/healthchecks-io": "^1.0",
"lakedrops/ahoy": "^1.7||dev-develop", "lakedrops/ahoy": "^1.8||dev-develop",
"lakedrops/composer-json-utils": "^2.4||dev-develop", "lakedrops/composer-json-utils": "^2.5||dev-develop",
"lakedrops/docker-traefik": "^3.2||dev-develop" "lakedrops/docker-traefik": "^3.3||dev-develop"
}, },
"require-dev": { "require-dev": {
"composer/composer": "^2", "composer/composer": "^2",
"lakedrops/drupal-development-environment": "^3.2||dev-develop", "lakedrops/drupal-environment": "^3.2||dev-develop",
"roave/security-advisories": "dev-latest" "roave/security-advisories": "dev-latest"
}, },
"minimum-stability": "dev", "config": {
"prefer-stable": true, "allow-plugins": {
"lakedrops/*": false
}
},
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"LakeDrops\\Docker4Drupal\\": "src/" "LakeDrops\\Docker4Drupal\\": "src/"
...@@ -63,14 +66,5 @@ ...@@ -63,14 +66,5 @@
}, },
"extra": { "extra": {
"class": "LakeDrops\\Docker4Drupal\\Plugin" "class": "LakeDrops\\Docker4Drupal\\Plugin"
},
"config": {
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true,
"drupal/core-composer-scaffold": false,
"lakedrops/*": false,
"php-http/discovery": false,
"phpstan/extension-installer": true
}
} }
} }
parameters:
level: 6
checkMissingIterableValueType: false
checkGenericClassInNonGenericObjectType: false
treatPhpDocTypesAsCertain: false
...@@ -523,7 +523,7 @@ class Handler extends BaseHandler { ...@@ -523,7 +523,7 @@ class Handler extends BaseHandler {
$this->gitIgnore('tests/backstop/backstop-script-*'); $this->gitIgnore('tests/backstop/backstop-script-*');
$this->gitIgnore('tests/backstop/backstop_data/bitmaps_test'); $this->gitIgnore('tests/backstop/backstop_data/bitmaps_test');
$this->gitIgnore('tests/backstop/backstop_data/html_report'); $this->gitIgnore('tests/backstop/backstop_data/html_report');
$this->gitLFS('tests/backstop/**/*.png'); $this->gitLfs('tests/backstop/**/*.png');
// Ignore some Cypress directories. // Ignore some Cypress directories.
$this->gitIgnore('tests/cypress/downloads'); $this->gitIgnore('tests/cypress/downloads');
......
...@@ -46,11 +46,10 @@ class Plugin extends BasePlugin { ...@@ -46,11 +46,10 @@ class Plugin extends BasePlugin {
* The event that triggered the call of this function. * The event that triggered the call of this function.
*/ */
public function configureProject(Event $event): void { public function configureProject(Event $event): void {
/** @var Handler $handler */ /** @var \LakeDrops\Docker4Drupal\Handler $handler */
$handler = $this->handler; $handler = $this->handler;
$handler $handler->setEvent($event);
->setEvent($event) $handler->configureProject();
->configureProject();
} }
/** /**
...@@ -60,11 +59,10 @@ class Plugin extends BasePlugin { ...@@ -60,11 +59,10 @@ class Plugin extends BasePlugin {
* The event that triggered the call of this function. * The event that triggered the call of this function.
*/ */
public function updateProject(Event $event): void { public function updateProject(Event $event): void {
/** @var Handler $handler */ /** @var \LakeDrops\Docker4Drupal\Handler $handler */
$handler = $this->handler; $handler = $this->handler;
$handler $handler->setEvent($event);
->setEvent($event) $handler->updateProject();
->updateProject();
} }
} }
...@@ -9,7 +9,7 @@ sudo apk add --no-cache \ ...@@ -9,7 +9,7 @@ sudo apk add --no-cache \
libx11 \ libx11 \
libxrender \ libxrender \
libxext \ libxext \
libssl1.1 \ libssl3 \
ca-certificates \ ca-certificates \
fontconfig \ fontconfig \
freetype \ freetype \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment