From 1f35855b9428b119eb2ee2969687690355ec8aee Mon Sep 17 00:00:00 2001 From: Ken Rickard Date: Fri, 23 Jun 2023 10:19:42 -0400 Subject: [PATCH 1/3] Updates README with note about PHP 8.1.18 --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8b7af7a..179bacb 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ The development dependencies are: * PHP 8.1+ * Check your PHP version from the command line using `php --version` + * If your project cannot support PHP 8.2, you should use PHP 8.1.18. * [XCode](https://itunes.apple.com/us/app/xcode/id497799835?mt=12) * [Composer](https://getcomposer.org/download/) * [Docker](https://www.docker.com/) @@ -36,12 +37,12 @@ Enter a short name for your project [example] : ``` composer create-project palantirnet/drupal-skeleton example dev-develop --no-interaction ``` - + This skeleton is based on Drupal 10. If you would like to install and use Drupal 9 instead, run: ``` composer create-project palantirnet/drupal-skeleton example dev-drupal9 --no-interaction ``` - + 2. Go into your new project directory and update the ddev configuration in `.ddev/config.yml`: ``` @@ -52,7 +53,7 @@ Enter a short name for your project [example] : # Use 'docroot' for Acquia, or 'web' for Pantheon or Platform.sh. docroot: web ``` - + 3. From inside the ddev environment, run the script from `palantirnet/the-build` to set up the default Drupal variables and install Drupal: ``` @@ -105,7 +106,7 @@ Update the `README`: Project-specific documentation at [docs/technical_approach.md](docs/technical_approach.md) - * Add `deployment.md` for deployment instructions + * Add `deployment.md` for deployment instructions Update the `LICENSE.txt`: From 442feafe2a943318bbae0f73edc391a4cb86162a Mon Sep 17 00:00:00 2001 From: Byron Duvall Date: Fri, 23 Jun 2023 13:38:00 -0400 Subject: [PATCH 2/3] Revert "Revert "Merge branch 'update-php-8.2' into DEV-43-license"" This reverts commit a5ea9cc6eab99c74187466aab0274d4b83151868. --- .circleci/config.yml | 2 +- .ddev/config.yaml | 2 +- README.md | 2 +- composer.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a033315..413d6a0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ jobs: build: working_directory: ~/drupal-skeleton docker: - - image: cimg/php:8.1-browsers + - image: cimg/php:8.2-browsers - image: cimg/mysql:5.7 command: --max_allowed_packet=16M environment: diff --git a/.ddev/config.yaml b/.ddev/config.yaml index 9f7e0d0..6e2e2ce 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -17,7 +17,7 @@ webserver_type: apache-fpm #mariadb_version: "10.3" # TODO: Make sure this PHP version matches the project's hosting environment. -php_version: "8.1" +php_version: "8.2" # Add any multisite subdomains to this array. Adding "example" will make this environment # available at "example.ddev.site". diff --git a/README.md b/README.md index 179bacb..8baea3f 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ You should have the development dependencies installed on your Mac before you be The development dependencies are: -* PHP 8.1+ +* PHP 8.2+ * Check your PHP version from the command line using `php --version` * If your project cannot support PHP 8.2, you should use PHP 8.1.18. * [XCode](https://itunes.apple.com/us/app/xcode/id497799835?mt=12) diff --git a/composer.json b/composer.json index c4f78dc..ba9dca9 100644 --- a/composer.json +++ b/composer.json @@ -57,7 +57,7 @@ "phpstan/extension-installer": true }, "platform": { - "php": "8.1" + "php": "8.2" }, "preferred-install": { "*": "dist" From 1ed762bfbae09649938dba5203a08c4c5b178057 Mon Sep 17 00:00:00 2001 From: byrond Date: Wed, 29 May 2024 16:20:25 -0400 Subject: [PATCH 3/3] removed note about using PHP 8.1.18 --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index b4ed1c5..5a0eb68 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,6 @@ The development dependencies are: * PHP 8.2+ * Check your PHP version from the command line using `php --version` - * If your project cannot support PHP 8.2, you should use PHP 8.1.18. * Mac only: [XCode command line tools](https://mac.install.guide/commandlinetools/3) * [Composer](https://getcomposer.org/download/) * [Docker](https://www.docker.com/)