From 5abdd8532fa7761eb6a62f067da37be91f80cefa Mon Sep 17 00:00:00 2001
From: s j <sj@1729.be>
Date: Wed, 12 Jan 2022 09:25:29 +0100
Subject: [PATCH 1/3] imp: d9
---
composer.json | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/composer.json b/composer.json
index 2d90d82..2c87072 100755
--- a/composer.json
+++ b/composer.json
@@ -17,6 +17,10 @@
"type": "composer",
"url": "https://packages.drupal.org/8"
},
+ {
+ "type": "composer",
+ "url": "https://asset-packagist.org"
+ },
{
"type": "package",
"package": {
@@ -40,9 +44,9 @@
"cweagans/composer-patches": "^1.7",
"drupal/composer_deploy": "^1.6",
"drupal/console": "^1.5",
- "drupal/core-composer-scaffold": "^8.8",
- "drupal/core-project-message": "^8.8",
- "drupal/core-recommended": "^8.8",
+ "drupal/core-composer-scaffold": "^9.2",
+ "drupal/core-project-message": "^9.2",
+ "drupal/core-recommended": "^9.2",
"drupal/currency": "^3.2",
"drupal/dsr": "^1.0.0",
"drupal/dsr_demo": "^1.0.0",
@@ -54,19 +58,14 @@
"drupal/monitoring": "^1.9",
"drupal/purge": "^3.0",
"drupal/redis": "^1.2",
- "drupal/redis_batch": "1.x-dev",
"drupal/swiftmailer": "^2.0",
"drupal/twig_tweak": "^2.0",
"drupal/varnish_purge": "^2.0",
- "drush/drush": "^8.0",
+ "drush/drush": "^10.0",
"drupal/mollie_payment": "^2.0-rc4"
},
"require-dev": {
- "drupal/config_devel": "^1.2",
- "drupal/multiline_config": "^1.0",
- "drupal/core-dev": "^8.8",
- "drupal/devel_entity_updates": "^1.0",
- "drupal/potx": "1.x-dev"
+ "drupal/core-dev": "^9.2"
},
"conflict": {
"drupal/drupal": "*"
@@ -118,21 +117,21 @@
]
},
"patches": {
+<<<<<<< HEAD
"drupal/mollie_payment": {
"status": "patches/mollie_payment-additional-status.patch",
"hook": "patches/mollie_payment-hook.patch"
},
+=======
+>>>>>>> imp: d9
"genkgo/camt": {
"camt-iso8601": "patches/genkgo_camt.patch"
},
- "drupal/vbo_export": {
- "accents": "patches/vbo_export-accents.patch"
- },
"drupal/basic": {
"install": "https://www.drupal.org/files/issues/2020-04-23/drush_binstall_is_broken_in_drupal_8.8.x-3130098-7.patch"
},
"drupal/core": {
- "entity_reference_views_exposed_filter": "https://www.drupal.org/files/issues/2020-06-21/2429699-334.patch"
+ "entity_reference_views_exposed_filter": "https://www.drupal.org/files/issues/2021-12-02/2429699-453-9.3.x.patch"
},
"drupal/composer_deploy": {
"composer-version": "patches/composer_deploy-composer_version-1.patch"
--
GitLab
From af823c40a48d78d59ee6337d498536437ab4b355 Mon Sep 17 00:00:00 2001
From: s j <sj@1729.be>
Date: Wed, 12 Jan 2022 10:49:27 +0100
Subject: [PATCH 2/3] imp: Makefile d9
---
Makefile | 59 +++++++++++++++++------------------
composer.json | 3 +-
web/profiles/dar/dar.info.yml | 2 +-
3 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/Makefile b/Makefile
index bd07651..738734d 100644
--- a/Makefile
+++ b/Makefile
@@ -6,38 +6,37 @@ all:
install:
- db=$$(vendor/bin/drush --root=web core-status | grep -e 'Database name\|DB name' | cut -d ':' -f 2) && (test $$db = dar || test $$db = dar8 || test $$db = dar9 || test $$db = dar_build || test $$db = dar-dev || test $$db = dar-dev-civicrm || test $$db = dar-civicrm)
- vendor/bin/drush --root=web si
- yes | vendor/bin/drush --root=web en drush_language
- vendor/bin/drush --root=web language-add nl
- vendor/bin/drush --root=web language-add fr
- yes | vendor/bin/drush --root=web en dsr_demo
- yes | vendor/bin/drush --root=web en twig_tweak
- yes | vendor/bin/drush --root=web en dsr_demo_theme || yes | vendor/bin/drush --root=web then dsr_demo_theme
- yes | vendor/bin/drush --root=web config-set system.theme default dsr_demo_theme
- yes | vendor/bin/drush --root=web config-set language.negotiation selected_langcode nl
- [[ "$$NO_LOCALE_UPDATE" -eq "1" ]] || yes | vendor/bin/drush --root=web locale-update
- yes | vendor/bin/drush --root=web update-config-translations
- yes | vendor/bin/drush --root=web config-set language.entity.nl weight 3
- yes | vendor/bin/drush --root=web config-set language.entity.fr weight 2
- yes | vendor/bin/drush --root=web config-set language.entity.en weight 1
- yes | vendor/bin/drush --root=web config-set swiftmailer.transport transport native
- yes | vendor/bin/drush --root=web en redis,filecache
+ db=$$(cd web && ../vendor/bin/drush core-status | grep -e 'Database name\|DB name' | cut -d ':' -f 2) && (test $$db = dar || test $$db = dar8 || test $$db = dar9 || test $$db = dar_build || test $$db = dar-dev || test $$db = dar-dev-civicrm || test $$db = dar-civicrm)
+ cd web && ../vendor/bin/drush si
+ cd web && yes | ../vendor/bin/drush en drush_language
+ cd web && ../vendor/bin/drush language-add nl
+ cd web && ../vendor/bin/drush language-add fr
+ cd web && yes | ../vendor/bin/drush en dsr_demo
+ cd web && yes | ../vendor/bin/drush en twig_tweak
+ cd web && yes | ../vendor/bin/drush then dsr_demo_theme
+ cd web && yes | ../vendor/bin/drush config-set system.theme default dsr_demo_theme
+ cd web && yes | ../vendor/bin/drush config-set language.negotiation selected_langcode nl
+ [[ "$$NO_LOCALE_UPDATE" -eq "1" ]] || cd web && yes | ../vendor/bin/drush locale-update
+ # FIXME cd web && yes | ../vendor/bin/drush update-config-translations
+ cd web && yes | ../vendor/bin/drush config-set language.entity.nl weight 3
+ cd web && yes | ../vendor/bin/drush config-set language.entity.fr weight 2
+ cd web && yes | ../vendor/bin/drush config-set language.entity.en weight 1
+ # FIXME cd web && yes | ../vendor/bin/drush config-set swiftmailer.transport transport native
+ # FIXME cd web && yes | ../vendor/bin/drush en redis,filecache
demo: install
- yes | vendor/bin/drush --root=web en config_devel,multiline_config
- for f in $$(find web/modules/contrib/dsr_demo/config/dar -iname *.yml); do yes | vendor/bin/drush --root=web cdi1 $$f; done
- vendor/bin/drush --root=web cr
- vendor/bin/drush --root=web import-shareholder-register ../demo
- while vendor/bin/drush --root=web validate-shareholder-register; do echo 'validating next batch ...'; done || true
- vendor/bin/drush --root=web demo-signup
- vendor/bin/drush --root=web demo-draft-transactions
- vendor/bin/drush --root=web import-bank-file camt053 $(PWD)/demo/mutations.xml
- vendor/bin/drush --root=web import-bank-file coda $(PWD)/demo/2020-00001.cod
- vendor/bin/drush --root=web demo-dividend
- vendor/bin/drush --root=web gen-tax 2015
- vendor/bin/drush --root=web gen-tax 2016
- yes | vendor/bin/drush --root=web config-set shareholder_register.settings mail_extract_upon_validation 1
+ cd web && ../vendor/bin/drush cim --partial -y --source=modules/contrib/dsr_demo/config/dar
+ cd web && yes | ../vendor/bin/drush cr
+ cd web && yes | ../vendor/bin/drush import-shareholder-register ../demo
+ cd web && while yes | ../vendor/bin/drush validate-shareholder-register; do echo 'validating next batch ...'; done || true
+ cd web && yes | ../vendor/bin/drush demo-signup
+ cd web && yes | ../vendor/bin/drush demo-draft-transactions
+ cd web && yes | ../vendor/bin/drush import-bank-file camt053 $(PWD)/demo/mutations.xml
+ cd web && yes | ../vendor/bin/drush import-bank-file coda $(PWD)/demo/2020-00001.cod
+ cd web && yes | ../vendor/bin/drush demo-dividend
+ cd web && yes | ../vendor/bin/drush gen-tax 2015
+ cd web && yes | ../vendor/bin/drush gen-tax 2016
+ cd web && yes | ../vendor/bin/drush config-set shareholder_register.settings mail_extract_upon_validation 1
master:
composer require "drupal/accounting:dev-master" "drupal/banking:dev-master" "drupal/banking_orders:dev-master" "drupal/banking_orders_accounting:dev-master" "drupal/shareholder_register:dev-master" "drupal/shareholder_register_accounting:dev-master" "drupal/dsr:dev-master" "drupal/mail_template:dev-master" "drupal/simple_workflows:dev-master"
diff --git a/composer.json b/composer.json
index 2c87072..4b4da66 100755
--- a/composer.json
+++ b/composer.json
@@ -131,7 +131,8 @@
"install": "https://www.drupal.org/files/issues/2020-04-23/drush_binstall_is_broken_in_drupal_8.8.x-3130098-7.patch"
},
"drupal/core": {
- "entity_reference_views_exposed_filter": "https://www.drupal.org/files/issues/2021-12-02/2429699-453-9.3.x.patch"
+ "entity_reference_views_exposed_filter": "https://www.drupal.org/files/issues/2021-12-02/2429699-453-9.3.x.patch",
+ "allow-cim-without-site-uuid": "https://www.drupal.org/files/issues/2020-03-28/3047392-17_0.patch"
},
"drupal/composer_deploy": {
"composer-version": "patches/composer_deploy-composer_version-1.patch"
diff --git a/web/profiles/dar/dar.info.yml b/web/profiles/dar/dar.info.yml
index d77d6d4..b7e4372 100644
--- a/web/profiles/dar/dar.info.yml
+++ b/web/profiles/dar/dar.info.yml
@@ -1,7 +1,7 @@
name: DAR
type: profile
description: 'Digitaal Aandeelhoudersregister Profiel'
-core: 8.x
+core_version_requirement: ^8.8 || ^9
distribution:
name: 'DAR'
--
GitLab
From bae5f934cf6f67c370ea932799c9c6f422e370b5 Mon Sep 17 00:00:00 2001
From: s j <sj@1729.be>
Date: Fri, 4 Feb 2022 09:22:09 +0100
Subject: [PATCH 3/3] imp: Makefile for v8
---
Makefile | 4 ++++
composer.json | 9 +--------
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index 738734d..e2a58d3 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,10 @@ CUSTOM_MODS := $(shell for d in $$(find web/modules/contrib/ web/modules/custom/
all:
echo "run specific command !"
+d8:
+ composer require drupal/core-composer-scaffold:^8.8 drupal/core-project-message:^8.8 drupal/core-recommended:^8.8 --no-update
+ composer require --dev drupal/core-dev:^8.8 --no-update
+ composer config --json 'extra.patches.drupal/core' '{"entity_reference_views_exposed_filter": "https://www.drupal.org/files/issues/2020-06-21/2429699-334.patch", "allow-cim-without-site-uuid": "https://www.drupal.org/files/issues/2020-03-28/3047392-17_0.patch"}'
install:
db=$$(cd web && ../vendor/bin/drush core-status | grep -e 'Database name\|DB name' | cut -d ':' -f 2) && (test $$db = dar || test $$db = dar8 || test $$db = dar9 || test $$db = dar_build || test $$db = dar-dev || test $$db = dar-dev-civicrm || test $$db = dar-civicrm)
diff --git a/composer.json b/composer.json
index 4b4da66..6f9ea39 100755
--- a/composer.json
+++ b/composer.json
@@ -62,7 +62,7 @@
"drupal/twig_tweak": "^2.0",
"drupal/varnish_purge": "^2.0",
"drush/drush": "^10.0",
- "drupal/mollie_payment": "^2.0-rc4"
+ "drupal/mollie_payment": "^3.0"
},
"require-dev": {
"drupal/core-dev": "^9.2"
@@ -117,13 +117,6 @@
]
},
"patches": {
-<<<<<<< HEAD
- "drupal/mollie_payment": {
- "status": "patches/mollie_payment-additional-status.patch",
- "hook": "patches/mollie_payment-hook.patch"
- },
-=======
->>>>>>> imp: d9
"genkgo/camt": {
"camt-iso8601": "patches/genkgo_camt.patch"
},
--
GitLab