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

Raise dependencies 

- PHP >= 8.1
- Composer >= 2
Remove module dependencies for http_client_retry and redis, move them to scaffold projects
Code cleanup
parent edc615c7
No related branches found
No related tags found
1 merge request!4Merging develop into main [MINOR_VERSION]
Hide whitespace changes
Inline Side-by-side
.editorconfig
+ 0
− 3
View file @ 43b7cc62
...@@ -12,6 +12,3 @@ indent_size = 2 ...@@ -12,6 +12,3 @@ indent_size = 2
charset = utf-8 charset = utf-8
trim_trailing_whitespace = true trim_trailing_whitespace = true
insert_final_newline = true insert_final_newline = true
[{composer.json,composer.lock}]
indent_size = 4
composer.json
+ 75
− 69
View file @ 43b7cc62
{ {
"name": "lakedrops/behat4drupal", "name": "lakedrops/behat4drupal",
"description": "Composer Plugin to prepare Drupal project for Behat tests.", "description": "Composer Plugin to prepare Drupal project for Behat tests.",
"type": "composer-plugin", "type": "composer-plugin",
"keywords": [ "keywords": [
"Drupal", "Drupal",
"Development", "Development",
"Docker", "Docker",
"Behat" "Behat"
], ],
"homepage": "https://gitlab.lakedrops.com/composer/plugin/behat4drupal", "homepage": "https://gitlab.lakedrops.com/composer/plugin/behat4drupal",
"license": "GPL-2.0-or-later", "license": "GPL-2.0-or-later",
"authors": [ "authors": [
{ {
"name": "Jürgen Haas", "name": "Jürgen Haas",
"email": "juergen.haas@lakedrops.com", "email": "juergen.haas@lakedrops.com",
"homepage": "https://www.lakedrops.com", "homepage": "https://www.lakedrops.com",
"role": "Drupal Expert" "role": "Drupal Expert"
},
{
"name": "Daniel Speicher",
"email": "daniel.speicher@lakedrops.com",
"homepage": "https://www.lakedrops.com",
"role": "Drupal Expert"
},
{
"name": "Richard Papp",
"email": "richard.papp@lakedrops.com",
"homepage": "https://www.lakedrops.com",
"role": "Drupal Expert"
}
],
"support": {
"issues": "https://gitlab.lakedrops.com/composer/plugin/behat4drupal/issues",
"source": "https://gitlab.lakedrops.com/composer/plugin/behat4drupal/tree/main",
"docs": "https://devops-tools.docs.lakedrops.com/composer/plugin/b4d/"
}, },
"require": { {
"php": ">=7.4", "name": "Daniel Speicher",
"behat/behat": "^3.12", "email": "daniel.speicher@lakedrops.com",
"behat/mink": "^1.10", "homepage": "https://www.lakedrops.com",
"behat/mink-goutte-driver": "^1.3||^2.0", "role": "Drupal Expert"
"behat/mink-selenium2-driver": "^1.6",
"composer-plugin-api": "^1||^2",
"drupal/drupal-extension": "^3.4||^4.1||^5.0",
"drush-ops/behat-drush-endpoint": "^9.4",
"lakedrops/composer-json-utils": "^2.4||dev-develop",
"lakedrops/docker4drupal": "^3.8||dev-develop"
}, },
"require-dev": { {
"composer/composer": "^1||^2", "name": "Richard Papp",
"drupal/coder": "^8.3", "email": "richard.papp@lakedrops.com",
"phpunit/phpunit": "^9.5", "homepage": "https://www.lakedrops.com",
"roave/security-advisories": "dev-master", "role": "Drupal Expert"
"squizlabs/php_codesniffer": "^3.7" }
}, ],
"config": { "support": {
"allow-plugins": { "issues": "https://gitlab.lakedrops.com/composer/plugin/behat4drupal/issues",
"lakedrops/docker4drupal": false, "source": "https://gitlab.lakedrops.com/composer/plugin/behat4drupal/tree/main",
"dealerdirect/phpcodesniffer-composer-installer": true, "docs": "https://devops-tools.docs.lakedrops.com/composer/plugin/b4d/"
"lakedrops/ahoy": false },
} "repositories": [
}, {
"minimum-stability": "dev", "type": "composer",
"prefer-stable": true, "url": "https://packages.drupal.org/8"
"autoload": { }
"psr-4": { ],
"LakeDrops\\Behat4Drupal\\": "src/" "require": {
} "php": ">=8.1",
}, "behat/behat": "^3.12",
"extra": { "behat/mink": "^1.10",
"class": "LakeDrops\\Behat4Drupal\\Plugin" "behat/mink-goutte-driver": "^1.3||^2.0",
"behat/mink-selenium2-driver": "^1.6",
"composer-plugin-api": "^1||^2",
"drupal/drupal-extension": "^3.4||^4.1||^5.0",
"drush-ops/behat-drush-endpoint": "^9.4",
"lakedrops/composer-json-utils": "^2.4||dev-develop",
"lakedrops/docker4drupal": "^3.8||dev-develop"
},
"require-dev": {
"composer/composer": "^2",
"lakedrops/drupal-development-environment": "^3.2||dev-develop",
"roave/security-advisories": "dev-latest"
},
"config": {
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true,
"drupal/core-composer-scaffold": false,
"lakedrops/*": false,
"php-http/discovery": false,
"phpstan/extension-installer": true
}
},
"minimum-stability": "dev",
"prefer-stable": true,
"autoload": {
"psr-4": {
"LakeDrops\\Behat4Drupal\\": "src/"
} }
},
"extra": {
"class": "LakeDrops\\Behat4Drupal\\Plugin"
}
} }
src/CommandProvider.php
+ 6
− 4
View file @ 43b7cc62
...@@ -3,14 +3,16 @@ ...@@ -3,14 +3,16 @@
namespace LakeDrops\Behat4Drupal; namespace LakeDrops\Behat4Drupal;
use Composer\Plugin\Capability\CommandProvider as CommandProviderCapability; use Composer\Plugin\Capability\CommandProvider as CommandProviderCapability;
use Composer\Command\BaseCommand;
/**
* Composer Command Provider for Behat for Drupal.
*
* @package LakeDrops\Behat4Drupal
*/
class CommandProvider implements CommandProviderCapability { class CommandProvider implements CommandProviderCapability {
/** /**
* Retrieves an array of commands * {@inheritdoc}
*
* @return BaseCommand[]
*/ */
public function getCommands(): array { public function getCommands(): array {
return [ return [
......
src/Handler.php
+ 6
− 6
View file @ 43b7cc62
...@@ -8,7 +8,7 @@ use Symfony\Component\Filesystem\Filesystem; ...@@ -8,7 +8,7 @@ use Symfony\Component\Filesystem\Filesystem;
use Symfony\Component\Yaml\Yaml; use Symfony\Component\Yaml\Yaml;
/** /**
* Class Handler. * Handler class to setup Drupal projects for Behat tests.
* *
* @package LakeDrops\Behat4Drupal * @package LakeDrops\Behat4Drupal
*/ */
...@@ -31,9 +31,9 @@ class Handler extends BaseHandler { ...@@ -31,9 +31,9 @@ class Handler extends BaseHandler {
$webserver = $d4dConfig->readValue('webserver'); $webserver = $d4dConfig->readValue('webserver');
$options = [ $options = [
'projectname' => $projectname, 'projectname' => $projectname,
'urlprefix' => '', 'urlprefix' => '',
]; ];
$options['baseurl'] = empty($options['global']) ? $options['baseurl'] = empty($options['global']) ?
$webserver['type'] : $webserver['type'] :
...@@ -48,7 +48,7 @@ class Handler extends BaseHandler { ...@@ -48,7 +48,7 @@ class Handler extends BaseHandler {
* @param bool $overwrite * @param bool $overwrite
* Whether to overwrite existing config files. * Whether to overwrite existing config files.
*/ */
public function configureProject($overwrite = FALSE): void { public function configureProject(bool $overwrite = FALSE): void {
// We only do the fancy stuff for developers and for CI. // We only do the fancy stuff for developers and for CI.
if (!$this->isDevMode() && !$this->isCiContext()) { if (!$this->isDevMode() && !$this->isCiContext()) {
return; return;
...@@ -76,7 +76,7 @@ class Handler extends BaseHandler { ...@@ -76,7 +76,7 @@ class Handler extends BaseHandler {
$extraOptions = $this->config->readValue($filename); $extraOptions = $this->config->readValue($filename);
if (!empty($def['add2yaml']) && $extraOptions !== NULL) { if (!empty($def['add2yaml']) && $extraOptions !== NULL) {
$yaml = Yaml::parse($rendered); $yaml = Yaml::parse($rendered);
/** @noinspection SlowArrayOperationsInLoopInspection */ /* @noinspection SlowArrayOperationsInLoopInspection */
$yaml = array_merge_recursive($yaml, $extraOptions); $yaml = array_merge_recursive($yaml, $extraOptions);
$rendered = Yaml::dump($yaml, 9, 2); $rendered = Yaml::dump($yaml, 9, 2);
} }
......
src/Plugin.php
+ 2
− 1
View file @ 43b7cc62
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
namespace LakeDrops\Behat4Drupal; namespace LakeDrops\Behat4Drupal;
use Composer\Plugin\Capability\CommandProvider as ComposerCommandProvider;
use Composer\Script\Event; use Composer\Script\Event;
use Composer\Script\ScriptEvents; use Composer\Script\ScriptEvents;
use LakeDrops\Component\Composer\BasePlugin; use LakeDrops\Component\Composer\BasePlugin;
...@@ -23,7 +24,7 @@ class Plugin extends BasePlugin { ...@@ -23,7 +24,7 @@ class Plugin extends BasePlugin {
*/ */
public function getCapabilities(): array { public function getCapabilities(): array {
return [ return [
\Composer\Plugin\Capability\CommandProvider::class => CommandProvider::class, ComposerCommandProvider::class => CommandProvider::class,
]; ];
} }
......
src/UpdateCommand.php
+ 5
− 0
View file @ 43b7cc62
...@@ -6,6 +6,11 @@ use LakeDrops\Component\Composer\BaseCommand; ...@@ -6,6 +6,11 @@ use LakeDrops\Component\Composer\BaseCommand;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
/**
* Composer Update Command for Behat for Drupal.
*
* @package LakeDrops\Behat4Drupal
*/
class UpdateCommand extends BaseCommand { class UpdateCommand extends BaseCommand {
/** /**
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment