From a43e46ae50320864fa373047319b3950b5b1d32b Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Wed, 18 Dec 2024 16:31:08 +1100 Subject: [PATCH] chore: update php, mysql, composer --- composer.json | 9 +- composer.lock | 216 +++++++++++++++++------------------------- docker-compose.yml | 5 +- lagoon/cli.dockerfile | 2 +- lagoon/php.dockerfile | 2 +- recipes/README.txt | 10 ++ 6 files changed, 106 insertions(+), 138 deletions(-) create mode 100644 recipes/README.txt diff --git a/composer.json b/composer.json index 5d789ae..697df68 100644 --- a/composer.json +++ b/composer.json @@ -26,8 +26,7 @@ "drupal/core-recommended": "11.1.0", "drupal/lagoon_logs": "3.0.1", "drupal/mysql57": "1.0.0", - "drush/drush": "13.3.3", - "zaporylie/composer-drupal-optimizations": "1.2.0" + "drush/drush": "13.3.3" }, "conflict": { "drupal/drupal": "*" @@ -39,12 +38,12 @@ "allow-plugins": { "composer/installers": true, "cweagans/composer-patches": true, - "zaporylie/composer-drupal-optimizations": true, + "dealerdirect/phpcodesniffer-composer-installer": true, "drupal/core-composer-scaffold": true, "drupal/core-project-message": true, + "php-http/discovery": true, "phpstan/extension-installer": true, - "dealerdirect/phpcodesniffer-composer-installer": true, - "php-http/discovery": true + "tbachert/spi": true } }, "extra": { diff --git a/composer.lock b/composer.lock index d8f1e4b..a509dd7 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1dce24191f0faac484f6333ce4c4d8f8", + "content-hash": "1f19ee60965f1b4c3c5a8a1f10fc7cbb", "packages": [ { "name": "amazeeio/drupal_integrations", @@ -38,14 +38,14 @@ "drupal-scaffold": { "file-mapping": { "[project-root]/.drush-lock-update": "assets/drush-lock-update", - "[project-root]/drush/sites/lagoon.site.yml": "assets/lagoon.site.yml", - "[web-root]/sites/default/default.development.services.yml": "assets/default.development.services.yml", - "[web-root]/sites/default/settings.lagoon.php": "assets/settings.lagoon.php", "[web-root]/sites/default/settings.php": { "mode": "replace", "path": "assets/initial.settings.php", "overwrite": false - } + }, + "[project-root]/drush/sites/lagoon.site.yml": "assets/lagoon.site.yml", + "[web-root]/sites/default/settings.lagoon.php": "assets/settings.lagoon.php", + "[web-root]/sites/default/default.development.services.yml": "assets/default.development.services.yml" } } }, @@ -1236,16 +1236,16 @@ }, { "name": "consolidation/annotated-command", - "version": "4.10.0", + "version": "4.10.1", "source": { "type": "git", "url": "https://github.com/consolidation/annotated-command.git", - "reference": "1e830ba908c9ffb1ba7ca056203531b27188812c" + "reference": "362310b13ececa9f6f0a4a880811fa08fecc348b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/1e830ba908c9ffb1ba7ca056203531b27188812c", - "reference": "1e830ba908c9ffb1ba7ca056203531b27188812c", + "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/362310b13ececa9f6f0a4a880811fa08fecc348b", + "reference": "362310b13ececa9f6f0a4a880811fa08fecc348b", "shasum": "" }, "require": { @@ -1286,22 +1286,22 @@ "description": "Initialize Symfony Console commands from annotated command class methods.", "support": { "issues": "https://github.com/consolidation/annotated-command/issues", - "source": "https://github.com/consolidation/annotated-command/tree/4.10.0" + "source": "https://github.com/consolidation/annotated-command/tree/4.10.1" }, - "time": "2024-04-05T21:05:39+00:00" + "time": "2024-12-13T19:55:40+00:00" }, { "name": "consolidation/config", - "version": "3.0.0", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/consolidation/config.git", - "reference": "248567e6322a89bb9a0d09d72278b7b6f9919d02" + "reference": "0615499781449ab773ffc609b97b934b3357b3f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/config/zipball/248567e6322a89bb9a0d09d72278b7b6f9919d02", - "reference": "248567e6322a89bb9a0d09d72278b7b6f9919d02", + "url": "https://api.github.com/repos/consolidation/config/zipball/0615499781449ab773ffc609b97b934b3357b3f9", + "reference": "0615499781449ab773ffc609b97b934b3357b3f9", "shasum": "" }, "require": { @@ -1346,9 +1346,9 @@ "description": "Provide configuration services for a commandline tool.", "support": { "issues": "https://github.com/consolidation/config/issues", - "source": "https://github.com/consolidation/config/tree/3.0.0" + "source": "https://github.com/consolidation/config/tree/3.1.0" }, - "time": "2024-04-05T00:11:32+00:00" + "time": "2024-11-28T14:37:27+00:00" }, { "name": "consolidation/filter-via-dot-access-data", @@ -1581,16 +1581,16 @@ }, { "name": "consolidation/site-alias", - "version": "4.1.0", + "version": "4.1.1", "source": { "type": "git", "url": "https://github.com/consolidation/site-alias.git", - "reference": "1056ceb93f6aafe6f7600d7bbe1b62b8488abccf" + "reference": "aff6189aae17da813d23249cb2fc0fff33f26d40" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/site-alias/zipball/1056ceb93f6aafe6f7600d7bbe1b62b8488abccf", - "reference": "1056ceb93f6aafe6f7600d7bbe1b62b8488abccf", + "url": "https://api.github.com/repos/consolidation/site-alias/zipball/aff6189aae17da813d23249cb2fc0fff33f26d40", + "reference": "aff6189aae17da813d23249cb2fc0fff33f26d40", "shasum": "" }, "require": { @@ -1634,22 +1634,22 @@ "description": "Manage alias records for local and remote sites.", "support": { "issues": "https://github.com/consolidation/site-alias/issues", - "source": "https://github.com/consolidation/site-alias/tree/4.1.0" + "source": "https://github.com/consolidation/site-alias/tree/4.1.1" }, - "time": "2024-04-05T15:58:04+00:00" + "time": "2024-12-13T19:05:11+00:00" }, { "name": "consolidation/site-process", - "version": "5.4.0", + "version": "5.4.2", "source": { "type": "git", "url": "https://github.com/consolidation/site-process.git", - "reference": "7ab3ffe4195a89b8dc334ea22e7881abe79ffd9a" + "reference": "e7fafc40ebfddc1a5ee99ee66e5d186fc1bed4da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/site-process/zipball/7ab3ffe4195a89b8dc334ea22e7881abe79ffd9a", - "reference": "7ab3ffe4195a89b8dc334ea22e7881abe79ffd9a", + "url": "https://api.github.com/repos/consolidation/site-process/zipball/e7fafc40ebfddc1a5ee99ee66e5d186fc1bed4da", + "reference": "e7fafc40ebfddc1a5ee99ee66e5d186fc1bed4da", "shasum": "" }, "require": { @@ -1691,9 +1691,9 @@ "description": "A thin wrapper around the Symfony Process Component that allows applications to use the Site Alias library to specify the target for a remote call.", "support": { "issues": "https://github.com/consolidation/site-process/issues", - "source": "https://github.com/consolidation/site-process/tree/5.4.0" + "source": "https://github.com/consolidation/site-process/tree/5.4.2" }, - "time": "2024-04-06T00:00:28+00:00" + "time": "2024-12-13T19:25:56+00:00" }, { "name": "cweagans/composer-patches", @@ -2841,23 +2841,23 @@ "sut/libraries/{$name}": [ "type:drupal-library" ], + "sut/themes/unish/{$name}": [ + "drupal/empty_theme" + ], + "sut/drush/contrib/{$name}": [ + "type:drupal-drush" + ], "sut/modules/unish/{$name}": [ "drupal/devel" ], - "sut/themes/unish/{$name}": [ - "drupal/empty_theme" + "sut/themes/contrib/{$name}": [ + "type:drupal-theme" ], "sut/modules/contrib/{$name}": [ "type:drupal-module" ], "sut/profiles/contrib/{$name}": [ "type:drupal-profile" - ], - "sut/themes/contrib/{$name}": [ - "type:drupal-theme" - ], - "sut/drush/contrib/{$name}": [ - "type:drupal-drush" ] } }, @@ -3034,16 +3034,16 @@ }, { "name": "grasmash/expander", - "version": "3.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/grasmash/expander.git", - "reference": "bb1c1a2430957945cf08c5a62f5d72a6aa6a2c82" + "reference": "eea11b9afb0c32483b18b9009f4ca07b770e39f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/grasmash/expander/zipball/bb1c1a2430957945cf08c5a62f5d72a6aa6a2c82", - "reference": "bb1c1a2430957945cf08c5a62f5d72a6aa6a2c82", + "url": "https://api.github.com/repos/grasmash/expander/zipball/eea11b9afb0c32483b18b9009f4ca07b770e39f4", + "reference": "eea11b9afb0c32483b18b9009f4ca07b770e39f4", "shasum": "" }, "require": { @@ -3080,9 +3080,9 @@ "description": "Expands internal property references in PHP arrays file.", "support": { "issues": "https://github.com/grasmash/expander/issues", - "source": "https://github.com/grasmash/expander/tree/3.0.0" + "source": "https://github.com/grasmash/expander/tree/3.0.1" }, - "time": "2022-05-10T13:14:49+00:00" + "time": "2024-11-25T23:28:05+00:00" }, { "name": "grasmash/yaml-cli", @@ -3467,16 +3467,16 @@ }, { "name": "illuminate/collections", - "version": "v11.30.0", + "version": "v11.36.1", "source": { "type": "git", "url": "https://github.com/illuminate/collections.git", - "reference": "2d99ccbb19e34450508ff3ab2f62ba90aa2e9793" + "reference": "21868f9ac221a42d4346dc56495d11ab7e0d339a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/collections/zipball/2d99ccbb19e34450508ff3ab2f62ba90aa2e9793", - "reference": "2d99ccbb19e34450508ff3ab2f62ba90aa2e9793", + "url": "https://api.github.com/repos/illuminate/collections/zipball/21868f9ac221a42d4346dc56495d11ab7e0d339a", + "reference": "21868f9ac221a42d4346dc56495d11ab7e0d339a", "shasum": "" }, "require": { @@ -3496,6 +3496,7 @@ }, "autoload": { "files": [ + "functions.php", "helpers.php" ], "psr-4": { @@ -3518,20 +3519,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-10-10T19:23:07+00:00" + "time": "2024-12-13T13:58:10+00:00" }, { "name": "illuminate/conditionable", - "version": "v11.30.0", + "version": "v11.36.1", "source": { "type": "git", "url": "https://github.com/illuminate/conditionable.git", - "reference": "362dd761b9920367bca1427a902158225e9e3a23" + "reference": "911df1bda950a3b799cf80671764e34eede131c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/conditionable/zipball/362dd761b9920367bca1427a902158225e9e3a23", - "reference": "362dd761b9920367bca1427a902158225e9e3a23", + "url": "https://api.github.com/repos/illuminate/conditionable/zipball/911df1bda950a3b799cf80671764e34eede131c6", + "reference": "911df1bda950a3b799cf80671764e34eede131c6", "shasum": "" }, "require": { @@ -3564,20 +3565,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-06-28T20:10:30+00:00" + "time": "2024-11-21T16:28:56+00:00" }, { "name": "illuminate/contracts", - "version": "v11.30.0", + "version": "v11.36.1", "source": { "type": "git", "url": "https://github.com/illuminate/contracts.git", - "reference": "56312862af937bd6da8e6dc8bbd88188dfb478f8" + "reference": "184317f701ba20ca265e36808ed54b75b115972d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/contracts/zipball/56312862af937bd6da8e6dc8bbd88188dfb478f8", - "reference": "56312862af937bd6da8e6dc8bbd88188dfb478f8", + "url": "https://api.github.com/repos/illuminate/contracts/zipball/184317f701ba20ca265e36808ed54b75b115972d", + "reference": "184317f701ba20ca265e36808ed54b75b115972d", "shasum": "" }, "require": { @@ -3612,11 +3613,11 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-09-22T15:08:08+00:00" + "time": "2024-11-25T15:33:38+00:00" }, { "name": "illuminate/macroable", - "version": "v11.30.0", + "version": "v11.36.1", "source": { "type": "git", "url": "https://github.com/illuminate/macroable.git", @@ -3819,11 +3820,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.x-dev", - "dev-4.x": "4.x-dev", - "dev-3.x": "3.x-dev", + "dev-1.x": "1.x-dev", "dev-2.x": "2.x-dev", - "dev-1.x": "1.x-dev" + "dev-3.x": "3.x-dev", + "dev-4.x": "4.x-dev", + "dev-master": "4.x-dev" } }, "autoload": { @@ -4311,16 +4312,16 @@ }, { "name": "monolog/monolog", - "version": "3.7.0", + "version": "3.8.1", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "f4393b648b78a5408747de94fca38beb5f7e9ef8" + "reference": "aef6ee73a77a66e404dd6540934a9ef1b3c855b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f4393b648b78a5408747de94fca38beb5f7e9ef8", - "reference": "f4393b648b78a5408747de94fca38beb5f7e9ef8", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/aef6ee73a77a66e404dd6540934a9ef1b3c855b4", + "reference": "aef6ee73a77a66e404dd6540934a9ef1b3c855b4", "shasum": "" }, "require": { @@ -4340,12 +4341,14 @@ "guzzlehttp/psr7": "^2.2", "mongodb/mongodb": "^1.8", "php-amqplib/php-amqplib": "~2.4 || ^3", - "phpstan/phpstan": "^1.9", - "phpstan/phpstan-deprecation-rules": "^1.0", - "phpstan/phpstan-strict-rules": "^1.4", - "phpunit/phpunit": "^10.5.17", + "php-console/php-console": "^3.1.8", + "phpstan/phpstan": "^2", + "phpstan/phpstan-deprecation-rules": "^2", + "phpstan/phpstan-strict-rules": "^2", + "phpunit/phpunit": "^10.5.17 || ^11.0.7", "predis/predis": "^1.1 || ^2", - "ruflin/elastica": "^7", + "rollbar/rollbar": "^4.0", + "ruflin/elastica": "^7 || ^8", "symfony/mailer": "^5.4 || ^6", "symfony/mime": "^5.4 || ^6" }, @@ -4396,7 +4399,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/3.7.0" + "source": "https://github.com/Seldaek/monolog/tree/3.8.1" }, "funding": [ { @@ -4408,7 +4411,7 @@ "type": "tidelift" } ], - "time": "2024-06-28T09:40:51+00:00" + "time": "2024-12-05T17:15:07+00:00" }, { "name": "myclabs/deep-copy", @@ -7209,16 +7212,16 @@ }, { "name": "psy/psysh", - "version": "v0.12.4", + "version": "v0.12.7", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "2fd717afa05341b4f8152547f142cd2f130f6818" + "reference": "d73fa3c74918ef4522bb8a3bf9cab39161c4b57c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/2fd717afa05341b4f8152547f142cd2f130f6818", - "reference": "2fd717afa05341b4f8152547f142cd2f130f6818", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/d73fa3c74918ef4522bb8a3bf9cab39161c4b57c", + "reference": "d73fa3c74918ef4522bb8a3bf9cab39161c4b57c", "shasum": "" }, "require": { @@ -7245,12 +7248,12 @@ ], "type": "library", "extra": { - "branch-alias": { - "dev-main": "0.12.x-dev" - }, "bamarni-bin": { "bin-links": false, "forward-command": false + }, + "branch-alias": { + "dev-main": "0.12.x-dev" } }, "autoload": { @@ -7282,9 +7285,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.12.4" + "source": "https://github.com/bobthecow/psysh/tree/v0.12.7" }, - "time": "2024-06-10T01:18:23+00:00" + "time": "2024-12-10T01:58:33+00:00" }, { "name": "ralouphie/getallheaders", @@ -12232,53 +12235,6 @@ "source": "https://github.com/webmozarts/assert/tree/1.11.0" }, "time": "2022-06-03T18:03:27+00:00" - }, - { - "name": "zaporylie/composer-drupal-optimizations", - "version": "1.2.0", - "source": { - "type": "git", - "url": "https://github.com/zaporylie/composer-drupal-optimizations.git", - "reference": "a7f409a765164fd13ac0bd00e19109165c51b369" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zaporylie/composer-drupal-optimizations/zipball/a7f409a765164fd13ac0bd00e19109165c51b369", - "reference": "a7f409a765164fd13ac0bd00e19109165c51b369", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.1 || ^2.0" - }, - "require-dev": { - "composer/composer": "^1.6", - "phpunit/phpunit": "^6" - }, - "type": "composer-plugin", - "extra": { - "class": "zaporylie\\ComposerDrupalOptimizations\\Plugin" - }, - "autoload": { - "psr-4": { - "zaporylie\\ComposerDrupalOptimizations\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "Jakub Piasecki", - "email": "jakub@piaseccy.pl" - } - ], - "description": "Composer plugin to improve composer performance for Drupal projects", - "support": { - "issues": "https://github.com/zaporylie/composer-drupal-optimizations/issues", - "source": "https://github.com/zaporylie/composer-drupal-optimizations/tree/1.2.0" - }, - "time": "2020-10-22T13:26:00+00:00" } ], "packages-dev": [], diff --git a/docker-compose.yml b/docker-compose.yml index af86752..ab55fb2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -88,7 +88,7 @@ services: << : *default-environment # loads the defined environment variables from the top mariadb: - image: uselagoon/mariadb-10.11-drupal:latest + image: uselagoon/mysql-8.0:latest labels: lagoon.type: mariadb lando.type: mariadb-drupal @@ -97,6 +97,9 @@ services: << : *default-user # uses the defined user from top environment: << : *default-environment + MYSQL_DATABASE: drupal + MYSQL_USER: drupal + MYSQL_PASSWORD: drupal volumes: - db:/var/lib/mysql diff --git a/lagoon/cli.dockerfile b/lagoon/cli.dockerfile index 8c717d5..f4a018c 100644 --- a/lagoon/cli.dockerfile +++ b/lagoon/cli.dockerfile @@ -1,4 +1,4 @@ -FROM uselagoon/php-8.3-cli-drupal:latest +FROM uselagoon/php-8.4-cli-drupal:latest COPY composer.* /app/ COPY assets /app/assets diff --git a/lagoon/php.dockerfile b/lagoon/php.dockerfile index 2b50501..a4d1d05 100644 --- a/lagoon/php.dockerfile +++ b/lagoon/php.dockerfile @@ -1,6 +1,6 @@ ARG CLI_IMAGE FROM ${CLI_IMAGE} as cli -FROM uselagoon/php-8.3-fpm:latest +FROM uselagoon/php-8.4-fpm:latest COPY --from=cli /app /app diff --git a/recipes/README.txt b/recipes/README.txt new file mode 100644 index 0000000..6157392 --- /dev/null +++ b/recipes/README.txt @@ -0,0 +1,10 @@ +Recipes allow the automation of Drupal module and theme installation and +configuration. + +WHAT TO PLACE IN THIS DIRECTORY? +-------------------------------- + +Placing downloaded and custom recipes in this directory separates downloaded and +custom recipes from Drupal core's recipes. This allows Drupal core to be updated +without overwriting these files. +