Commit f62809a1 authored by Fabian Bircher's avatar Fabian Bircher
Browse files

Issue #3293759 by bircher, balintpekker, benjifisher: Drupal 10 compatibility

parent fdfc65be

.gitattributes

+0 −3
Original line number Diff line number Diff line
@@ -62,13 +62,10 @@ 


# Config Split settings for preventing scaffolding assets from being packaged.

.docker/ export-ignore

.spoons/ export-ignore

.docker-relay.yml export-ignore

.env.dist export-ignore

.gitattributes export-ignore

.gitignore export-ignore

.travis.yml export-ignore

composer.dev.json export-ignore

docker-compose.yml export-ignore

grumphp.yml export-ignore

phpcs.xml.dist export-ignore

.gitignore

+6 −0
Original line number Diff line number Diff line
@@ -18,3 +18,9 @@ docker-compose.override.yml 


# ignore patches for easier contrib workflow

*.patch

/.env

.envrc

.envrc.local

.composer-plugin.env

/composer.spoons.json

/composer.spoons.lock

.gitlab-ci.yml

0 → 100644
+2 −0
Original line number Diff line number Diff line 
include:

  - remote: 'https://gitlab.com/drupalspoons/composer-plugin/-/raw/2.9.7/templates/.gitlab-ci.yml'

.spoons/ScriptHandler.php

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
<?php



namespace Spoons;



use Composer\Script\Event;

use Symfony\Component\Process\Process;



/**

 * A Composer script handler.

 */

class ScriptHandler {



  /**

   * Create a web/modules/[SLUG] dir and symlink all project files into it.

   *

   * @param \Composer\Script\Event $event

   *   A Composer package event.

   */

  public static function createSymlinks(Event $event) {

    $full_name = $event->getComposer()->getPackage()->getName();

    [, $project_name] = explode('/', $full_name);

    $cmd = "rm -rf web/modules/custom/$project_name && mkdir -p web/modules/custom/$project_name";

    $process = new Process($cmd);

    $process->mustRun();

    $cmd = 'find ../../../.. -maxdepth 1 ! -name .git ! -name web ! -name vendor ! -name .idea -print | while read file; do ln -s "$file" .; done';

    $process = new Process($cmd, "web/modules/custom/$project_name");

    $process->mustRun();

  }



}

composer.dev.json

deleted100644 → 0
+0 −65
Original line number Diff line number Diff line 
{

  "name": "drupal/config_split",

  "type": "drupal-module",

  "description": "The dev composer file for Config Split. This allows us to use docker for development but still test on the drupal infrastructure.",

  "license": "GPL-2.0-or-later",

  "require": {

    "drupal/config_filter": "^1"

  },

  "require-dev": {

    "composer/installers": "^1",

    "cweagans/composer-patches": "~1.0",

    "drupal/core-composer-scaffold": "^8.8||^9",

    "drupal/core-recommended": "^8.8||^9",

    "drupal/core-dev": "^8.8||^9",

    "drush/drush": "^10",

    "mglaman/phpstan-drupal": "^0.12",

    "phpstan/phpstan-deprecation-rules": "^0.12",

    "php-parallel-lint/php-parallel-lint": "^1.2",

    "zaporylie/composer-drupal-optimizations": "^1.0",

    "phpro/grumphp-shim": "^0.20.0",

    "drupal/chosen": "^3.0",

    "drupal/select2_all": "^1.0"

  },

  "repositories": {

    "drupal": {

      "type": "composer",

      "url": "https://packages.drupal.org/8"

    }

  },

  "config": {

  	"process-timeout": 36000

  },

  "minimum-stability": "dev",

  "prefer-stable": true,

  "autoload": {

    "classmap": [".spoons/ScriptHandler.php"]

  },

  "scripts": {

    "webserver": "cd web && php -S 0.0.0.0:8888 .ht.router.php",

    "si": "drush si -v --db-url=${SIMPLETEST_DB:-mysql://root:password@mariadb/db}",

    "phpcs": "phpcs --runtime-set ignore_warnings_on_exit 1 --runtime-set ignore_errors_on_exit 1 web/modules/custom",

    "lint": "parallel-lint --exclude web --exclude vendor .",

    "unit": "phpunit --verbose",

    "phpstan": "phpstan analyse",

    "post-update-cmd": ["Spoons\\ScriptHandler::createSymlinks"]

  },

  "extra": {

    "installer-paths": {

      "web/core": ["type:drupal-core"],

      "web/libraries/{$name}": ["type:drupal-library"],

      "web/modules/contrib/{$name}": ["type:drupal-module"],

      "web/profiles/{$name}": ["type:drupal-profile"],

      "web/themes/{$name}": ["type:drupal-theme"],

      "drush/{$name}": ["type:drupal-drush"]

    },

    "drupal-scaffold": {

      "file-mapping": {

        "[project-root]/.gitattributes": false

      },

      "locations": {

        "web-root": "web/"

      }

    }

  }

}