Commit e912f80f authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Correction de bugs suite refactoring v18.

eradication du Bddconnecteur
parent 16b57e70
Loading
Loading
Loading
Loading
−1
Changes for module/Application/autoload_classmap.php: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ return [
    'Application\Cache\CacheService'                                                    => __DIR__ . '/src/Cache/CacheService.php',
    'Application\Cache\Factory\CacheServiceFactory'                                     => __DIR__ . '/src/Cache/Factory/CacheServiceFactory.php',
    'Application\ConfigFactory'                                                         => __DIR__ . '/src/ConfigFactory.php',
    'Application\Connecteur\Bdd\BddConnecteur'                                          => __DIR__ . '/src/Connecteur/Bdd/BddConnecteur.php',
    'Application\Connecteur\Factory\LdapConnecteurFactory'                              => __DIR__ . '/src/Connecteur/Factory/LdapConnecteurFactory.php',
    'Application\Connecteur\LdapConnecteur'                                             => __DIR__ . '/src/Connecteur/LdapConnecteur.php',
    'Application\Constants'                                                             => __DIR__ . '/src/Constants.php',
−x−123

File deleted.

−x−35

File deleted.

+1 −3
Changes for module/Application/src/Processus/ReconductionProcessus.php: 1 added line, 3 removed lines.
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@

namespace Application\Processus;

use Application\Connecteur\Bdd\BddConnecteurAwareTrait;
use Application\Service\Traits\AnneeServiceAwareTrait;
use Application\Service\Traits\CentreCoutEpServiceAwareTrait;
use Application\Service\Traits\CheminPedagogiqueServiceAwareTrait;
@@ -24,7 +23,6 @@ class ReconductionProcessus extends AbstractProcessus
{

    use EtapeServiceAwareTrait;
    use BddConnecteurAwareTrait;
    use ElementPedagogiqueServiceAwareTrait;
    use CheminPedagogiqueServiceAwareTrait;
    use VolumeHoraireEnsServiceAwareTrait;
@@ -278,7 +276,7 @@ class ReconductionProcessus extends AbstractProcessus
    {
        $connection = $this->getEntityManager()->getConnection();
        $stmt       = $connection->executeQuery('SELECT ' . $sequenceName . '.NEXTVAL val FROM DUAL');
        $result     = $stmt->fetch();
        $result     = $stmt->fetchAssociative();

        return $result['VAL'];
    }
+6 −6
Changes for module/Application/src/Provider/Chargens/ChargensProvider.php: 6 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@

namespace Application\Provider\Chargens;

use Application\Connecteur\Bdd\BddConnecteurAwareTrait;
use Application\Entity\Chargens\Noeud;
use Application\Entity\Db\Etape;
use Application\Entity\Db\Scenario;
@@ -13,11 +12,12 @@ use Application\Service\Traits\SourceServiceAwareTrait;
use Application\Service\Traits\TypeHeuresServiceAwareTrait;
use Application\Service\Traits\TypeInterventionServiceAwareTrait;
use BjyAuthorize\Service\Authorize;
use UnicaenApp\Service\EntityManagerAwareTrait;
use UnicaenTbl\Service\Traits\TableauBordServiceAwareTrait;

class ChargensProvider
{
    use BddConnecteurAwareTrait;
    use EntityManagerAwareTrait;
    use SourceServiceAwareTrait;
    use ContextServiceAwareTrait;
    use StructureAwareTrait;
@@ -195,7 +195,7 @@ class ChargensProvider
          AND ROWNUM = 1
        ";

        $noeudId = $this->getBdd()->fetchOne($sql, ['etape' => $etape], 'ID', 'int');
        $noeudId = (int)$this->getEntityManager()->getConnection()->fetchAssociative($sql, ['etape' => $etape->getId()])['ID'];

        $this->setStructure($etape->getStructure());

@@ -255,7 +255,7 @@ class ChargensProvider
          l.noeud_sup_id = :noeud
        ";

        $relations = $this->getBdd()->fetch($sql, compact('noeud'));
        $relations = $this->getEntityManager()->getConnection()->fetchAllAssociative($sql, compact('noeud'));
        foreach ($relations as $relation) {
            $liens[(int)$relation['ID']]            = true;
            $noeuds[(int)$relation['NOEUD_SUP_ID']] = true;
@@ -347,7 +347,7 @@ class ChargensProvider
          scenario_id
        ";

        $d = $this->getBdd()->fetchOne($sql, [
        $d = $this->getEntityManager()->getConnection()->fetchAssociative($sql, [
            'annee'     => $this->getServiceContext()->getAnnee()->getId(),
            'structure' => $this->getStructure()->getId(),
            'scenario'  => $this->getScenario()->getId(),
@@ -400,7 +400,7 @@ class ChargensProvider
        if ($structure) {
            $params['structure'] = $structure->getId();
        }
        $ds = $this->getBdd()->fetch($sql, $params);
        $ds = $this->getEntityManager()->getConnection()->fetchAllAssociative($sql, $params);
        foreach ($ds as $d) {
            $sid              = (int)$d['STRUCTURE_ID'];
            $heures           = (float)$d['HEURES'];
Loading