Commit d4813fdf authored by Florian Joriot's avatar Florian Joriot
Browse files

Merge remote-tracking branch 'origin/master'

parents 5949f74f ea2fcb71

CHANGELOG.md

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


## Notes de mise à jour



PHP 8.2 est maintenant requis

A partir la V23 uniquement, PHP 8.2 est maintenant obligatoire.

admin/src/Console.php

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ class Console implements \BddAdmin\Logger\LoggerInterface 






    public function getArg(int $index = null): string

    public function getArg(int $index = null): ?string

    {

        $args = isset($_SERVER['argv']) ? $_SERVER['argv'] : [];

composer.json

+3 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
    ],

    "require"          : {

        "php"                                         : ">=8.2",

        "unicaen/app"                                 : "dev-php82 as 6.0.6",

        "unicaen/app"                                 : "6.1.1",

        "unicaen/authentification"                    : "dev-php82 as 6.0.1",

        "unicaen/privilege"                           : "6.0.1",

        "unicaen/utilisateur"                         : "dev-php82",
@@ -22,7 +22,8 @@ 
        "unicaen/mail"                                : "dev-php82",

        "unicaen/vue"                                 : "dev-php82",

        "laminas/laminas-cache-storage-adapter-memory": "2.2.0",

        "laminas/laminas-text"                        : "2.10"

        "laminas/laminas-text"                        : "2.10",

        "unicaen/console"                             : "dev-php82"

    },

    "require-dev"      : {

        "squizlabs/php_codesniffer"         : "*",

module/Mission/config/offre-emploi.config.php

+2 −2
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ return [ 
                    'icon'     => 'fas fa-duotone fa-pen-to-square',

                    'title'    => "Offre",

                    'route'    => 'offre-emploi',

                    'resource' => PrivilegeController::getResourceId(OffreEmploiController::class, 'index'),

                    'resource' => Privileges::getResourceId(Privileges::MISSION_OFFRE_EMPLOI_AJOUTER),

                    'order'    => 60,

                    'color'    => '#217DD8',

                    'pages'    => [
@@ -139,7 +139,7 @@ return [ 
                            'label'    => "Consulter la liste des offres",

                            'title'    => "Consulter la liste des emplois étudiants",

                            'route'    => 'offre-emploi',

                            'resource' => PrivilegeController::getResourceId(OffreEmploiController::class, 'index'),

                            'resource' => Privileges::getResourceId(Privileges::MISSION_OFFRE_EMPLOI_AJOUTER),

                            'order'    => 10,

                            'color'    => '#217DD8',

                        ],