Commit 7d107ba3 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Passage à PHP 8

parent a5699cd3
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line

ARG PHP_VERSION

FROM registre.unicaen.fr:5000/unicaen-dev-php${PHP_VERSION}-apache
#FROM registre.unicaen.fr:5000/unicaen-dev-php${PHP_VERSION}-apache
FROM unicaen-dev-php${PHP_VERSION}-apache

LABEL maintainer="Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>"

+9 −7
Original line number Diff line number Diff line
@@ -13,25 +13,27 @@ Docker
- Obtention de l'image de base Unicaen (construite) à jour

```bash
PHP_VERSION=7.4 ;
PHP_VERSION=8.0 \
docker pull registre.unicaen.fr:5000/unicaen-dev-php${PHP_VERSION}-apache
```

- Construction de l'image du web service

```bash
PHP_VERSION=8.0 \
docker build \
--build-arg HTTP_PROXY \
--build-arg HTTPS_PROXY \
--build-arg NO_PROXY \
--build-arg PHP_VERSION \
-t sygal-import-ws-image-php${PHP_VERSION} .
-t sygal-import-ws-image-php${PHP_VERSION} \
.
```

- Lancement du web service

```bash
docker-compose up
docker-compose up sygal-import-ws
```


@@ -47,10 +49,10 @@ Lancement du web service *pour le dévelopement*
Se placer à la racine des sources du ws pour lancer la commande suivante :

```bash
docker-compose up --build
docker-compose up --build sygal-import-ws
```

Vérifier que le container `sygal-import-ws-container` figure bien dans la liste des containers
Vérifier que le container `sygal-import-ws-container-php8.0` figure bien dans la liste des containers
lancés listés par la commande suivante (cf. colonne `NAMES`) :

```bash
@@ -119,9 +121,9 @@ Afin d'obtenir les informations spécifiques à une donnée, il est possible d'a
curl --insecure --header "Accept: application/json" --header "Authorization: Basic xxxx" https://localhost:8443/v2/variable/ETB_LIB_NOM_RESP
```

Pour mettre en forme le JSON retourné et faciliter la lecture, une solution est d'utiliser `python -m json.tool`:
Pour mettre en forme le JSON retourné et faciliter la lecture, une solution est d'utiliser `python`:
```bash
curl --insecure --header "Accept: application/json" --header "Authorization: Basic xxxx" https://localhost:8443/v2/variable | python -m json.tool
curl --insecure --header "Accept: application/json" --header "Authorization: Basic xxxx" https://localhost:8443/v2/variable | python3 -m json.tool
```


+26 −20
Original line number Diff line number Diff line
@@ -3,6 +3,14 @@
    "description": "Web service d'accès aux données des établissements pour nourrir SyGAL",
    "type": "project",
    "repositories": [
        {
            "type": "vcs",
            "url": "https://github.com/orderadmin/api-tools-doctrine.git"
        },
        {
            "type": "vcs",
            "url": "https://github.com/orderadmin/api-tools-doctrine-querybuilder.git"
        },
        {
            "type": "composer",
            "url": "https://gest.unicaen.fr/packagist"
@@ -16,33 +24,31 @@
            "laminas/laminas-dependency-plugin": true
        }
    },
    "minimum-stability": "dev",
    "prefer-stable": true,
    "require": {
        "php": "^7.4.0",
        "doctrine/common": "^2.7",
        "doctrine/doctrine-orm-module": "^1.1",
        "laminas-api-tools/api-tools": "^1.3",
        "laminas-api-tools/api-tools-doctrine": "^2.1",
        "php": "^8.0",
        "doctrine/doctrine-orm-module": "^5.3",
        "laminas-api-tools/api-tools": "^1.6",
        "laminas-api-tools/api-tools-doctrine": "2.5.x-dev",
        "laminas-api-tools/api-tools-doctrine-querybuilder": "1.10.x-dev",
        "laminas-api-tools/api-tools-documentation": "^1.2",
        "laminas/laminas-console": "^2.7",
        "laminas/laminas-dependency-plugin": "^2.1",
        "laminas/laminas-development-mode": "^3.0",
        "laminas/laminas-component-installer": "^2.7",
        "laminas/laminas-log": "^2.9",
        "laminas/laminas-mvc-console": "^1.2",
        "laminas/laminas-mvc-i18n": "^1.7",
        "monolog/monolog": "^1.26",
        "unicaen/oracle": "^3.0",
        "webmozart/assert": "^1.9",
        "laminas/laminas-component-installer": "^2.7",
        "laminas/laminas-cache": "^2.7.1",
        "laminas/laminas-mvc-i18n": "^1.0"
        "unicaen/console": "^6.0",
        "unicaen/oracle": "dev-release_4.0.0",
        "webmozart/assert": "^1.9"
    },
    "require-dev": {
        "laminas-api-tools/api-tools-admin": "^1.5",
        "laminas/laminas-developer-tools": "^1.1",
        "laminas/laminas-test": "^3.2",
        "phpunit/phpunit": "^6.5",
        "laminas/laminas-dependency-plugin": "^2.1",
        "laminas/laminas-development-mode": "^3.2",
        "laminas/laminas-developer-tools": "^2.3",
        "laminas/laminas-test": "^4.0",
        "phpunit/phpunit": "^8.0",
        "squizlabs/php_codesniffer": "^3.3",
        "zfcampus/zf-deploy": "^1.2",
        "laminas-api-tools/api-tools-asset-manager": "^1.0",
        "laminas-api-tools/api-tools-asset-manager": "^1.5",
        "laminas/laminas-composer-autoloading": "^2.0"
    },
    "autoload": {
+3897 −4147

File changed.

Preview size limit exceeded, changes collapsed.

+0 −20
Original line number Diff line number Diff line
<?php
/**
 * @license   http://opensource.org/licenses/BSD-3-Clause BSD-3-Clause
 * @copyright Copyright (c) 2014-2016 Zend Technologies USA Inc. (http://www.zend.com)
 */

use Laminas\ApiTools\Admin\Model\ModulePathSpec;

return [
    'view_manager' => [
        'display_exceptions' => true,
    ],
    'api-tools-admin' => [
        'path_spec' => ModulePathSpec::PSR_4,
    ],
    'api-tools-configuration' => [
        'enable_short_array' => true,
        'class_name_scalars' => true,
    ],
];
Loading