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

Assouplissement config pour cohérence Doctrine

parent a3e4d1a2
Loading
Loading
Loading
Loading
Loading
+1 −1
Changes for doc/bdd.md: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ $config = [
        'host'     => '*********',  // IP ou nom DNS
        'port'     => 5432,         // port, à adapter
        'dbname'   => '*********',  // Nom de votre base de données
        'username' => '*********',  // Utilisateur
        'user'     => '*********',  // Utilisateur : "username" ou "user", les 2 clés fonctionnent
        'password' => '*********',  // Mot de passe
];

+10 −9
Changes for src/Driver/Oracle/Driver.php: 10 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -44,24 +44,25 @@ class Driver implements DriverInterface
    public function connect(): DriverInterface
    {
        $config       = $this->bdd->getConfig();
        $host         = isset($config['host']) ? $config['host'] : null;
        $port         = isset($config['port']) ? $config['port'] : null;
        $dbname       = isset($config['dbname']) ? $config['dbname'] : null;
        $username     = isset($config['username']) ? $config['username'] : null;
        $password     = isset($config['password']) ? $config['password'] : null;
        $characterset = isset($config['characterset']) ? $config['characterset'] : 'AL32UTF8';

        $host = $config['host'] ?? null;
        $port = $config['port'] ?? null;
        $dbname = $config['dbname'] ?? null;
        $username = $config['username'] ?? $config['user']?? null;
        $password = $config['password'] ?? null;
        $charset = $config['characterset'] ?? $config['charset'] ?? 'AL32UTF8';

        if (!$host) throw new BddException('host non fourni');
        if (!$port) throw new BddException('port non fourni');
        if (!$dbname) throw new BddException('dbname non fourni');
        if (!$username) throw new BddException('username non fourni');
        if (!$username) throw new BddException('username ou user non fourni');
        if (!$password) throw new BddException('password non fourni');
        if (!$characterset) throw new BddException('characterset non fourni');
        if (!$charset) throw new BddException('characterset ou charset non fourni');

        putenv("NLS_LANGUAGE=FRENCH");

        $cs              = $host . ':' . $port . '/' . $dbname;
        $this->connexion = oci_pconnect($username, $password, $cs, $characterset);
        $this->connexion = oci_pconnect($username, $password, $cs, $charset);
        if (!$this->connexion) {
            $error = oci_error();
            throw $this->sendException($error);
+1 −1
Changes for src/Driver/Postgresql/Driver.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ class Driver implements DriverInterface
        $host = $config['host'] ?? null;
        $port = $config['port'] ?? 5342;
        $dbname = $config['dbname'] ?? null;
        $username = $config['username'] ?? null;
        $username = $config['username'] ?? $config['user']?? null;
        $password = $config['password'] ?? null;
        $charset = $config['charset'] ?? 'UTF8';