Skip to content

Commit

Permalink
Release (#13)
Browse files Browse the repository at this point in the history
* #11 Drupal 9

* #11 Add DDEV config

* #11 Up CircleCI PHP

* php/issues#880 Add libonig-dev

* Behat/Behat#1216 You need to quote the scalar

* #11 Fix site name

* #11 Re-enable Toolbar to let auth user logout
  • Loading branch information
leymannx committed May 29, 2021
1 parent 0fd88ce commit 49378d6
Show file tree
Hide file tree
Showing 61 changed files with 5,151 additions and 3,125 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Expand Up @@ -10,7 +10,7 @@ jobs:
# @see https://circleci.com/docs/2.0/circleci-images/#php
# The following container already comes with Apache, Node.js and
# chromedriver and geckodriver preinstalled.
- image: circleci/php:7.3-apache-node-browsers
- image: circleci/php:7.4-apache-node-browsers
- image: circleci/mariadb:latest
environment:
- MYSQL_ROOT_HOST=%
Expand All @@ -35,7 +35,7 @@ jobs:
name: Setup tools
command: |
sudo apt-get -qq update && sudo apt-get -qqy upgrade
sudo apt-get -yqq install libpng-dev mariadb-client nano xvfb
sudo apt-get -yqq install libpng-dev libonig-dev mariadb-client nano xvfb
sudo docker-php-ext-install gd mbstring mysqli pdo pdo_mysql
sudo service apache2 restart
Expand Down
180 changes: 180 additions & 0 deletions .ddev/config.yaml
@@ -0,0 +1,180 @@
name: drupal-circleci-behat
type: drupal8
docroot: web
php_version: "7.4"
webserver_type: nginx-fpm
router_http_port: "80"
router_https_port: "443"
xdebug_enabled: false
additional_hostnames: []
additional_fqdns: []
mariadb_version: "10.3"
mysql_version: ""
use_dns_when_possible: true
composer_version: "2"
web_environment: []


# This config.yaml was created with ddev version v1.17.2
# webimage: drud/ddev-webserver:v1.17.2
# dbimage: drud/ddev-dbserver-mariadb-10.3:v1.17.0
# dbaimage: phpmyadmin:5
# However we do not recommend explicitly wiring these images into the
# config.yaml as they may break future versions of ddev.
# You can update this config.yaml using 'ddev config'.

# Key features of ddev's config.yaml:

# name: <projectname> # Name of the project, automatically provides
# http://projectname.ddev.site and https://projectname.ddev.site

# type: <projecttype> # drupal6/7/8, backdrop, typo3, wordpress, php

# docroot: <relative_path> # Relative path to the directory containing index.php.

# php_version: "7.4" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4" "8.0"

# You can explicitly specify the webimage, dbimage, dbaimage lines but this
# is not recommended, as the images are often closely tied to ddev's' behavior,
# so this can break upgrades.

# webimage: <docker_image> # nginx/php docker image.
# dbimage: <docker_image> # mariadb docker image.
# dbaimage: <docker_image>

# mariadb_version and mysql_version
# ddev can use many versions of mariadb and mysql
# However these directives are mutually exclusive
# mariadb_version: 10.2
# mysql_version: 8.0

# router_http_port: <port> # Port to be used for http (defaults to port 80)
# router_https_port: <port> # Port for https (defaults to 443)

# xdebug_enabled: false # Set to true to enable xdebug and "ddev start" or "ddev restart"
# Note that for most people the commands
# "ddev xdebug" to enable xdebug and "ddev xdebug off" to disable it work better,
# as leaving xdebug enabled all the time is a big performance hit.

# webserver_type: nginx-fpm # or apache-fpm

# timezone: Europe/Berlin
# This is the timezone used in the containers and by PHP;
# it can be set to any valid timezone,
# see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
# For example Europe/Dublin or MST7MDT

# composer_version: ""
# if composer_version:"" it will use the current ddev default composer release.
# It can also be set to "1", to get most recent composer v1
# or "2" for most recent composer v2.
# It can be set to any existing specific composer version.
# After first project 'ddev start' this will not be updated until it changes

# additional_hostnames:
# - somename
# - someothername
# would provide http and https URLs for "somename.ddev.site"
# and "someothername.ddev.site".

# additional_fqdns:
# - example.com
# - sub1.example.com
# would provide http and https URLs for "example.com" and "sub1.example.com"
# Please take care with this because it can cause great confusion.

# upload_dir: custom/upload/dir
# would set the destination path for ddev import-files to custom/upload/dir.

# working_dir:
# web: /var/www/html
# db: /home
# would set the default working directory for the web and db services.
# These values specify the destination directory for ddev ssh and the
# directory in which commands passed into ddev exec are run.

# omit_containers: [db, dba, ddev-ssh-agent]
# Currently only these containers are supported. Some containers can also be
# omitted globally in the ~/.ddev/global_config.yaml. Note that if you omit
# the "db" container, several standard features of ddev that access the
# database container will be unusable.

# nfs_mount_enabled: false
# Great performance improvement but requires host configuration first.
# See https://ddev.readthedocs.io/en/stable/users/performance/#using-nfs-to-mount-the-project-into-the-container

# fail_on_hook_fail: False
# Decide whether 'ddev start' should be interrupted by a failing hook

# host_https_port: "59002"
# The host port binding for https can be explicitly specified. It is
# dynamic unless otherwise specified.
# This is not used by most people, most people use the *router* instead
# of the localhost port.

# host_webserver_port: "59001"
# The host port binding for the ddev-webserver can be explicitly specified. It is
# dynamic unless otherwise specified.
# This is not used by most people, most people use the *router* instead
# of the localhost port.

# host_db_port: "59002"
# The host port binding for the ddev-dbserver can be explicitly specified. It is dynamic
# unless explicitly specified.

# phpmyadmin_port: "8036"
# phpmyadmin_https_port: "8037"
# The PHPMyAdmin ports can be changed from the default 8036 and 8037

# mailhog_port: "8025"
# mailhog_https_port: "8026"
# The MailHog ports can be changed from the default 8025 and 8026

# webimage_extra_packages: [php7.4-tidy, php-bcmath]
# Extra Debian packages that are needed in the webimage can be added here

# dbimage_extra_packages: [telnet,netcat]
# Extra Debian packages that are needed in the dbimage can be added here

# use_dns_when_possible: true
# If the host has internet access and the domain configured can
# successfully be looked up, DNS will be used for hostname resolution
# instead of editing /etc/hosts
# Defaults to true

# project_tld: ddev.site
# The top-level domain used for project URLs
# The default "ddev.site" allows DNS lookup via a wildcard
# If you prefer you can change this to "ddev.local" to preserve
# pre-v1.9 behavior.

# ngrok_args: --subdomain mysite --auth username:pass
# Provide extra flags to the "ngrok http" command, see
# https://ngrok.com/docs#http or run "ngrok http -h"

# disable_settings_management: false
# If true, ddev will not create CMS-specific settings files like
# Drupal's settings.php/settings.ddev.php or TYPO3's AdditionalConfiguration.php
# In this case the user must provide all such settings.

# You can inject environment variables into the web container with:
# web_environment:
# - SOMEENV=somevalue
# - SOMEOTHERENV=someothervalue

# no_project_mount: false
# (Experimental) If true, ddev will not mount the project into the web container;
# the user is responsible for mounting it manually or via a script.
# This is to enable experimentation with alternate file mounting strategies.
# For advanced users only!

# Many ddev commands can be extended to run tasks before or after the
# ddev command is executed, for example "post-start", "post-import-db",
# "pre-composer", "post-composer"
# See https://ddev.readthedocs.io/en/stable/users/extending-commands/ for more
# information on the commands that can be extended and the tasks you can define
# for them. Example:
#hooks:
# post-import-db:
# - exec: drush cr
# - exec: drush updb
14 changes: 7 additions & 7 deletions .env.example
Expand Up @@ -2,18 +2,18 @@
# Copy and rename this file to .env at root of this project.
#

# A common use case is to supply database creds via the environment. Edit settings.php
# A common use case is to supply database credentials via the environment. Edit settings.php
# like so:
#
# $databases['default']['default'] = [
# 'database' => getenv('MYSQL_DATABASE'),
# 'database' => $_ENV['MYSQL_DATABASE'],
# 'driver' => 'mysql',
# 'host' => getenv('MYSQL_HOSTNAME'),
# 'host' => $_ENV['MYSQL_HOSTNAME'],
# 'namespace' => 'Drupal\\Core\\Database\\Driver\\mysql',
# 'password' => getenv('MYSQL_PASSWORD'),
# 'port' => getenv('MYSQL_PORT'),
# 'password' => $_ENV['MYSQL_PASSWORD'],
# 'port' => $_ENV['MYSQL_PORT'],
# 'prefix' => '',
# 'username' => getenv('MYSQL_USER'),
# 'username' => $_ENV['MYSQL_USER'],
# ];
#
# Uncomment and populate as needed.
Expand All @@ -24,4 +24,4 @@
# MYSQL_USER=

# Another common use case is to set Drush's --uri via environment.
# DRUSH_OPTIONS_URI=http://example.com
# DRUSH_OPTIONS_URI=http://example.com
5 changes: 3 additions & 2 deletions .gitignore
Expand Up @@ -13,11 +13,12 @@
# Ignore Drupal's file directory
/web/sites/*/files/

# Ignore SimpleTest multi-site environment.
# Ignore SimpleTest multi-site environment
/web/sites/simpletest

# Ignore files generated by PhpStorm
# Ignore files generated by common IDEs
/.idea/
/.vscode/

# Ignore .env files as they are personal
/.env
Expand Down
36 changes: 18 additions & 18 deletions composer.json
@@ -1,6 +1,6 @@
{
"name": "drupal-composer/drupal-project",
"description": "Project template for Drupal 8 projects with composer",
"description": "Project template for Drupal 9 projects with Composer",
"type": "project",
"license": "GPL-2.0-or-later",
"authors": [
Expand All @@ -16,21 +16,20 @@
}
],
"require": {
"php": ">=7.0.8",
"composer/installers": "^1.2",
"cweagans/composer-patches": "^1.6.5",
"php": ">=7.3",
"composer/installers": "^1.9",
"cweagans/composer-patches": "^1.7",
"drupal/console": "^1.0.2",
"drupal/core": "^8.8.0",
"drupal/core-composer-scaffold": "^8.8.0",
"drush/drush": "^9.7.1 | ^10.0.0",
"vlucas/phpdotenv": "^4.0",
"webflo/drupal-finder": "^1.0.0",
"webmozart/path-util": "^2.3",
"zaporylie/composer-drupal-optimizations": "^1.0"
"drupal/core-composer-scaffold": "^9.1",
"drupal/core-recommended": "^9.1",
"drush/drush": "^10.3",
"vlucas/phpdotenv": "^5.1",
"webflo/drupal-finder": "^1.2"
},
"require-dev": {
"drupal/core-dev": "^8.8.0",
"drupal/drupal-extension": "^3.4"
"drupal/core-dev": "^9.1",
"zaporylie/composer-drupal-optimizations": "^1.2",
"drupal/drupal-extension": "^4.1"
},
"conflict": {
"drupal/drupal": "*"
Expand Down Expand Up @@ -62,10 +61,6 @@
]
},
"extra": {
"composer-exit-on-patch-failure": true,
"patchLevel": {
"drupal/core": "-p2"
},
"drupal-scaffold": {
"locations": {
"web-root": "web/"
Expand All @@ -82,6 +77,11 @@
"web/profiles/contrib/{$name}": ["type:drupal-profile"],
"web/themes/contrib/{$name}": ["type:drupal-theme"],
"drush/Commands/contrib/{$name}": ["type:drupal-drush"]
}
},
"composer-exit-on-patch-failure": true,
"patchLevel": {
"drupal/core": "-p2"
},
"patches": {}
}
}

0 comments on commit 49378d6

Please sign in to comment.