Commit 2ab89c05 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge remote-tracking branch 'origin/php84'

parents a6008bbd 55d4cc6d

config/module.config.php

+1 −4
Original line number Diff line number Diff line
@@ -21,10 +21,7 @@ return [ 
    ],



    'service_manager' => [

        'aliases'   => [

            'unicaen-tbl.process.DbDiff' => DbDiffProcess::class,

            'unicaen-tbl.process.Plsql'  => PlsqlProcess::class,

        ],

        

        'factories' => [

            ModuleOptions::class         => Options\Factory\ModuleOptionsFactory::class,

            TableauBordService::class    => Service\TableauBordServiceFactory::class,

src/Service/BddService.php

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ class BddService 
     */

    public function injectKey(string $query, array $key): string

    {

        $key = array_change_key_case($key, CASE_LOWER);

        foreach( $key as $k => $v ){

            while(false !== ($start=strpos($query, '/*@'.$k))){

                $end = strpos($query, '*/', $start) + 2;

src/TableauBord.php

+15 −5
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ namespace UnicaenTbl; 


use Psr\Container\ContainerInterface;

use UnicaenTbl\Event;

use UnicaenTbl\Process\DbDiffProcess;

use UnicaenTbl\Process\PlsqlProcess;

use UnicaenTbl\Process\ProcessInterface;
@@ -120,14 +122,22 @@ class TableauBord 
        if (!$this->process) {

            $processName = $this->processName;



            if (!$this->__container->has($processName)) {

                $processName = 'unicaen-tbl.process.' . $processName;

            }

            if (!$this->__containertainer->has($processName)) {

                throw new \Exception('Le process "' . $processName . '" n\'est pas un service reconnu ou accessible via le container');

            switch ($processName) {

                case 'DbDiff':

                    $processName = DbDiffProcess::class;

                    break;

                case 'Plsql':

                    $processName = PlsqlProcess::class;

                    break;

            }



            /** @var ProcessInterface $process */

            $process = $this->__container->get($processName);



            if (!$process) {

                throw new \Exception('Le process "' . $processName . '" n\'est pas un service reconnu ou accessible via le container');

            }



            $this->process = $process;

        }

        return $this->process;