Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8.2 to 8.4 upgrade #978

Merged
merged 7 commits into from
Jan 31, 2025
Merged

8.2 to 8.4 upgrade #978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
71e80e8
Upgraded php version to 8.4.2 from 8.2
dmols Jan 3, 2025
f6eaa23
Initial changes to allow UDOIT to run on 8.4
dmols Jan 8, 2025
796f4d5
Fixed many deprecations seen from symfony/php upgrade
dmols Jan 8, 2025
bd6c6cf
Final syntax fixes to allow UDOIT to load
dmols Jan 8, 2025
0d788b1
Added final tweaks to ensure UDOIT loads
dmols Jan 14, 2025
1208657
Minor change to CHANGELOG
dmols Jan 14, 2025
4e56fe0
Updated CHANGELOG
dmols Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, as well as work with a php version that has active support. (Thank you, [@dmols](https://github.com/dmols) and [@panbed](https://github.com/panbed))

## [3.5.0](https://github.com/ucfopen/UDOIT/compare/3.4.0...3.5.0) - 2024-11-12

### General
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.2-fpm
FROM php:8.4.2-fpm
ARG ENVIRONMENT_TYPE

#Install dependencies and php extensions
Expand Down
2 changes: 1 addition & 1 deletion build/nginx/Dockerfile.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/nginx/Dockerfile.php.pdo.mysql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
72 changes: 36 additions & 36 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,11 @@
"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": "*",
"ucfopen/phpally": "~1.2.1",
"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",
Expand All @@ -24,49 +22,51 @@
"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",
"symfony/apache-pack": "^1.0",
"symfony/asset": "6.0.*",
"symfony/console": "6.0.*",
"symfony/doctrine-messenger": "6.0.*",
"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"
"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": "6.0.*",
"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": {
Expand Down Expand Up @@ -104,7 +104,7 @@
"extra": {
"symfony": {
"allow-contrib": false,
"require": "6.0.*"
"require": "^6.4"
}
},
"repositories": [
Expand Down
Loading
Loading