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.

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

Patch PHP up to PHP 8.2 #1570

Merged
merged 6 commits into from
Mar 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 0 additions & 6 deletions api/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@
/.env.*.local
/vendor/
###< symfony/framework-bundle ###

###> friendsofphp/php-cs-fixer ###
/.php_cs
/.php_cs.cache
###< friendsofphp/php-cs-fixer ###

###> phpunit/phpunit ###
/phpunit.xml
.phpunit.result.cache
Expand Down
14 changes: 0 additions & 14 deletions api/.php-cs-fixer.dist.php

This file was deleted.

5 changes: 3 additions & 2 deletions api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:7.4-fpm-alpine AS api_platform_php
FROM php:8.2-fpm-alpine AS api_platform_php

# Create a user
RUN addgroup -S -g 101 commonground-gateway && adduser -S -D -u 101 commonground-gateway
Expand All @@ -18,7 +18,7 @@ RUN apk add --no-cache \
bash \
;

ARG APCU_VERSION=5.1.17
ARG APCU_VERSION=5.1.21
ARG SQLSRV_VERSION=5.10.1

RUN set -eux; \
Expand Down Expand Up @@ -48,6 +48,7 @@ RUN set -eux; \
pcntl \
gd \
gmp \
ftp \
; \
pecl install \
apcu-${APCU_VERSION} \
Expand Down
35 changes: 24 additions & 11 deletions api/composer.json
Original file line number Diff line number Diff line change
@@ -1,41 +1,51 @@
{
"type": "project",
"license": "proprietary",
"minimum-stability": "stable",
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"php": "^7.4.0",
"php": "^7.4.0 || ^8.1.0 || ^8.2.0",
"ext-ctype": "*",
"ext-fileinfo": "*",
"ext-iconv": "*",
"ext-json": "*",
"adbario/php-dot-notation": "^3",
"alcaeus/mongo-php-adapter": "^1.2",
"api-platform/core": "^2.6",
"beberlei/doctrineextensions": "^1.3",
"commongateway/corebundle": "^1.2.30",
"commongateway/corebundle": "dev-feature/MF-62/doctrine",
"composer/ca-bundle": "*",
"composer/package-versions-deprecated": "1.11.99.3",
"conduction/commongroundbundle": "dev-feature-gateway",
"conduction/digidbundle": "dev-master",
"conduction/samlbundle": "dev-master",
"doctrine/annotations": "^1.0",
"doctrine/doctrine-bundle": "^2.4",
"composer/semver": "*",
"composer/xdebug-handler": "*",
"doctrine/annotations": "^1.14",
"doctrine/doctrine-bundle": "^2.7",
"doctrine/doctrine-fixtures-bundle": "^3.2",
"doctrine/doctrine-migrations-bundle": "^3.1",
"doctrine/orm": "^2.9",
"doctrine/event-manager": "^1.2",
"doctrine/lexer": "^2.0",
"doctrine/orm": "^2.14",
"doctrine/persistence": "^2.4",
"dompdf/dompdf": "^2",
"endroid/qr-code-bundle": "3.4",
"friendsofphp/proxy-manager-lts": "*",
"gedmo/doctrine-extensions": "^3.5",
"guzzlehttp/guzzle": "6.5.8",
"guzzlehttp/psr7": "1.9",
"hautelook/alice-bundle": "^2.9.0",
"jwadhams/json-logic-php": "^1.4",
"laminas/laminas-code": "*",
"laminas/laminas-escaper": "*",
"league/flysystem-bundle": "^2.4",
"league/flysystem-ftp": "^2.4",
"league/html-to-markdown": "*",
"mongodb/mongodb": "^1.15",
"monolog/monolog": "^2.8.0",
"nelmio/cors-bundle": "^2.1",
"phpdocumentor/reflection-docblock": "^5.2",
"phpoffice/phpspreadsheet": "^1.29",
"phpoffice/phpword": "^0.18.2",
"ramsey/uuid": "*",
"ramsey/uuid-doctrine": "^2.0",
"respect/validation": "^2.2",
"setono/cron-expression-bundle": "^1.5",
"symfony/asset": "5.3.*",
Expand All @@ -49,6 +59,7 @@
"symfony/mailer": "5.3.*",
"symfony/mailgun-mailer": "5.3.*",
"symfony/messenger": "5.3.*",
"symfony/process": "5.3.*",
"symfony/property-access": "5.3.*",
"symfony/property-info": "5.3.*",
"symfony/proxy-manager-bridge": "5.3.*",
Expand All @@ -59,7 +70,9 @@
"symfony/twig-bundle": "5.3.*",
"symfony/validator": "5.3.*",
"symfony/web-profiler-bundle": "5.3.*",
"symfony/yaml": "5.3.*"
"symfony/yaml": "5.3.*",
"thecodingmachine/safe": "*",
"web-token/jwt-framework": "*"
},
"config": {
"optimize-autoloader": true,
Expand Down
Loading
Loading