Merge remote-tracking branch 'origin/8.4.2-php-upgrade' into equal-ac…

…cess
ucfopen · Jan 9, 2025 · 7afd90e · 7afd90e
2 parents 1bea39a + bd6c6cf
commit 7afd90e
Show file tree

Hide file tree

Showing 23 changed files with 1,645 additions and 1,848 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@
 Please update this file as you open PRs and make changes to the codebase. Thank you!
 ## [Unreleased](https://github.com/ucfopen/UDOIT/tree/dev)
 
+## [4.0] -- In Progress
+
+- Updated UDOIT's PHP version from 8.2 to 8.4 to avoid issues pulling the latest composer image, and continue with a php version that has active support. (Thank you, [@dmols](https://github.com/dmols))
+
 ## [3.5.0](https://github.com/ucfopen/UDOIT/compare/3.4.0...3.5.0) - 2024-11-12
 
 ### General

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.2-fpm
+FROM php:8.4.2-fpm
 ARG ENVIRONMENT_TYPE
 
 #Install dependencies and php extensions

diff --git a/build/nginx/Dockerfile.build b/build/nginx/Dockerfile.build
@@ -1,4 +1,4 @@
-FROM php:8.2-fpm
+FROM php:8.4.2-fpm
 
 RUN apt-get update -y \
     && apt-get install -y nginx libpng-dev zlib1g-dev git unzip

diff --git a/build/nginx/Dockerfile.php.pdo.mysql b/build/nginx/Dockerfile.php.pdo.mysql
@@ -1,4 +1,4 @@
-FROM php:8.2-fpm
+FROM php:8.4.2-fpm
 
 # PHP extensions
 RUN apt-get update && apt-get install -y libpng-dev zlib1g-dev git unzip

diff --git a/composer.json b/composer.json
@@ -7,13 +7,12 @@
     "version": "3.1.0",
     "license": "GPL-3.0-only",
     "require": {
-        "php": "^7.4.0 || ^8.1 || ^8.2",
+        "php": "^7.4.0 || ^8.1 || ^8.2 || ^8.4",
         "ext-ctype": "*",
         "ext-iconv": "*",
         "ext-sodium": "*",
         "aws/aws-sdk-php": "^3.324",
         "composer/package-versions-deprecated": "1.11.99.3",
-        "doctrine/annotations": "^1.0",
         "doctrine/doctrine-bundle": "^2.4",
         "doctrine/doctrine-migrations-bundle": "^3.1",
         "doctrine/orm": "^2.9",
@@ -24,52 +23,52 @@
         "mpdf/mpdf": "^8.0",
         "oro/doctrine-extensions": "^2.0",
         "phpdocumentor/reflection-docblock": "^5.2",
+        "phpstan/phpdoc-parser": "^0.5.3",
         "sensio/framework-extra-bundle": "^6.2",
         "sunra/php-simple-html-dom-parser": "1.5.2",
         "symfony/apache-pack": "^1.0",
-        "symfony/asset": "6.0.*",
-        "symfony/console": "6.0.*",
-        "symfony/doctrine-messenger": "6.0.*",
-        "symfony/dom-crawler": "^6.4",
-        "symfony/dotenv": "6.0.*",
-        "symfony/expression-language": "6.0.*",
+        "symfony/asset": "^6.4",
+        "symfony/console": "^6.4",
+        "symfony/doctrine-messenger": "^6.4",
+        "symfony/dotenv": "^6.4",
+        "symfony/expression-language": "^6.4",
         "symfony/flex": "^1.3.1",
-        "symfony/form": "6.0.*",
-        "symfony/framework-bundle": "6.0.*",
-        "symfony/http-client": "6.0.*",
-        "symfony/intl": "6.0.*",
-        "symfony/mailer": "6.0.*",
-        "symfony/messenger": "6.0.*",
+        "symfony/form": "^6.4",
+        "symfony/framework-bundle": "^6.4",
+        "symfony/http-client": "^6.4",
+        "symfony/intl": "^6.4",
+        "symfony/mailer": "^6.4",
+        "symfony/messenger": "^6.4",
         "symfony/monolog-bundle": "^3.1",
-        "symfony/notifier": "6.0.*",
-        "symfony/process": "6.0.*",
-        "symfony/property-access": "6.0.*",
-        "symfony/property-info": "6.0.*",
-        "symfony/proxy-manager-bridge": "6.0.*",
-        "symfony/security-bundle": "6.0.*",
-        "symfony/serializer": "6.0.*",
-        "symfony/string": "6.0.*",
-        "symfony/translation": "6.0.*",
-        "symfony/twig-bundle": "6.0.*",
-        "symfony/uid": "6.0.*",
-        "symfony/validator": "6.0.*",
-        "symfony/web-link": "6.0.*",
+        "symfony/notifier": "^6.4",
+        "symfony/process": "^6.4",
+        "symfony/property-access": "^6.4",
+        "symfony/property-info": "^6.4",
+        "symfony/proxy-manager-bridge": "^6.4",
+        "symfony/security-bundle": "^6.4",
+        "symfony/serializer": "^6.4",
+        "symfony/string": "^6.4",
+        "symfony/translation": "^6.4",
+        "symfony/twig-bundle": "^6.4",
+        "symfony/uid": "^6.4",
+        "symfony/validator": "^6.4",
+        "symfony/web-link": "^6.4",
         "symfony/webpack-encore-bundle": "^1.7",
-        "symfony/yaml": "6.0.*",
+        "symfony/yaml": "^6.4",
         "twig/extra-bundle": "^2.12|^3.0",
         "twig/twig": "^2.12|^3.0",
         "ucfopen/phpally": "~1.2.1"
     },
     "require-dev": {
         "doctrine/doctrine-fixtures-bundle": "^3.4",
         "phpunit/phpunit": "^9.5",
-        "symfony/browser-kit": "6.0.*",
-        "symfony/css-selector": "^7.1",
-        "symfony/debug-bundle": "6.0.*",
+        "symfony/browser-kit": "^6.4",
+        "symfony/css-selector": "^6.4",
+        "symfony/debug-bundle": "^6.4",
         "symfony/maker-bundle": "^1.0",
-        "symfony/phpunit-bridge": "^6.0",
-        "symfony/stopwatch": "6.0.*",
-        "symfony/web-profiler-bundle": "6.0.*"
+        "symfony/phpunit-bridge": "^6.4",
+        "symfony/stopwatch": "^6.4",
+        "symfony/web-profiler-bundle": "^6.4"
     },
     "config": {
         "preferred-install": {
@@ -107,7 +106,7 @@
     "extra": {
         "symfony": {
             "allow-contrib": false,
-            "require": "6.0.*"
+            "require": "^6.4"
         }
     },
     "repositories": [