Raise dependencies

- PHP >= 8.1 - Composer >= 2 Remove module dependencies for http_client_retry and redis, move them to scaffold projects Code cleanup

Raise dependencies
43b7cc62 · jurgenhaas · edc615c7 · 43b7cc62 · 43b7cc62 · 43b7cc62
Commit 43b7cc62 authored 1 year ago by jurgenhaas
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,6 +12,3 @@ indent_size = 2
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-
-[{composer.json,composer.lock}]
-indent_size = 4
--- a/composer.json
+++ b/composer.json
 {
-    "name": "lakedrops/behat4drupal",
-    "description": "Composer Plugin to prepare Drupal project for Behat tests.",
-    "type": "composer-plugin",
-    "keywords": [
-        "Drupal",
-        "Development",
-        "Docker",
-        "Behat"
-    ],
-    "homepage": "https://gitlab.lakedrops.com/composer/plugin/behat4drupal",
-    "license": "GPL-2.0-or-later",
-    "authors": [
-        {
-            "name": "Jürgen Haas",
-            "email": "juergen.haas@lakedrops.com",
-            "homepage": "https://www.lakedrops.com",
-            "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/"
+  "name": "lakedrops/behat4drupal",
+  "description": "Composer Plugin to prepare Drupal project for Behat tests.",
+  "type": "composer-plugin",
+  "keywords": [
+    "Drupal",
+    "Development",
+    "Docker",
+    "Behat"
+  ],
+  "homepage": "https://gitlab.lakedrops.com/composer/plugin/behat4drupal",
+  "license": "GPL-2.0-or-later",
+  "authors": [
+    {
+      "name": "Jürgen Haas",
+      "email": "juergen.haas@lakedrops.com",
+      "homepage": "https://www.lakedrops.com",
+      "role": "Drupal Expert"
    },
-    "require": {
-        "php": ">=7.4",
-        "behat/behat": "^3.12",
-        "behat/mink": "^1.10",
-        "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"
+    {
+      "name": "Daniel Speicher",
+      "email": "daniel.speicher@lakedrops.com",
+      "homepage": "https://www.lakedrops.com",
+      "role": "Drupal Expert"
    },
-    "require-dev": {
-        "composer/composer": "^1||^2",
-        "drupal/coder": "^8.3",
-        "phpunit/phpunit": "^9.5",
-        "roave/security-advisories": "dev-master",
-        "squizlabs/php_codesniffer": "^3.7"
-    },
-    "config": {
-        "allow-plugins": {
-            "lakedrops/docker4drupal": false,
-            "dealerdirect/phpcodesniffer-composer-installer": true,
-            "lakedrops/ahoy": false
-        }
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "autoload": {
-        "psr-4": {
-            "LakeDrops\\Behat4Drupal\\": "src/"
-        }
-    },
-    "extra": {
-        "class": "LakeDrops\\Behat4Drupal\\Plugin"
+    {
+      "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/"
+  },
+  "repositories": [
+    {
+      "type": "composer",
+      "url": "https://packages.drupal.org/8"
+    }
+  ],
+  "require": {
+    "php": ">=8.1",
+    "behat/behat": "^3.12",
+    "behat/mink": "^1.10",
+    "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"
+  }
 }
--- a/src/CommandProvider.php
+++ b/src/CommandProvider.php
@@ -3,14 +3,16 @@
 namespace LakeDrops\Behat4Drupal;

 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 {

  /**
-   * Retrieves an array of commands
-   *
-   * @return BaseCommand[]
+   * {@inheritdoc}
   */
  public function getCommands(): array {
    return [

--- a/src/Handler.php
+++ b/src/Handler.php
@@ -8,7 +8,7 @@ use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Yaml\Yaml;

 /**
- * Class Handler.
+ * Handler class to setup Drupal projects for Behat tests.
 *
 * @package LakeDrops\Behat4Drupal
 */
@@ -31,9 +31,9 @@ class Handler extends BaseHandler {
    $webserver = $d4dConfig->readValue('webserver');

    $options = [
-        'projectname' => $projectname,
-        'urlprefix' => '',
-      ];
+      'projectname' => $projectname,
+      'urlprefix' => '',
+    ];

    $options['baseurl'] = empty($options['global']) ?
      $webserver['type'] :
@@ -48,7 +48,7 @@ class Handler extends BaseHandler {
   * @param bool $overwrite
   *   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.
    if (!$this->isDevMode() && !$this->isCiContext()) {
      return;
@@ -76,7 +76,7 @@ class Handler extends BaseHandler {
        $extraOptions = $this->config->readValue($filename);
        if (!empty($def['add2yaml']) && $extraOptions !== NULL) {
          $yaml = Yaml::parse($rendered);
-          /** @noinspection SlowArrayOperationsInLoopInspection */
+          /* @noinspection SlowArrayOperationsInLoopInspection */
          $yaml = array_merge_recursive($yaml, $extraOptions);
          $rendered = Yaml::dump($yaml, 9, 2);
        }

--- a/src/Plugin.php
+++ b/src/Plugin.php
@@ -2,6 +2,7 @@

 namespace LakeDrops\Behat4Drupal;

+use Composer\Plugin\Capability\CommandProvider as ComposerCommandProvider;
 use Composer\Script\Event;
 use Composer\Script\ScriptEvents;
 use LakeDrops\Component\Composer\BasePlugin;
@@ -23,7 +24,7 @@ class Plugin extends BasePlugin {
   */
  public function getCapabilities(): array {
    return [
-      \Composer\Plugin\Capability\CommandProvider::class => CommandProvider::class,
+      ComposerCommandProvider::class => CommandProvider::class,
    ];
  }


--- a/src/UpdateCommand.php
+++ b/src/UpdateCommand.php
@@ -6,6 +6,11 @@ use LakeDrops\Component\Composer\BaseCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;

+/**
+ * Composer Update Command for Behat for Drupal.
+ *
+ * @package LakeDrops\Behat4Drupal
+ */
 class UpdateCommand extends BaseCommand {

  /**