From 5ff7bcf897e9b1ed6c064c832814b0f61e394a44 Mon Sep 17 00:00:00 2001
From: Camille Simiand <camille.simiand@tetras-libre.fr>
Date: Tue, 22 Feb 2022 18:20:27 +0100
Subject: [PATCH] Upgrade to PHP8.1 + fix Group entity ORM attribute
---
composer.json | 4 ++--
docker/legacy/Dockerfile | 2 +-
docker/symfony/Dockerfile | 9 ++-------
src/Entity/Group.php | 1 -
src/Entity/User.php | 1 -
5 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/composer.json b/composer.json
index b0f904e..b52caa2 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
"minimum-stability": "stable",
"prefer-stable": true,
"require": {
- "php": ">=8.0",
+ "php": ">=8.1",
"ext-ctype": "*",
"ext-curl": "*",
"ext-iconv": "*",
@@ -53,7 +53,7 @@
"symfonycasts/verify-email-bundle": "^1.6",
"twig/extra-bundle": "^2.12|^3.0",
"twig/twig": "^2.12|^3.0",
- "ext-gd": "*"
+ "ext-gd": "*"
},
"require-dev": {
"ext-dom": "*",
diff --git a/docker/legacy/Dockerfile b/docker/legacy/Dockerfile
index 2962377..ba35277 100644
--- a/docker/legacy/Dockerfile
+++ b/docker/legacy/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.0-apache
+FROM php:8.1-apache
COPY front.conf /etc/apache2/sites-enabled/000-default.conf
diff --git a/docker/symfony/Dockerfile b/docker/symfony/Dockerfile
index d25ae70..62e3a8c 100755
--- a/docker/symfony/Dockerfile
+++ b/docker/symfony/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.0-apache
+FROM php:8.1-apache
USER root
@@ -44,12 +44,7 @@ RUN docker-php-ext-install -j$(nproc) \
gd \
pdo_mysql \
mysqli \
- curl \
- zip \
- ctype \
- iconv \
- session \
- tokenizer
+ zip
# Install opcache extension for PHP accelerator
RUN docker-php-ext-install opcache \
diff --git a/src/Entity/Group.php b/src/Entity/Group.php
index fb504a5..f1cd3c6 100755
--- a/src/Entity/Group.php
+++ b/src/Entity/Group.php
@@ -32,7 +32,6 @@ class Group
* @var Collection<Capsule>
*/
#[ORM\ManyToMany(targetEntity:Capsule::class, inversedBy:'groups')]
- #[ORM\JoinColumn(name:'author', referencedColumnName: 'id', nullable: false)]
private Collection $capsules;
public function __construct()
diff --git a/src/Entity/User.php b/src/Entity/User.php
index eb7fa55..4e8ccf0 100755
--- a/src/Entity/User.php
+++ b/src/Entity/User.php
@@ -20,7 +20,6 @@ class User implements UserInterface, LegacyPasswordAuthenticatedUserInterface
#[ORM\Id]
#[ORM\GeneratedValue]
#[ORM\Column(type:'integer')]
- #[ReadOnly]
private int $id;
#[ORM\Column(name: 'accept_gnl_conditions', type: 'boolean')]
--
GitLab