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

WIP : Upgrade to PHP 8 #147

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
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
19 changes: 19 additions & 0 deletions api/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,22 @@ config/jwt/*.pem
###< phpunit/phpunit ###

public/media/**

###> symfony/framework-bundle ###
/.env.local
/.env.local.php
/.env.*.local
/config/secrets/prod/prod.decrypt.private.php
/public/bundles/
/var/
/vendor/
###< symfony/framework-bundle ###

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

###> lexik/jwt-authentication-bundle ###
/config/jwt/*.pem
###< lexik/jwt-authentication-bundle ###
14 changes: 14 additions & 0 deletions api/.php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php

$finder = (new PhpCsFixer\Finder())
->in(__DIR__)
->exclude('var')
;

return (new PhpCsFixer\Config())
->setRules([
'@Symfony' => true,
])
->setFinder($finder)
->setCacheFile('.php-cs-fixer.cache') // forward compatibility with 3.x line
;
2 changes: 1 addition & 1 deletion api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@


# https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
ARG PHP_VERSION=7.4.16
ARG PHP_VERSION=8.0
ARG OPENRESTY_VERSION=1.15.8.3
ARG VARNISH_VERSION=6.4

Expand Down
42 changes: 21 additions & 21 deletions api/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,37 @@
"description": "Smersh API for the Smersh app",
"license": "MIT",
"require": {
"php": "^7.4.16",
"php": "^8.0",
"ext-ctype": "*",
"ext-iconv": "*",
"api-platform/core": "^2.5",
"composer/package-versions-deprecated": "1.11.99.4",
"doctrine/annotations": "^1.0",
"doctrine/doctrine-bundle": "^2.3",
"doctrine/doctrine-migrations-bundle": "^2.0",
"doctrine/orm": "^2.7",
"gedmo/doctrine-extensions": "2.4.42",
"doctrine/orm": "^2.10.4",
"gedmo/doctrine-extensions": "v3.4.0",
"guzzlehttp/guzzle": "^6.3",
"lexik/jwt-authentication-bundle": "^2.8",
"locastic/api-platform-translation-bundle": "^v1.3.3",
"locastic/api-platform-translation-bundle": "^v1.3.4",
"nelmio/cors-bundle": "^2.1",
"phpdocumentor/reflection-docblock": "^5.2",
"stof/doctrine-extensions-bundle": "^1.4",
"symfony/asset": "5.1.*",
"symfony/console": "5.1.*",
"symfony/dotenv": "5.1.*",
"symfony/expression-language": "5.1.*",
"stof/doctrine-extensions-bundle": "^v1.7.0",
"symfony/asset": "5.2.*.*",
"symfony/console": "5.2.*",
"symfony/dotenv": "5.2.*",
"symfony/expression-language": "5.2.*",
"symfony/flex": "^1.1",
"symfony/framework-bundle": "5.1.*",
"symfony/framework-bundle": "5.2.*",
"symfony/mercure-bundle": "^0.2",
"symfony/property-access": "5.1.*",
"symfony/property-info": "5.1.*",
"symfony/proxy-manager-bridge": "5.1.*",
"symfony/security-bundle": "5.1.*",
"symfony/serializer": "5.1.*",
"symfony/twig-bundle": "5.1.*",
"symfony/validator": "5.1.*",
"symfony/yaml": "5.1.*",
"symfony/property-access": "5.2.*",
"symfony/property-info": "5.2.*",
"symfony/proxy-manager-bridge": "5.2.*",
"symfony/security-bundle": "5.2.*",
"symfony/serializer": "5.2.*",
"symfony/twig-bundle": "5.2.*",
"symfony/validator": "5.2.*",
"symfony/yaml": "5.2.*",
"vich/uploader-bundle": "^1.17"
},
"require-dev": {
Expand All @@ -46,8 +46,8 @@
"hautelook/alice-bundle": "^2.9",
"phpunit/phpunit": "^9.5",
"symfony/maker-bundle": "^1.23",
"symfony/stopwatch": "^5.1",
"symfony/web-profiler-bundle": "^5.1"
"symfony/stopwatch": "^5.2",
"symfony/web-profiler-bundle": "^5.2"
},
"conflict": {
"symfony/symfony": "*"
Expand Down Expand Up @@ -91,7 +91,7 @@
"extra": {
"symfony": {
"allow-contrib": false,
"require": "5.1.*"
"require": "5.2.*"
}
}
}
Loading