Commit beb0772f authored by Thomas Hamel's avatar Thomas Hamel
Browse files

ajout de la compatibilité avec php8.4

parent b25659f6

composer.json

+2 −2
Changes for composer.json: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ 
        }

    ],

    "require": {

        "unicaen/app": "^7.0",

        "unicaen/app": "^7.0|^8.0",

        "unicaen/mail": "^7.0",

        "unicaen/zfc-user": "^6.1"

        "unicaen/zfc-user":"^6.0||^7.0"

    },

    "require-dev": {

        "phpunit/phpunit": ">=3.7"

src/UnicaenUtilisateur/Controller/UtilisateurController.php

+1 −1
Changes for src/UnicaenUtilisateur/Controller/UtilisateurController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ class UtilisateurController extends AbstractActionController 
            $form->setData($data);

            if ($form->isValid()) {

                try {

                    $utilisateur = $fom->getData();

                    $utilisateur = $form->getData();

                    $this->userService->update($utilisateur);

                    $this->flashMessenger()->addSuccessMessage(sprintf("Utilisateur <strong>%s</strong> modifié avec succès.", $utilisateur->getDisplayName()));

                } catch (RuntimeException $e) {

src/UnicaenUtilisateur/Controller/UtilisateurControllerFactory.php

+1 −1
Changes for src/UnicaenUtilisateur/Controller/UtilisateurControllerFactory.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ class UtilisateurControllerFactory implements FactoryInterface 
     * @throws ContainerExceptionInterface

     * @throws NotFoundExceptionInterface

     */

    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)

    public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)

    {

        /**

         * @var IdentityService $identityService

src/UnicaenUtilisateur/Entity/Db/AbstractUserRole.php

+1 −1
Changes for src/UnicaenUtilisateur/Entity/Db/AbstractUserRole.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ abstract class AbstractUserRole implements UserRoleInterface 
     */

    public function removePerimetre(PerimetreUserRoleInterface $perimetre)

    {

        $this->perimetres->removeElement($role);

        $this->perimetres->removeElement($perimetre);

        $perimetre->setUserRole(null);



        return $this;

src/UnicaenUtilisateur/Entity/Db/HistoriqueAwareTrait.php

+2 −2
Changes for src/UnicaenUtilisateur/Entity/Db/HistoriqueAwareTrait.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ trait HistoriqueAwareTrait 
     * @param DateTime|null $dateObs Date d'observation éventuelle

     * @return bool

     */

    public function estHistorise(DateTime $dateObs = null): bool

    public function estHistorise(?DateTime $dateObs = null): bool

    {

        return !$this->estNonHistorise($dateObs);

    }
@@ -131,7 +131,7 @@ trait HistoriqueAwareTrait 
     * @param DateTime|null $dateObs Date d'observation éventuelle

     * @return bool

     */

    public function estNonHistorise(DateTime $dateObs = null): bool

    public function estNonHistorise(?DateTime $dateObs = null): bool

    {

        if (empty($dateObs)) {

            $dateObs = new DateTime();