[SETUP] Set PHP 8.2 as default, add PHP 8.3 support

boxuk · Jan 2, 2024 · 1e633da · 1e633da
1 parent cbb7ec3
commit 1e633da
Show file tree

Hide file tree

Showing 32 changed files with 1,103 additions and 629 deletions.
diff --git a/.env.dist b/.env.dist
@@ -8,7 +8,7 @@
 #
 # DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.
 
-# Which version of PHP would you like to use? The major and minor version needed only, e.g. 8.0 or 8.1.
+# Which version of PHP would you like to use? The major and minor version needed only, e.g. 8.1, 8.2 or 8.3.
 PHP_VERSION=${PHP_VERSION}
 
 # A docker network is required to ensure the loopback works as expected among other things.

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -52,7 +52,19 @@ updates:
             prefix: "[DEPS]"
     # Docker app image.
     -   package-ecosystem: docker
-        directory: "/docker/app/php8.0"
+        directory: "/docker/app/php8.3"
+        registries: "*"
+        schedule:
+            interval: daily
+        open-pull-requests-limit: 10
+        commit-message:
+            prefix: "[SETUP]"
+        ignore:
+            - dependency-name: "*"
+              update-types: ["version-update:semver-major", "version-update:semver-minor"]
+    # Docker app image.
+    -   package-ecosystem: docker
+        directory: "/docker/app/php8.2"
         registries: "*"
         schedule:
             interval: daily
@@ -148,7 +160,19 @@ updates:
               update-types: ["version-update:semver-major"]
     # Docker styleguide image.
     -   package-ecosystem: docker
-        directory: "/docker/styleguide/php8.0"
+        directory: "/docker/styleguide/php8.3"
+        registries: "*"
+        schedule:
+            interval: daily
+        open-pull-requests-limit: 10
+        commit-message:
+            prefix: "[SETUP]"
+        ignore:
+            - dependency-name: "*"
+              update-types: ["version-update:semver-major", "version-update:semver-minor"]
+    # Docker styleguide image.
+    -   package-ecosystem: docker
+        directory: "/docker/styleguide/php8.2"
         registries: "*"
         schedule:
             interval: daily

