Ajout de la timezone pour MySQL (#1612)

afup · Feb 9, 2025 · 669a64b · 669a64b
1 parent cba6dbc
commit 669a64b
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 34 deletions.
diff --git a/app/config/config.php b/app/config/config.php
diff --git a/app/config/config.yml b/app/config/config.yml
@@ -1,5 +1,4 @@
 imports:
-    - { resource: config.php }
     - { resource: security.yml }
     - { resource: services.yml }
 
@@ -357,6 +356,11 @@ ting:
                 port:     "%database_port%"
                 user:     "%database_user%"
                 password: "%database_password%"
+
+    databases_options:
+        main:
+            timezone: "%database_timezone%"
+
     repositories:
         event:
             namespace : AppBundle\Event\Model\Repository

diff --git a/sources/Afup/Corporate/_Site_Base_De_Donnees.php b/sources/Afup/Corporate/_Site_Base_De_Donnees.php
@@ -18,7 +18,8 @@ public function __construct()
             $conf->obtenir('database_name'),
             $conf->obtenir('database_user'),
             $conf->obtenir('database_password'),
-            $conf->obtenir('database_port')
+            $conf->obtenir('database_port'),
+            $conf->obtenir('database_timezone'),
         );
     }
 }
diff --git a/sources/Afup/Utils/Base_De_Donnees.php b/sources/Afup/Utils/Base_De_Donnees.php
@@ -24,23 +24,28 @@ class Base_De_Donnees
      * @param string $database Nom de la base
      * @param string $user Nom de l'utilisateur
      * @param string $password Mot de passe
+     * @param string $timezone Timezone de la base de données
      * @return void
      */
-    public function __construct($host, $database, $user, $password, $port = null)
+    public function __construct($host, $database, $user, $password, $port = null, $timezone = null)
     {
         $this->config = [
             'host' => $host,
             'database' => $database,
             'user' => $user,
             'password' => $password,
             'port' => $port,
+            'timezone' => $timezone,
         ];
     }
 
     public function getDbLink()
     {
         if ($this->link === null) {
-            $this->link = mysqli_connect($this->config['host'], $this->config['user'], $this->config['password'], null, (int) $this->config['port']) or die('Connexion à la base de données impossible');
+            $this->link = mysqli_connect($this->config['host'], $this->config['user'], $this->config['password'], null, $this->config['port']) or die('Connexion à la base de données impossible');
+            if ($this->config['timezone']) {
+                mysqli_query($this->link, "SET time_zone = '" . $this->config['timezone'] . "'");
+            }
             mysqli_set_charset($this->link, "utf8mb4");
             $this->selectionnerBase($this->config['database']);
         }

diff --git a/sources/AppBundle/AppBundle.php b/sources/AppBundle/AppBundle.php
@@ -4,8 +4,38 @@
 
 namespace AppBundle;
 
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class AppBundle extends Bundle
 {
+    public function build(ContainerBuilder $container): void
+    {
+        $path = dirname(__FILE__, 3);
+        $envFile = is_file($path . '/.env') ? $path . '/.env' : $path . '/.env.dist';
+        $lines = file($envFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+        foreach ($lines as $line) {
+            if (strpos(trim($line), '#') === 0) {
+                continue;
+            }
+
+            [$name, $default] = explode('=', $line, 2);
+            // On va chercher dans les variables d'env en premier
+            if (!$value = getenv($name)) {
+                $value = $default;
+            }
+            $name = strtolower(trim($name));
+            $value = trim($value);
+            if (is_numeric($value)) {
+                $value = (int) $value;
+            }
+
+            $container->setParameter($name, $value);
+        }
+        // On calcul l'offset de la timezone pour MySQL
+        // car la base de données est en UTC et la base n'accepte que les offset.
+        $container->setParameter('database_timezone', date('P'));
+
+        parent::build($container);
+    }
 }