From d0d2df5c4f6f8ecdf5af267eae3dfadfacff33cb Mon Sep 17 00:00:00 2001 From: Alec Reynolds Date: Thu, 17 Oct 2024 15:21:30 -0700 Subject: [PATCH 1/3] Update php to v1.4.0 --- CHANGELOG.md | 2 ++ package-lock.json | 35 ++++++++--------------------------- package.json | 2 +- 3 files changed, 11 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9309bdb..55c8067 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }}) + * Updated lando/php to v1.4.0. + ## v1.7.0 - [September 30, 2024](https://github.com/lando/drupal/releases/tag/v1.7.0) * Updated lando/mariadb to v1.5.0. diff --git a/package-lock.json b/package-lock.json index cb29b79..7994dd5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@lando/mssql": "^1.0.0", "@lando/mysql": "^1.3.0", "@lando/nginx": "^1.0.0", - "@lando/php": "^1.2.0", + "@lando/php": "^1.4.0", "@lando/postgres": "^1.1.0", "lodash": "^4.17.21", "semver": "^7.5.4" @@ -1583,16 +1583,16 @@ "license": "MIT" }, "node_modules/@lando/php": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@lando/php/-/php-1.2.0.tgz", - "integrity": "sha512-afFC6qiUZHR61KeRAwGmJUrCtd0LfMyHhArsluT+xuscBR1/55h7SXgl3os6pHoyJl0oKEFGkbiAdxlqOq3ZKA==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@lando/php/-/php-1.4.0.tgz", + "integrity": "sha512-L06Kry0asvb+TzlEM4YXd2V1J/LJ9KGM+V8tLlbAY+fqbgCrCE8+AOmcJg+ZLwn/x+xyYLW8/Vx/a+bRIX+Ldw==", "bundleDependencies": [ "@lando/nginx", "lodash", "semver" ], "dependencies": { - "@lando/nginx": "0.11.0", + "@lando/nginx": "^1.3.0", "lodash": "^4.17.21", "semver": "^7.3.7" }, @@ -1601,7 +1601,7 @@ } }, "node_modules/@lando/php/node_modules/@lando/nginx": { - "version": "0.11.0", + "version": "1.3.0", "bundleDependencies": [ "lodash" ], @@ -1611,7 +1611,7 @@ "lodash": "^4.17.21" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@lando/php/node_modules/@lando/nginx/node_modules/lodash": { @@ -1625,12 +1625,9 @@ "license": "MIT" }, "node_modules/@lando/php/node_modules/semver": { - "version": "7.5.4", + "version": "7.6.3", "inBundle": true, "license": "ISC", - "dependencies": { - "lru-cache": "^6.0.0" - }, "bin": { "semver": "bin/semver.js" }, @@ -1638,22 +1635,6 @@ "node": ">=10" } }, - "node_modules/@lando/php/node_modules/semver/node_modules/lru-cache": { - "version": "6.0.0", - "inBundle": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@lando/php/node_modules/semver/node_modules/yallist": { - "version": "4.0.0", - "inBundle": true, - "license": "ISC" - }, "node_modules/@lando/postgres": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@lando/postgres/-/postgres-1.1.0.tgz", diff --git a/package.json b/package.json index b45545f..0f3fa11 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "@lando/mssql": "^1.0.0", "@lando/mysql": "^1.3.0", "@lando/nginx": "^1.0.0", - "@lando/php": "^1.2.0", + "@lando/php": "^1.4.0", "@lando/postgres": "^1.1.0", "lodash": "^4.17.21", "semver": "^7.5.4" From 38d23e2cf37e9a0517e97d7e3772718771d19fe7 Mon Sep 17 00:00:00 2001 From: Alec Reynolds Date: Fri, 18 Oct 2024 13:26:30 -0700 Subject: [PATCH 2/3] Update php to v1.5.0 --- CHANGELOG.md | 2 +- package-lock.json | 8 ++++---- package.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55c8067..ac192d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }}) - * Updated lando/php to v1.4.0. + * Updated lando/php to v1.5.0.. ## v1.7.0 - [September 30, 2024](https://github.com/lando/drupal/releases/tag/v1.7.0) diff --git a/package-lock.json b/package-lock.json index 7994dd5..7bb6072 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@lando/mssql": "^1.0.0", "@lando/mysql": "^1.3.0", "@lando/nginx": "^1.0.0", - "@lando/php": "^1.4.0", + "@lando/php": "^1.5.0", "@lando/postgres": "^1.1.0", "lodash": "^4.17.21", "semver": "^7.5.4" @@ -1583,9 +1583,9 @@ "license": "MIT" }, "node_modules/@lando/php": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@lando/php/-/php-1.4.0.tgz", - "integrity": "sha512-L06Kry0asvb+TzlEM4YXd2V1J/LJ9KGM+V8tLlbAY+fqbgCrCE8+AOmcJg+ZLwn/x+xyYLW8/Vx/a+bRIX+Ldw==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@lando/php/-/php-1.5.0.tgz", + "integrity": "sha512-8o+1uv7PVVkaEk2ROgl/lGfogDXOK9RxoeeMMYYVos001s08jsCxnuN0wdODnE8DtP/nw0s1FEZCzOsK9BaA5w==", "bundleDependencies": [ "@lando/nginx", "lodash", diff --git a/package.json b/package.json index 0f3fa11..fc6e74e 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "@lando/mssql": "^1.0.0", "@lando/mysql": "^1.3.0", "@lando/nginx": "^1.0.0", - "@lando/php": "^1.4.0", + "@lando/php": "^1.5.0", "@lando/postgres": "^1.1.0", "lodash": "^4.17.21", "semver": "^7.5.4" From 738afebc65c1e546333dafa05734e65277c058b4 Mon Sep 17 00:00:00 2001 From: Alec Reynolds Date: Fri, 18 Oct 2024 14:38:02 -0700 Subject: [PATCH 3/3] Add ssl test for drupal-custom. --- CHANGELOG.md | 2 +- examples/drupal-custom/.lando.yml | 1 + examples/drupal-custom/README.md | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac192d7..2992189 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }}) - * Updated lando/php to v1.5.0.. +* Updated lando/php to v1.5.0. ## v1.7.0 - [September 30, 2024](https://github.com/lando/drupal/releases/tag/v1.7.0) diff --git a/examples/drupal-custom/.lando.yml b/examples/drupal-custom/.lando.yml index a17fa59..2b98b48 100644 --- a/examples/drupal-custom/.lando.yml +++ b/examples/drupal-custom/.lando.yml @@ -7,6 +7,7 @@ config: webroot: bob database: mysql:5.7 xdebug: true + ssl: true config: database: config/mysql.cnf php: config/php.ini diff --git a/examples/drupal-custom/README.md b/examples/drupal-custom/README.md index 16e687a..aa61847 100644 --- a/examples/drupal-custom/README.md +++ b/examples/drupal-custom/README.md @@ -34,6 +34,10 @@ lando php -v | grep "PHP 8.3" # Should use composer 2.0.7 lando exec appserver -- /bin/sh -c 'NO_COLOR=1 composer -V' | grep "Composer version 2.0.7" +# Should serve and be accessible over ssl if specified +lando exec appserver_nginx -- curl https://localhost +lando exec appserver -- curl https://appserver_nginx + # Should be running mysql 5.7 by default lando mysql -V | grep 5.7