diff --git a/.gitignore b/.gitignore
@@ -53,6 +53,7 @@ debug.log
 /tests/tmp/*
 !/tests/tmp/.gitkeep
 .phpunit.result.cache
+.phpunit.cache/
 
 !docker/database/init.sql
 auth.json

diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,24 @@
 language: php
 
+os: linux
 dist: focal
 
 php:
-    - 8.0
-    - 8.1.0 # See https://travis-ci.community/t/php-8-1-support/12439/16
-
-matrix:
+    # PHP 8.3 not currently supported by Travis.
+    # Available versions: https://docs.travis-ci.com/user/languages/php/#php-versions
+    - 8.2.9
+    - 8.1.9
+
+# Running PHP 8.2 on Travis requires the 'libonig5' package to be included.
+# See: https://chrisguitarguy.com/2023/01/23/using-php-8-2-on-travisci/
+addons:
+  apt:
+    packages:
+      - libonig5
+
+jobs:
     allow_failures:
-        - php: 8.1.0
+        - php: 8.1.9
     fast_finish: true
 
 branches:
@@ -20,7 +30,13 @@ services:
 
 cache:
     directories:
+        - ".cache/phpstan"
+        - "/home/travis/.cache/phpcs"
         - "/home/travis/.composer/cache"
+        - "node_modules"
+        - "wp-content/client-mu-plugins/vendor"
+        - "styleguide/vendor"
+        - "styleguide/node_modules"
         - "tests/tmp"
 
 before_install:
@@ -40,5 +56,6 @@ script:
     - composer check-platform-reqs --no-dev
     - ./tools/php_codesniffer/vendor/bin/phpcs . --severity=1
     - ./bin/php-security-checker
+    - ./bin/phpstan --memory-limit=4G --configuration=phpstan.neon.dist
     - export WP_MULTISITE=0; ./bin/phpunit --exclude-group=ms-required
     - export WP_MULTISITE=1; ./bin/phpunit --exclude-group=ms-excluded
diff --git a/bin/docker/phpstan b/bin/docker/phpstan
@@ -0,0 +1,4 @@
+
+#!/usr/bin/env bash
+
+docker-compose exec --user www-data app ./bin/phpstan "$@"
diff --git a/bin/install b/bin/install
@@ -3,50 +3,59 @@
 # Exit when any command fails
 set -e
 
-# Usage: bin/install [project_name] [styleguide_dir] [docker_network_name] [php_version]
+# Usage: bin/install --project=[project_name] --styleguide=[styleguide_dir] --network=[docker_network_name] --php=[php_version]
 #
-# Defaults: project_name = boxuk-wp-skeleton, styleguide_dir = empty, docker_network_name = boxuk-docker, php_version = 8.0
+# Defaults: project_name = boxuk-wp-skeleton, styleguide_dir = empty, docker_network_name = boxuk-docker, php_version = 8.2
+# All arguments are optional.
+
+# Set defaults
+export PROJECT_NAME="boxuk-wp-skeleton"
+export STYLEGUIDE_DIR=""
+export DOCKER_NETWORK_NAME="boxuk-docker"
+export PHP_VERSION="8.2"
 
 GREEN='\033[0;32m'
 BG_GREEN='\033[42m'
 BOLD='\033[1m'
 NC='\033[0m' # No Color
 
+# Thanks to: https://stackoverflow.com/a/14203146
+for i in "$@"; do
+  case $i in
+    --project=*)
+      export PROJECT_NAME="${i#*=}"
+      shift # past argument=value
+      ;;
+    --styleguide=*)
+      export STYLEGUIDE_DIR="${i#*=}"
+      shift # past argument=value
+      ;;
+    --network=*)
+      export DOCKER_NETWORK_NAME="${i#*=}"
+      shift # past argument=value
+      ;;
+    --php=*)
+      export PHP_VERSION="${i#*=}"
+      shift # past argument=value
+      ;;
+    -*|--*)
+      echo "Unknown option $i"
+      exit 1
+      ;;
+    *)
+      ;;
+  esac
+done
+
 # Remove any existing styleguide nginx conf if it exists
 rm -f docker/nginx/conf/styleguide.conf
 
 echo 'Setting up .env vars...';
 
-if [ $1 ]; then
-    echo -e "Using ${GREEN}${1}${NC} for PROJECT_NAME";
-    export PROJECT_NAME="${1}";
-else
-    echo -e "Using ${GREEN}boxuk-wp-skeleton${NC} for PROJECT_NAME";
-    export PROJECT_NAME="boxuk-wp-skeleton";
-fi
-
-if [ $2 ]; then
-    echo -e "Using ${GREEN}${2}${NC} for STYLEGUIDE_DIR";
-    export STYLEGUIDE_DIR="${2}";
-else
-    export STYLEGUIDE_DIR="";
-fi
-
-if [ $3 ]; then
-    echo -e "Using ${GREEN}${3}${NC} for DOCKER_NETWORK_NAME";
-    export DOCKER_NETWORK_NAME="${3}";
-else
-    echo -e "Using ${GREEN}boxuk-docker${NC} for DOCKER_NETWORK_NAME";
-    export DOCKER_NETWORK_NAME="boxuk-docker";
-fi
-
-if [ $4 ]; then
-    echo -e "Using ${GREEN}${4}${NC} for PHP_VERSION";
-    export PHP_VERSION="${4}";
-else
-    echo -e "Using ${GREEN}8.0${NC} for PHP_VERSION";
-    export PHP_VERSION="8.0";
-fi
+echo -e "Using ${GREEN}${PROJECT_NAME}${NC} for PROJECT_NAME";
+echo -e "Using ${GREEN}${STYLEGUIDE_DIR}${NC} for STYLEGUIDE_DIR";
+echo -e "Using ${GREEN}${DOCKER_NETWORK_NAME}${NC} for DOCKER_NETWORK_NAME";
+echo -e "Using ${GREEN}${PHP_VERSION}${NC} for PHP_VERSION";
 
 envsubst \$PROJECT_NAME,\$STYLEGUIDE_DIR,\$DOCKER_NETWORK_NAME,\$PHP_VERSION < .env.dist > .env
 envsubst \$PROJECT_NAME,\$STYLEGUIDE_DIR < ./docker/app/.env.dist > ./docker/app/.env

diff --git a/bin/vip-install b/bin/vip-install
@@ -5,7 +5,7 @@ set -e
 
 # Usage: bin/vip-install [project_name] [styleguide_dir] [docker_network_name] [PHP_VERSION]
 #
-# Defaults: project_name = boxuk-wp-skeleton, styleguide_dir = empty, docker_network_name = boxuk-docker, php_version = 8.0
+# Defaults: project_name = boxuk-wp-skeleton, styleguide_dir = empty, docker_network_name = boxuk-docker, php_version = 8.2
 
 GREEN='\033[0;32m'
 BG_GREEN='\033[42m'
@@ -61,8 +61,8 @@ if [ $4 ]; then
     echo -e "Using ${GREEN}${4}${NC} for PHP_VERSION";
     export PHP_VERSION="${4}";
 else
-    echo -e "Using ${GREEN}8.0${NC} for PHP_VERSION";
-    export PHP_VERSION="8.0";
+    echo -e "Using ${GREEN}8.2${NC} for PHP_VERSION";
+    export PHP_VERSION="8.2";
 fi
 
 envsubst \$PROJECT_NAME,\$STYLEGUIDE_DIR,\$DOCKER_NETWORK_NAME,\$PHP_VERSION < .env.dist > .env

diff --git a/composer.json b/composer.json
@@ -45,27 +45,28 @@
         "boxuk/wp-hook-attributes": "^0.0.2",
         "boxuk/wp-muplugin-loader": "^2.0",
         "cache/memcache-adapter": "^1.2",
-        "inpsyde/wonolog": "^1.0",
-        "inpsyde/wp-translation-downloader": "^2.0",
+        "inpsyde/wonolog": "^2.0",
+        "inpsyde/wp-translation-downloader": "^2.5",
         "jamesrwilliams/flagpole": "@beta",
         "oomphinc/composer-installers-extender": "^2",
         "roots/wordpress-core-installer": "^1.100",
-        "roots/wordpress-full": "^6.0",
-        "symfony/config": "^5.0 || ^6.0",
-        "symfony/dependency-injection": "^5.0 || ^6.0",
-        "symfony/dotenv": "^5.0 || ^6.0",
-        "symfony/yaml": "^5.0 || ^6.0",
+        "roots/wordpress-full": "^6.4",
+        "symfony/config": "^6.0 || ^7.0",
+        "symfony/dependency-injection": "^6.0 || ^7.0",
+        "symfony/dotenv": "^6.0 || ^7.0",
+        "symfony/yaml": "^6.0 || ^7.0",
         "wp-cli/scaffold-command": "^2.0",
-        "wp-cli/wp-cli": "^2.5",
-        "wpackagist-plugin/advanced-caching": "@dev",
+        "wp-cli/wp-cli": "^2.9",
         "wpackagist-plugin/memcached": "^4.0",
         "wpackagist-plugin/query-monitor": "^3.5",
         "wpackagist-plugin/surge": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7 || ^8 || ^9",
-        "wp-phpunit/wp-phpunit": "^6.0",
-        "yoast/phpunit-polyfills": "^1.0"
+        "phpstan/phpstan": "^1.10",
+        "phpunit/phpunit": "^9",
+        "szepeviktor/phpstan-wordpress": "^1.3",
+        "wp-phpunit/wp-phpunit": "^6.4",
+        "yoast/phpunit-polyfills": "^2"
     },
     "suggest": {
         "wp-cli/i18n-command": "Needed for the i18n-twig WP CLI command.",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@

		#!/usr/bin/env bash

		docker-compose exec --user www-data app ./bin/phpstan "$@"