Commit 687ac481 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Corrections pour passage à PHP 8

parent 89e2363f
Loading
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -3,13 +3,12 @@
namespace UnicaenDbImport;

use Laminas\Config\Factory as ConfigFactory;
use Laminas\Console\Adapter\AdapterInterface;
use Laminas\ModuleManager\Feature\ConsoleUsageProviderInterface;
use Unicaen\Console\Adapter\AdapterInterface;
use Laminas\Mvc\Application;
use Laminas\Mvc\MvcEvent;
use Laminas\Stdlib\Glob;

class Module implements ConsoleUsageProviderInterface
class Module
{
    public function onBootstrap(MvcEvent $e)
    {
+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ class CodeGeneratorException extends RuntimeException
    {
        return new BadMethodCallException(sprintf(
            "Vous devez implémenter la méthode '%s::%s' sur mesure pour la pateforme '%s'",
            $method, $calledClass, $platform->getName()
            $method, $calledClass, get_class($platform)
        ));

    }
+14 −14
Original line number Diff line number Diff line
@@ -89,24 +89,24 @@ EOT;
        $name = $this->generateDiffViewName($destinationTable);

        $updatedColumsSql = implode(
            ',',
            array_map(function($col) {
                return sprintf('U_%s', $col);
            }, $columns),
            ','
            }, $columns)
        );

        $srcColumsSql = implode(
            ',' . PHP_EOL,
            array_map(function($col) {
                return sprintf('S_%s', $col);
            }, $columns),
            ',' . PHP_EOL
            }, $columns)
        );

        $destColumsSql = implode(
            ',' . PHP_EOL,
            array_map(function($col) {
                return sprintf('D_%s', $col);
            }, $columns),
            ',' . PHP_EOL
            }, $columns)
        );

        $wheres = null;
@@ -182,32 +182,32 @@ EOT;
        $delete = Operation::OPERATION_DELETE;

        $updatedColumsSql = implode(
            ',' . PHP_EOL,
            array_map(function($col) {
                $tpl = 'CASE WHEN d.%s <> s.%1$s OR (d.%1$s IS NULL AND s.%1$s IS NOT NULL) OR (d.%1$s IS NOT NULL AND s.%1$s IS NULL) THEN 1 ELSE 0 END as U_%1$s';
                return sprintf($tpl, $col);
            }, $columns),
            ',' . PHP_EOL
            }, $columns)
        );

        $srcColumsSql = implode(
            ',' . PHP_EOL,
            array_map(function($col) {
                return sprintf('s.%1$s AS S_%1$s', $col);
            }, $columns),
            ',' . PHP_EOL
            }, $columns)
        );

        $destColumsSql = implode(
            ',' . PHP_EOL,
            array_map(function($col) {
                return sprintf('d.%1$s AS D_%1$s', $col);
            }, $columns),
            ',' . PHP_EOL
            }, $columns)
        );

        $udpatedColumnsAddition = implode(
            '+',
            array_map(function($col) {
                return sprintf('U_%s', $col);
            }, $columns),
            '+'
            }, $columns)
        );

        $now = $this->platform->getNowExpression();
+2 −2
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@
namespace UnicaenDbImport\Controller;

use Exception;
use Laminas\Console\ColorInterface;
use Laminas\Console\Request;
use Unicaen\Console\ColorInterface;
use Unicaen\Console\Request;
use Laminas\Mvc\Console\Controller\AbstractConsoleController;
use UnicaenDbImport\Domain\Exception\NotFoundException;
use UnicaenDbImport\Domain\ImportInterface;
+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@

namespace UnicaenDbImport\Controller;

use Laminas\Console\Adapter\Posix;
use Unicaen\Console\Adapter\Posix;
use Monolog\Handler\StreamHandler;
use Monolog\Logger;
use Psr\Container\ContainerInterface;
Loading