Commit 03f326ba authored by Fabian Bircher's avatar Fabian Bircher
Browse files

Issue #3284552 by bircher, benjifisher: Drupal 10 compatibility

parent 688bdb96

.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
@@ -19,3 +19,9 @@ docker-compose.override.yml 


# ignore patches for easier contrib workflow

*.patch

/composer.spoons.json

/composer.spoons.lock

/.env

.envrc

.envrc.local

.composer-plugin.env

.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 .docker ! -name .spoons ! -name .idea -print | while read file; do ln -s "$file" .; done';

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

    $process->mustRun();

  }



}

.travis.yml

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
language: minimal



services:

  - docker



jobs:

  include:

    - env: DRUPAL_VERSION=8.8

    - env: DRUPAL_VERSION=9



before_script:

  - docker-compose up -d

  - docker-compose run -u root drupal composer require drupal/core-recommended $DRUPAL_VERSION

  - docker-compose run -u root drupal composer si



script:

  # This is also run by grumphp, but running it individually gives more output on travis

  - docker-compose run drupal composer phpcs

  - docker-compose run drupal composer lint

  # The phpunit 8 compatibility wants to write to the sites/simpletest folder

  - docker-compose run -u root drupal composer unit

  - docker-compose run -u root drupal composer phpstan



notifications:

  email: false