Merge branch 'develop' into 'main'

Merging develop into main See merge request !15

Merge branch 'develop' into 'main'
9c416913 · jurgenhaas · b168afb0 · 380a88df · 9c416913 · 9c416913
Commit 9c416913 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/drupal-development-environment",
-    "description": "Composer Plugin for Drupal Development Environments",
-    "type": "composer-plugin",
-    "keywords": [
-        "Drupal",
-        "Development",
-        "Install",
-        "Update"
-    ],
-    "homepage": "https://gitlab.lakedrops.com/composer/plugin/drupal-development-environment",
-    "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/drupal-development-environment/issues",
-        "source": "https://gitlab.lakedrops.com/composer/plugin/drupal-development-environment/tree/main",
-        "docs": "https://devops-tools.docs.lakedrops.com/composer/plugin/drupal-dev-environment/"
+  "name": "lakedrops/drupal-development-environment",
+  "description": "Composer Plugin for Drupal Development Environments",
+  "type": "composer-plugin",
+  "keywords": [
+    "Drupal",
+    "Development",
+    "Install",
+    "Update"
+  ],
+  "homepage": "https://gitlab.lakedrops.com/composer/plugin/drupal-development-environment",
+  "license": "GPL-2.0-or-later",
+  "authors": [
+    {
+      "name": "Jürgen Haas",
+      "email": "juergen.haas@lakedrops.com",
+      "homepage": "https://www.lakedrops.com",
+      "role": "Drupal Expert"
    },
-    "repositories": [
-        {
-            "type": "composer",
-            "url": "https://packages.drupal.org/8"
-        }
-    ],
-    "require": {
-        "php": ">=7.4",
-        "composer-plugin-api": "^1||^2",
-        "dealerdirect/phpcodesniffer-composer-installer": "*",
-        "dpi/dogit": "*",
-        "drupal-code-builder/drupal-code-builder-drush": "*",
-        "drupal/coder": "*",
-        "drupal/core": "*",
-        "drupal/core-composer-scaffold": "*",
-        "drupal/devel": "*",
-        "drupal/webprofiler": "*",
-        "lakedrops/ahoy": "*",
-        "lakedrops/behat4drupal": "*",
-        "lakedrops/composer-json-utils": "*",
-        "lakedrops/docker4drupal": "*",
-        "lakedrops/dorgflow": "*",
-        "lakedrops/drupal-environment": "*",
-        "mglaman/phpstan-drupal": "*",
-        "mikey179/vfsstream": "*",
-        "php-parallel-lint/php-parallel-lint": "*",
-        "phpmd/phpmd": "*",
-        "phpmetrics/phpmetrics": "*",
-        "phpspec/prophecy": "*",
-        "phpspec/prophecy-phpunit": "*",
-        "phpstan/extension-installer": "*",
-        "phpstan/phpstan-deprecation-rules": "*",
-        "phpunit/phpunit": "*",
-        "squizlabs/php_codesniffer": "*",
-        "symfony/css-selector": "*",
-        "symfony/phpunit-bridge": "*"
+    {
+      "name": "Daniel Speicher",
+      "email": "daniel.speicher@lakedrops.com",
+      "homepage": "https://www.lakedrops.com",
+      "role": "Drupal Expert"
    },
-    "require-dev": {
-        "composer/composer": "^1||^2",
-        "roave/security-advisories": "dev-latest"
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "autoload": {
-        "psr-4": {
-            "LakeDrops\\DrupalDevelopmentEnvironment\\": "src/"
-        }
-    },
-    "extra": {
-        "class": "LakeDrops\\DrupalDevelopmentEnvironment\\Plugin"
-    },
-    "config": {
-        "allow-plugins": {
-            "dealerdirect/phpcodesniffer-composer-installer": true,
-            "drupal/core-composer-scaffold": false,
-            "lakedrops/ahoy": false,
-            "lakedrops/behat4drupal": false,
-            "lakedrops/dorgflow": false,
-            "lakedrops/drupal-environment": false,
-            "lakedrops/docker4drupal": false
-        }
+    {
+      "name": "Richard Papp",
+      "email": "richard.papp@lakedrops.com",
+      "homepage": "https://www.lakedrops.com",
+      "role": "Drupal Expert"
+    }
+  ],
+  "support": {
+    "issues": "https://gitlab.lakedrops.com/composer/plugin/drupal-development-environment/issues",
+    "source": "https://gitlab.lakedrops.com/composer/plugin/drupal-development-environment/tree/main",
+    "docs": "https://devops-tools.docs.lakedrops.com/composer/plugin/drupal-dev-environment/"
+  },
+  "repositories": [
+    {
+      "type": "composer",
+      "url": "https://packages.drupal.org/8"
+    }
+  ],
+  "require": {
+    "php": ">=8.1",
+    "composer-plugin-api": "^2",
+    "dealerdirect/phpcodesniffer-composer-installer": "*",
+    "drupal-code-builder/drupal-code-builder-drush": "*",
+    "drupal/coder": "*",
+    "drupal/core": "*",
+    "drupal/core-composer-scaffold": "*",
+    "drupal/devel": "*",
+    "drupal/schema_diff": "*",
+    "drupal/webprofiler": "*",
+    "lakedrops/ahoy": "*",
+    "lakedrops/behat4drupal": "*",
+    "lakedrops/composer-json-utils": "*",
+    "lakedrops/docker4drupal": "*",
+    "lakedrops/dorgflow": "*",
+    "lakedrops/drupal-environment": "*",
+    "mglaman/phpstan-drupal": "*",
+    "mikey179/vfsstream": "*",
+    "php-parallel-lint/php-parallel-lint": "*",
+    "phpmd/phpmd": "*",
+    "phpmetrics/phpmetrics": "^2.8",
+    "phpspec/prophecy": "*",
+    "phpspec/prophecy-phpunit": "*",
+    "phpstan/extension-installer": "*",
+    "phpstan/phpstan-deprecation-rules": "*",
+    "phpunit/phpunit": "*",
+    "squizlabs/php_codesniffer": "*",
+    "symfony/css-selector": "*",
+    "symfony/phpunit-bridge": "*"
+  },
+  "require-dev": {
+    "composer/composer": "^2",
+    "roave/security-advisories": "dev-latest"
+  },
+  "minimum-stability": "dev",
+  "prefer-stable": true,
+  "autoload": {
+    "psr-4": {
+      "LakeDrops\\DrupalDevelopmentEnvironment\\": "src/"
+    }
+  },
+  "extra": {
+    "class": "LakeDrops\\DrupalDevelopmentEnvironment\\Plugin"
+  },
+  "config": {
+    "allow-plugins": {
+      "dealerdirect/phpcodesniffer-composer-installer": true,
+      "drupal/core-composer-scaffold": false,
+      "lakedrops/*": false,
+      "php-http/discovery": false,
+      "phpstan/extension-installer": true
    }
+  }
 }
--- a/src/CommandProvider.php
+++ b/src/CommandProvider.php
@@ -5,7 +5,7 @@ namespace LakeDrops\DrupalDevelopmentEnvironment;
 use Composer\Plugin\Capability\CommandProvider as CommandProviderCapability;

 /**
- * Class CommandProvider.
+ * Composer Command Provider for LakeDrops drupal development environments.
 *
 * @package LakeDrops\DrupalDevelopmentEnvironment
 */

--- a/src/Handler.php
+++ b/src/Handler.php
@@ -2,14 +2,13 @@

 namespace LakeDrops\DrupalDevelopmentEnvironment;

-use Exception;
 use LakeDrops\Component\Composer\BaseHandler;
 use LakeDrops\Docker4Drupal\Handler as D4D;
 use LakeDrops\DrupalEnvironment\Handler as DrupalEnvironment;
 use Symfony\Component\Filesystem\Filesystem;

 /**
- * Class Handler.
+ * Handler class to setup LakeDrops tool based Drupal development environments.
 *
 * @package LakeDrops\Drupal8ScaffoldDeveloper
 */
@@ -27,8 +26,14 @@ class Handler extends BaseHandler {
   */
  protected function configDefault(): array {
    $config = (new D4D($this->composer, $this->io))->getConfig();
-    $domain = $config->readValue('projectname') . '.' . $config->readValue(['traefik', 'domain']);
-    if (!$config->readValue(['traefik', 'usessl']) && $config->readValue(['traefik', 'port']) !== '80') {
+    $domain = $config->readValue('projectname') . '.' . $config->readValue([
+      'traefik',
+      'domain',
+    ]);
+    if (!$config->readValue([
+      'traefik',
+      'usessl',
+    ]) && $config->readValue(['traefik', 'port']) !== '80') {
      $domain .= ':' . $config->readValue(['traefik', 'port']);
    }
    return [
@@ -53,6 +58,9 @@ class Handler extends BaseHandler {
    $installationManager = $this->composer->getInstallationManager();

    $drupalCorePackage = $this->getDrupalCorePackage();
+    if ($drupalCorePackage === NULL) {
+      return;
+    }
    $corePath = $installationManager->getInstallPath($drupalCorePackage);

    // Directory where the root project is being created.
@@ -64,10 +72,10 @@ class Handler extends BaseHandler {

    // Create contrib/custom dirs for modules, profiles and themes.
    foreach ([
-               $webRoot . '/modules',
-               $webRoot . '/profiles',
-               $webRoot . '/themes',
-             ] as $dir) {
+      $webRoot . '/modules',
+      $webRoot . '/profiles',
+      $webRoot . '/themes',
+    ] as $dir) {
      foreach (['contrib', 'custom'] as $subdir) {
        $path = $dir . '/' . $subdir;
        if (!$fs->exists($path)) {
@@ -81,9 +89,9 @@ class Handler extends BaseHandler {

    // Create and protect config, settings and files directories.
    foreach ([
-               'config/default/sync',
-               'tests',
-             ] as $dir) {
+      'config/default/sync',
+      'tests',
+    ] as $dir) {
      $path = $projectRoot . '/' . $dir;
      if (!$fs->exists($path)) {
        $fs->mkdir($path);
@@ -110,7 +118,7 @@ class Handler extends BaseHandler {
        $this->git('add *');
        $this->git('commit -m "Initial commit"');
      }
-      catch (Exception $ex) {
+      catch (\Exception) {
        // We're ignoring this for now.
      }
    }

--- a/src/Plugin.php
+++ b/src/Plugin.php
@@ -20,7 +20,7 @@ class Plugin extends BasePlugin {
   *
   * @var \Drupal\Composer\Plugin\Scaffold\Handler
   */
-  protected $scaffoldHandler;
+  protected DrupalScaffoldHandler $scaffoldHandler;

  /**
   * {@inheritdoc}

--- a/src/ScaffoldCommand.php
+++ b/src/ScaffoldCommand.php
@@ -7,7 +7,7 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;

 /**
- * Class ScaffoldCommand.
+ * Composer Scaffold Command for LakeDrops Drupal development environments.
 *
 * @package LakeDrops\DrupalDevelopmentEnvironment
 */