[GOVCMSD11-728] Update php8.3 to php8.4

.circleci/config.yml

@@ -3,7 +3,7 @@ version: '2.1'
 jobs:
   phpunit:
     docker:
-      - image: 'govcmstesting/ci:latest-php8.3-apache'
+      - image: 'govcmstesting/ci:latest-php8.4-apache'
         command: ["apache2-foreground"]
     working_directory: /app
     steps:
@@ -21,7 +21,7 @@ jobs:
 
   cypress:
     docker:
-      - image: 'govcmstesting/ci:latest-php8.3-apache'
+      - image: 'govcmstesting/ci:latest-php8.4-apache'
         command: ["apache2-foreground"]
     working_directory: /app
     steps:

.docker/Dockerfile.govcms

@@ -1,5 +1,5 @@
 # Set the PHP and GovCMS versions as arguments
-ARG PHP_VERSION=8.3
+ARG PHP_VERSION=8.4
 ARG GOVCMS_VERSION=10.x-latest
 ARG DRUPAL_VERSION=10.3
 

.github/dependabot.yml

@@ -7,7 +7,7 @@ updates:
       time: '07:00'
       timezone: Australia/Sydney
     open-pull-requests-limit: 15
-    target-branch: 3.x-develop
+    target-branch: 4.x-develop
     reviewers:
       - pandaskii
   - package-ecosystem: npm
@@ -16,6 +16,6 @@ updates:
       interval: daily
       time: '07:00'
       timezone: Australia/Sydney
-    target-branch: 3.x-develop
+    target-branch: 4.x-develop
     reviewers:
       - pandaskii

.github/workflows/cypress.yml

@@ -3,9 +3,9 @@ name: GovCMS CI Tests - Cypress
 
 on:  # yamllint disable-line rule:truthy
   push:
-    branches: ["3.x-develop"]
+    branches: ["4.x-develop"]
   pull_request:
-    branches: ["3.x-develop"]
+    branches: ["4.x-develop"]
 
 permissions:
   contents: read
@@ -16,7 +16,7 @@ jobs:
 
     services:
       web:
-        image: govcmstesting/ci:latest-php8.3-apache
+        image: govcmstesting/ci:latest-php8.4-apache
         ports:
           - 80:80
         volumes:

.github/workflows/generate_docs.yml

@@ -3,10 +3,10 @@ name: Generate test documentation
 
 on:  # yamllint disable-line rule:truthy
   push:
-    branches: ["3.x-develop"]
+    branches: ["4.x-develop"]
     paths: ['phpunit/**']
   pull_request:
-    branches: ["3.x-develop"]
+    branches: ["4.x-develop"]
     paths: ['phpunit/**']
 
 jobs:
@@ -22,7 +22,7 @@ jobs:
       - name: Set up PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3'
+          php-version: '8.4'
 
       - name: Run PHP script to generate Markdown
         run: |

.github/workflows/node.js.yml

@@ -3,9 +3,9 @@ name: Builder - Node.js
 
 on:  # yamllint disable-line rule:truthy
   push:
-    branches: ["3.x-develop"]
+    branches: ["4.x-develop"]
   pull_request:
-    branches: ["3.x-develop"]
+    branches: ["4.x-develop"]
 
 jobs:
   build:

.github/workflows/php.yml

@@ -3,9 +3,9 @@ name: Builder - PHP Composer
 
 on:  # yamllint disable-line rule:truthy
   push:
-    branches: ["3.x-develop"]
+    branches: ["4.x-develop"]
   pull_request:
-    branches: ["3.x-develop"]
+    branches: ["4.x-develop"]
 
 permissions:
   contents: read
@@ -18,7 +18,7 @@ jobs:
       - name: Set up PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3'
+          php-version: '8.4'
           extensions: mbstring
           coverage: none
 

.github/workflows/phpunit.yml

@@ -3,9 +3,9 @@ name: GovCMS CI Tests - PHPUnit
 
 on:  # yamllint disable-line rule:truthy
   push:
-    branches: ["3.x-develop"]
+    branches: ["4.x-develop"]
   pull_request:
-    branches: ["3.x-develop"]
+    branches: ["4.x-develop"]
 
 permissions:
   contents: read
@@ -16,7 +16,7 @@ jobs:
 
     services:
       web:
-        image: govcmstesting/ci:latest-php8.3-apache
+        image: govcmstesting/ci:latest-php8.4-apache
         ports:
           - 80:80
         volumes:

Dockerfile

@@ -1,5 +1,5 @@
 # Stage 1: Build stage
-ARG PHP_VERSION=8.3
+ARG PHP_VERSION=8.4
 FROM govcmstesting/php:${PHP_VERSION}-cli AS builder
 
 # Set the working directory

Dockerfile.ci

@@ -1,5 +1,5 @@
 # Set the PHP and GovCMS versions as arguments
-ARG PHP_VERSION=8.3
+ARG PHP_VERSION=8.4
 ARG GOVCMS_VERSION=10.x-beta
 
 # Use multi-stage builds for better optimization

Makefile

@@ -4,7 +4,7 @@
 VERSION ?= latest
 
 # PHP versions
-PHP_VERSIONS := 8.1 8.2 8.3
+PHP_VERSIONS := 8.1 8.2 8.3 8.4
 
 # Supported architectures
 ARCHS := linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8
@@ -61,23 +61,23 @@ $(foreach type,tests ci,$(foreach v,$(PHP_VERSIONS),$(eval $(call release-target
 # Examples
 examples:
 	@echo "Examples of how to use this Makefile:"
-	@echo "1. Build PHP 8.3 image for tests:"
-	@echo "   make build-tests-8.3"
-	@echo "2. Test CI image for PHP 8.3:"
-	@echo "   make test-ci-8.3"
-	@echo "3. Push PHP 8.3 image for tests:"
-	@echo "   make push-tests-8.3"
+	@echo "1. Build PHP 8.4 image for tests:"
+	@echo "   make build-tests-8.4"
+	@echo "2. Test CI image for PHP 8.4:"
+	@echo "   make test-ci-8.4"
+	@echo "3. Push PHP 8.4 image for tests:"
+	@echo "   make push-tests-8.4"
 	@echo "4. Build all PHP versions for tests and CI:"
 	@echo "   make all"
 	@echo "5. Release all images:"
 	@echo "   make release-all"
-	@echo "6. Build, test, and push PHP 8.3 CI image:"
-	@echo "   make release-ci-8.3"
-	@echo "7. Build, test, and push PHP 8.3 tests image:"
-	@echo "   make release-tests-8.3"
-	@echo "8. Release a specific version (e.g., v1.0.0) for PHP 8.3 CI image:"
-	@echo "   make VERSION=1.0.0 release-ci-8.3"
-	@echo "9. Release a specific version (e.g., v1.0.0) for PHP 8.3 tests image:"
-	@echo "   make VERSION=1.0.0 release-tests-8.3"
+	@echo "6. Build, test, and push PHP 8.4 CI image:"
+	@echo "   make release-ci-8.4"
+	@echo "7. Build, test, and push PHP 8.4 tests image:"
+	@echo "   make release-tests-8.4"
+	@echo "8. Release a specific version (e.g., v1.0.0) for PHP 8.4 CI image:"
+	@echo "   make VERSION=1.0.0 release-ci-8.4"
+	@echo "9. Release a specific version (e.g., v1.0.0) for PHP 8.4 tests image:"
+	@echo "   make VERSION=1.0.0 release-tests-8.4"
 	@echo "10. Release a specific version (e.g., v1.0.0) for all images:"
 	@echo "   make VERSION=1.0.0 release-all"