Commit db592f2e authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Merge branch 'PHP8'

parents fc18b3bb 6b457cd0

.gitignore

+2 −2
Original line number Diff line number Diff line
@@ -4,5 +4,5 @@ upload/ 
config/autoload/*local*

composer.lock

vendor

!/public/vendor

/public/css/local.css
 
!public/vendor

!public/unicaen/app/vendor
 
 No newline at end of file

Dockerfile

+15 −0
Original line number Diff line number Diff line
@@ -37,5 +37,20 @@ ADD docker/fpm/conf.d/99-app.ini ${PHP_CONF_DIR}/fpm/conf.d/ 
# Copie des scripts complémentaires à lancer au démarrage du container

COPY docker/entrypoint.d/* /entrypoint.d/



## Package PHP Oracle OCI8

ADD docker/resources/instantclient-basiclite-linux.x64-18.5.0.0.0dbru.zip /tmp/

ADD docker/resources/instantclient-sdk-linux.x64-18.5.0.0.0dbru.zip /tmp/

ADD docker/resources/instantclient-sqlplus-linux.x64-18.5.0.0.0dbru.zip /tmp/

RUN unzip -o /tmp/instantclient-basiclite-linux.x64-18.5.0.0.0dbru.zip -d /usr/local/ && \

    unzip -o /tmp/instantclient-sdk-linux.x64-18.5.0.0.0dbru.zip -d /usr/local/ && \

    unzip -o /tmp/instantclient-sqlplus-linux.x64-18.5.0.0.0dbru.zip -d /usr/local/ && \

    ln -s /usr/local/instantclient_18_5 /usr/local/instantclient && \

    ln -s /usr/local/instantclient/sqlplus /usr/bin/sqlplus

RUN echo 'instantclient,/usr/local/instantclient' | pecl install oci8-3.0.1

RUN echo "extension=oci8.so" > ${PHP_CONF_DIR}/fpm/conf.d/30-php-oci8.ini

RUN echo "extension=oci8.so" > ${PHP_CONF_DIR}/cli/conf.d/30-php-oci8.ini

RUN echo "/usr/local/instantclient" > /etc/ld.so.conf.d/oracle-instantclient.conf

RUN ldconfig



RUN a2ensite app app-ssl && \

    service php${PHP_VERSION}-fpm reload

composer.json

+18 −14
Original line number Diff line number Diff line
@@ -9,22 +9,26 @@ 
  ],

  "minimum-stability": "dev",

  "require": {

    "unicaen/app": "5.1.9",

    "unicaen/authentification": "^5.0",

    "unicaen/utilisateur": "^5.0",

    "unicaen/privilege": "^5.0",

    "unicaen/renderer": "^5.0",

    "unicaen/pdf": "^5",

    "unicaen/mail": "5.0.7",

    "unicaen/parametre": "^5.0",

    "unicaen/bjy-authorize": "^4",

    "unicaen/ldap": "^4",

    "unicaen/evenement": "^5.0",

    "unicaen/autoform": "^5.0",

    "unicaen/app": "^6",

    "unicaen/authentification": "^6",

    "unicaen/utilisateur": "^6",

    "unicaen/privilege": "^6",

    "unicaen/renderer": "^6",

    "unicaen/pdf": "^6",

    "unicaen/mail": "^6",

    "unicaen/parametre": "^6",

    "unicaen/bjy-authorize": "^5",

    "unicaen/ldap": "^7",

    "unicaen/evenement": "^6",

    "unicaen/autoform": "^6",

    "unicaen/aide": "^0",

    "ext-json": "*",

    "unicaen/indicateur": "^0.0",

    "unicaen/instadia": "^0.0"

    "unicaen/indicateur": "^0",

    "unicaen/synchro": "^6.0",



    "unicaen/utilisateur-ldap-adapter" : "^2.0",

    "unicaen/etat": "6.x-dev",

    "unicaen/validation": "^6.0"

  },

  "require-dev": {

    "laminas/laminas-developer-tools": ">=1.0"

config/application.config.php

+3 −3
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ $modules = [ 
    'Laminas\InputFilter',

    'Laminas\Log',

    'Laminas\Mail',

    'Laminas\Mvc\Console',

    'Laminas\Mvc\I18n',

    'Laminas\Mvc\Plugin\FilePrg',

    'Laminas\Mvc\Plugin\FlashMessenger',
@@ -28,7 +27,7 @@ $modules = [ 
    'UnicaenPrivilege',

    'UnicaenAuthentification',

    'UnicaenUtilisateurLdapAdapter',

    'UnicaenUtilisateurOctopusAdapter',

//    'UnicaenUtilisateurOctopusAdapter',

    'UnicaenUtilisateur',

    'UnicaenAutoform',

    'UnicaenEtat',
@@ -40,7 +39,8 @@ $modules = [ 
    'UnicaenEvenement',

    'UnicaenAide',

    'UnicaenIndicateur',

    'Referentiel',

    'Unicaen\Console',

    'UnicaenSynchro',



    'Structure',

    'EntretienProfessionnel',

config/autoload/unicaen-app.global.php

+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ return [ 
        'app_infos' => [

            'nom'     => "EMC2",

            'desc'    => "Emploi Mobilité Carrière Compétences",

            'version' => "3.2.7",

            'date'    => "27/07/2023",

            'version' => "4.0.0",

            'date'    => "11/10/2023",



//            'liens' => [

//                'COMUE' => [