diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d06804671fb3de6d0c25fba46e1c5a3975ba9050..1d234297765c87ae1bd91b78b1c00083d4047fc0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ include: - - project: 'gitlab-ci-cd/composer-packages' + - project: 'gitlab-ci-cd/drupal' ref: main - file: '/composer-packages.yml' + file: '/private-modules.yml' diff --git a/composer.json b/composer.json index 540721323dc08497663bd71f0372a45e068cd502..cf3fe7a0084def187ec5471ded8d98b7e45c2d51 100644 --- a/composer.json +++ b/composer.json @@ -45,17 +45,20 @@ "ext-json": "*", "composer-plugin-api": "^2", "henrywhitaker3/healthchecks-io": "^1.0", - "lakedrops/ahoy": "^1.7||dev-develop", - "lakedrops/composer-json-utils": "^2.4||dev-develop", - "lakedrops/docker-traefik": "^3.2||dev-develop" + "lakedrops/ahoy": "^1.8||dev-develop", + "lakedrops/composer-json-utils": "^2.5||dev-develop", + "lakedrops/docker-traefik": "^3.3||dev-develop" }, "require-dev": { "composer/composer": "^2", - "lakedrops/drupal-development-environment": "^3.2||dev-develop", + "lakedrops/drupal-environment": "^3.2||dev-develop", "roave/security-advisories": "dev-latest" }, - "minimum-stability": "dev", - "prefer-stable": true, + "config": { + "allow-plugins": { + "lakedrops/*": false + } + }, "autoload": { "psr-4": { "LakeDrops\\Docker4Drupal\\": "src/" @@ -63,14 +66,5 @@ }, "extra": { "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 - } } } diff --git a/phpstan.neon b/phpstan.neon new file mode 100644 index 0000000000000000000000000000000000000000..c5956cc9781bb549914ef8a7677cffa489922261 --- /dev/null +++ b/phpstan.neon @@ -0,0 +1,5 @@ +parameters: + level: 6 + checkMissingIterableValueType: false + checkGenericClassInNonGenericObjectType: false + treatPhpDocTypesAsCertain: false diff --git a/src/Handler.php b/src/Handler.php index 002e2010adfcbd17559f5353412271e9dd59df77..141531419e7caea8cc5fa37a5c1b8c629f0ee237 100644 --- a/src/Handler.php +++ b/src/Handler.php @@ -523,7 +523,7 @@ class Handler extends BaseHandler { $this->gitIgnore('tests/backstop/backstop-script-*'); $this->gitIgnore('tests/backstop/backstop_data/bitmaps_test'); $this->gitIgnore('tests/backstop/backstop_data/html_report'); - $this->gitLFS('tests/backstop/**/*.png'); + $this->gitLfs('tests/backstop/**/*.png'); // Ignore some Cypress directories. $this->gitIgnore('tests/cypress/downloads'); diff --git a/src/Plugin.php b/src/Plugin.php index b47d7b53318b9f66c680d09a3b9848104fe191e2..4a50833c4f02dafc527b8fc983d7aad4ddb01b86 100644 --- a/src/Plugin.php +++ b/src/Plugin.php @@ -46,11 +46,10 @@ class Plugin extends BasePlugin { * The event that triggered the call of this function. */ public function configureProject(Event $event): void { - /** @var Handler $handler */ + /** @var \LakeDrops\Docker4Drupal\Handler $handler */ $handler = $this->handler; - $handler - ->setEvent($event) - ->configureProject(); + $handler->setEvent($event); + $handler->configureProject(); } /** @@ -60,11 +59,10 @@ class Plugin extends BasePlugin { * The event that triggered the call of this function. */ public function updateProject(Event $event): void { - /** @var Handler $handler */ + /** @var \LakeDrops\Docker4Drupal\Handler $handler */ $handler = $this->handler; - $handler - ->setEvent($event) - ->updateProject(); + $handler->setEvent($event); + $handler->updateProject(); } }