Commit 21c26534 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'release_6.0.0_php8'

parents 048bcf26 d4b2b7e7
Loading
Loading
Loading
Loading
Loading
+4 −0
Changes for CHANGELOG.md: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
Journal des modifications
=========================

6.0.0
-----
- Passage à PHP 8.0

5.3.2
-----
- Module Soutenance : 2 nouvelles qualités possibles : 'Autre membre de rang B' et Associate Professor - Équivalent HDR'

bin/retrait_valid

deleted100755 → 0
+0 −7
Changes for bin/retrait_valid: 0 added lines, 7 removed lines.
Original line number Diff line number Diff line
#!/usr/bin/env php

<?php
exec('export http_proxy=proxy.unicaen.fr:3128');
exec('export https_proxy=proxy.unicaen.fr:3128');

include('retrait_valid.php');

bin/retrait_valid.php

deleted100755 → 0
+0 −64
Changes for bin/retrait_valid.php: 0 added lines, 64 removed lines.
Original line number Diff line number Diff line
<?php

use Application\Validator\FichierCinesValidator;
use Retraitement\RetraitValid;
use Laminas\Console;

$appRoot = realpath(__DIR__ . '/..');

$loader = include $appRoot . '/vendor/autoload.php';

$classmapFile = $appRoot . '/autoload_classmap.php';
if (!file_exists($classmapFile)) {
    fwrite(STDERR,
        "Vous devez au préalable générer le fichier '$classmapFile' à l'aide de la commande suivante :" . PHP_EOL .
        "  php $appRoot/vendor/bin/classmap_generator.php -l $appRoot/module -o $appRoot/autoload_classmap.php" . PHP_EOL);
    die(1);
}
$loader->addClassMap(require $classmapFile);


$rules = array(
    'help|h'     => 'Aide.',
    'input|i=s'  => 'Obligatoire. Chemin vers le répertoire à parcourir, ou vers le fichier CSV à lire.',
    'output|o=s' => 'Obligatoire. Chemin vers le répertoire où seront créés les fichiers retraités et le fichiers CSV de log.',
);

try {
    $opts = new Console\Getopt($rules);
    $opts->parse();
} catch (Console\Exception\RuntimeException $e) {
    echo $e->getUsageMessage();
    exit(2);
}

if ($opts->getOption('h')) {
    echo $opts->getUsageMessage();
    exit(0);
}

$inputFilePath = $opts->getOption('i');
$outputDir = $opts->getOption('o');

if (! $inputFilePath || ! $outputDir) {
    echo $opts->getUsageMessage();
    exit(2);
}

if (! file_exists(realpath($inputFilePath))) {
    echo "$inputFilePath n'existe pas";
    exit(1);
}
if (! file_exists(realpath($outputDir))) {
    echo "$outputDir n'existe pas";
    exit(1);
}


$validator = new FichierCinesValidator(['script_path' => __DIR__ . '/validation_cines.sh']);

$rv = new RetraitValid($validator);
$rv->execute(
    realpath($inputFilePath),
    realpath($outputDir)
);
 No newline at end of file
+30 −22
Changes for composer.json: 30 added lines, 22 removed lines.
Original line number Diff line number Diff line
@@ -10,10 +10,11 @@
    "require-dev": {
        "laminas/laminas-developer-tools": "^2.0",
        "unicaen/code": "^6.0",
        "unicaen/test": "^4.0"
        "unicaen/test": "^5.0"
    },
    "require": {
        "php": "^7.4.0",
        "php": "^8.0",

        "ext-curl": "*",
        "ext-dom": "*",
        "ext-fileinfo": "*",
@@ -28,31 +29,37 @@
        "ext-xmlwriter": "*",
        "ext-xsl": "*",
        "ext-zip": "*",
        "beberlei/assert": "^2.9",

        "aws/aws-sdk-php": "^3.226",
        "beberlei/assert": "^3.0",
        "guzzlehttp/guzzle": "^6.3",
        "laminas/laminas-development-mode": "^3.2",
        "laminas/laminas-dependency-plugin": "^2.1",
        "laminas/laminas-feed": "^2.12",
        "laminas/laminas-soap": "^2.8",
        "ramsey/uuid": "^3.3",
        "twig/twig": "^3.0",
        "unicaen/alerte": "^1.1",
        "unicaen/app": "^5.1",
        "unicaen/auth": "^5.1",
        "unicaen/auth-token": "^5.0",
        "unicaen/bjy-authorize": "^4.0",
        "unicaen/db-anonym": "^2.0",
        "unicaen/db-import": "^5.2",
        "unicaen/livelog": "^2.0",
        "unicaen/faq": "^5.0",
        "unicaen/idref": "dev-master",
        "unicaen/ldap": "^4.0",
        "unicaen/parametre": "^5.0",
        "unicaen/renderer": "^5.0",
        "unicaen/pdf": "5.0.1",
        "webmozart/assert": "^1.3",
        "laminas/laminas-feed": "^2.12",
        "laminas/laminas-soap": "^2.8",
        "laminas/laminas-development-mode": "^3.2",
        "laminas/laminas-dependency-plugin": "^2.1",
        "aws/aws-sdk-php": "^3.226"

        "unicaen/pdf": "5.0.1",

        "unicaen/alerte": "^2.0",
        "unicaen/app": "^6.0",
        "unicaen/auth": "^6.0",
        "unicaen/auth-token": "^6.0",
        "unicaen/console": "^6.0",
        "unicaen/db-anonym": "^3.0",
        "unicaen/db-import": "^6.0",
        "unicaen/faq": "^6.0",
        "unicaen/idref": "dev-master",
        "unicaen/ldap": "^6.0",
        "unicaen/livelog": "^2.0",
        "unicaen/parametre": "^6.0",
        "unicaen/renderer": "^6.0",
        "unicaen/pdf": "dev-bg-php8"
    },
    "minimum-stability": "dev",
    "prefer-stable": true,
    "autoload": {
        "psr-0": {
            "Application\\": "module/Application/src",
@@ -93,6 +100,7 @@
    },
    "config": {
        "allow-plugins": {
            "laminas-api-tools/api-tools-asset-manager": true,
            "laminas/laminas-dependency-plugin": true
        }
    }
+4278 −6750

File changed.

Preview size limit exceeded, changes collapsed.

Loading