Merge pull request #328 from boxuk/php8-default

[SETUP] Remove PHP 7.4, make PHP 8.0 the default installation
boxuk · Nov 16, 2022 · efe917d · efe917d
2 parents b2285da + 95818ad
commit efe917d
Show file tree

Hide file tree

Showing 14 changed files with 182 additions and 375 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. 7.4, 8.0 or 8.1.
+# Which version of PHP would you like to use? The major and minor version needed only, e.g. 8.0 or 8.1.
 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
@@ -51,18 +51,6 @@ updates:
         commit-message:
             prefix: "[DEPS]"
     # Docker app image.
-    -   package-ecosystem: docker
-        directory: "/docker/app/php7.4"
-        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.0"
         registries: "*"
@@ -159,18 +147,6 @@ updates:
             - dependency-name: "*"
               update-types: ["version-update:semver-major"]
     # Docker styleguide image.
-    -   package-ecosystem: docker
-        directory: "/docker/styleguide/php7.4"
-        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.0"
         registries: "*"

diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,6 @@ language: php
 dist: bionic
 
 php:
-    - 7.4
     - 8.0
     - 8.1.0 # See https://travis-ci.community/t/php-8-1-support/12439/16
 

diff --git a/bin/install b/bin/install
@@ -5,7 +5,7 @@ set -e
 
 # Usage: bin/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 = 7.4
+# Defaults: project_name = boxuk-wp-skeleton, styleguide_dir = empty, docker_network_name = boxuk-docker, php_version = 8.0
 
 GREEN='\033[0;32m'
 BG_GREEN='\033[42m'
@@ -44,8 +44,8 @@ if [ $4 ]; then
     echo -e "Using ${GREEN}${4}${NC} for PHP_VERSION";
     export PHP_VERSION="${4}";
 else
-    echo -e "Using ${GREEN}7.4${NC} for PHP_VERSION";
-    export PHP_VERSION="7.4";
+    echo -e "Using ${GREEN}8.0${NC} for PHP_VERSION";
+    export PHP_VERSION="8.0";
 fi
 
 envsubst \$PROJECT_NAME,\$STYLEGUIDE_DIR,\$DOCKER_NETWORK_NAME,\$PHP_VERSION < .env.dist > .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 = 7.4
+# Defaults: project_name = boxuk-wp-skeleton, styleguide_dir = empty, docker_network_name = boxuk-docker, php_version = 8.0
 
 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}7.4${NC} for PHP_VERSION";
-    export PHP_VERSION="7.4";
+    echo -e "Using ${GREEN}8.0${NC} for PHP_VERSION";
+    export PHP_VERSION="8.0";
 fi
 
 envsubst \$PROJECT_NAME,\$STYLEGUIDE_DIR,\$DOCKER_NETWORK_NAME,\$PHP_VERSION < .env.dist > .env
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,6 @@ language: php @@
     dist: bionic
     php:
-        - 7.4
         - 8.0
         - 8.1.0 # See https://travis-ci.community/t/php-8-1-support/12439/16
@@ Expand Down @@