Commit 1c8eb8b8 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Passage à PHP 7.3

parent fc1297e1

Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -24,4 +24,4 @@ COPY . /app 


WORKDIR /app



RUN composer install
 
RUN composer install --no-dev --no-suggest --prefer-dist --optimize-autoloader

composer.json

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
        "process-timeout": 5000

    },

    "require": {

        "php": "^7.0",

        "php": "^7.3.0",

        "zendframework/zend-component-installer": "^1.0 || ^0.6 || ^1.0.0-dev@dev",

        "zfcampus/zf-apigility": "^1.3",

        "zfcampus/zf-apigility-documentation": "^1.2.3",

composer.lock

+1103 −395

File changed.

Preview size limit exceeded, changes collapsed.

config/modules.config.old

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
<?php

/**

 * Configuration file generated by ZF Apigility Admin

 *

 * The previous config file has been stored in ./config/modules.config.old

 */

return [

    'Zend\\Cache',

    'Zend\\Form',

    'Zend\\Db',

    'Zend\\Filter',

    'Zend\\Hydrator',

    'Zend\\InputFilter',

    'Zend\\Paginator',

    'Zend\\Router',

    'Zend\\Validator',

    'ZF\\Apigility',

    'ZF\\Apigility\\Documentation',

    'ZF\\ApiProblem',

    'ZF\\Configuration',

    'ZF\\OAuth2',

    'ZF\\MvcAuth',

    'ZF\\Hal',

    'ZF\\ContentNegotiation',

    'ZF\\ContentValidation',

    'ZF\\Rest',

    'ZF\\Rpc',

    'ZF\\Versioning',

    'DoctrineModule',

    'DoctrineORMModule',

    'Phpro\\DoctrineHydrationModule',

    'ZF\\Apigility\\Doctrine\\Server',

    'Application',

];

docker-compose.yml

+3 −3
Original line number Diff line number Diff line
@@ -2,12 +2,12 @@ version: "2" 


services:

  sygal-import-ws:

#    image: sygal-import-ws-image-php7.0

#    image: sygal-import-ws-image-php7.3

    build:

      context: .

      args:

        - PHP_VERSION=7.0

    container_name: sygal-import-ws-container-php7.0

        - PHP_VERSION=7.3

    container_name: sygal-import-ws-container-php7.3

    environment:

      - http_proxy

      - https_proxy