afup#1416 bdd

stakovicz · Jan 7, 2024 · 6d43eed · 6d43eed
1 parent e5185eb
commit 6d43eed
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 28 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -66,9 +66,12 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-composer-
 
-      - name: CS fixer prerequisites
+      - name: CS fixer prerequisites config
         run: make configs/application/config.php
 
+      - name: CS fixer prerequisites parameters
+        run: make app/config/parameters.yml
+
       - name: Composer install
         run: composer install --no-scripts
 

diff --git a/configs/application/config-test.php b/configs/application/config-test.php
@@ -1,8 +1,4 @@
 <?php
-$configuration['bdd']['hote']='dbtest';
-$configuration['bdd']['base']='web';
-$configuration['bdd']['utilisateur']='afup';
-$configuration['bdd']['mot_de_passe']='afup';
 $configuration['web']['path']='/';
 
 $configuration['mails']['serveur_smtp']='mailcatcher';

diff --git a/configs/application/config.php.dist b/configs/application/config.php.dist
@@ -1,8 +1,4 @@
 <?php
-$configuration['bdd']['hote']='127.0.0.1';
-$configuration['bdd']['base']='afup_dev';
-$configuration['bdd']['utilisateur']='afup_dev';
-$configuration['bdd']['mot_de_passe']='p455w0rd';
 $configuration['web']['path']='http://.dev/';
 
 $configuration['mails']['serveur_smtp']='';

diff --git a/configs/application/config.php.dist-docker b/configs/application/config.php.dist-docker
@@ -1,8 +1,4 @@
 <?php
-$configuration['bdd']['hote']='db';
-$configuration['bdd']['base']='web';
-$configuration['bdd']['utilisateur']='afup';
-$configuration['bdd']['mot_de_passe']='afup';
 $configuration['web']['path']='/';
 
 $configuration['mails']['serveur_smtp']='mailcatcher';

diff --git a/htdocs/pages/administration/configuration.php b/htdocs/pages/administration/configuration.php
@@ -14,12 +14,6 @@
 
 $formulaire->setDefaults($defaults);
 
-$formulaire->addElement('header', ''                , 'Base de données');
-$formulaire->addElement('text'  , 'bdd|hote'        , 'Hote'           , array('size' => 30));
-$formulaire->addElement('text'  , 'bdd|base'        , 'Base'           , array('size' => 30));
-$formulaire->addElement('text'  , 'bdd|utilisateur' , 'Utilisateur'    , array('size' => 30));
-$formulaire->addElement('text'  , 'bdd|mot_de_passe', 'Mot de passe'   , array('size' => 30));
-
 $formulaire->addElement('header'  , ''                                      , 'Mails');
 $formulaire->addElement('text'    , 'mails|email_expediteur'                , 'Email expediteur'                , array('size' => 30));
 $formulaire->addElement('text'    , 'mails|nom_expediteur'                  , 'Nom expediteur'                  , array('size' => 30));
@@ -48,10 +42,6 @@
 $formulaire->addElement('header', 'boutons'  , '');
 $formulaire->addElement('submit', 'soumettre', 'Enregistrer');
 
-$formulaire->addRule('bdd|hote'       , 'Hote manquant'       , 'required');
-$formulaire->addRule('bdd|base'       , 'Base manquante'      , 'required');
-$formulaire->addRule('bdd|utilisateur', 'Utilisateur manquant', 'required');
-
 if ($formulaire->validate()) {
 	$valeurs = $formulaire->exportValues();
     $conf->importer($valeurs);

diff --git a/sources/Afup/Forum/AppelConferencier.php b/sources/Afup/Forum/AppelConferencier.php
@@ -2,12 +2,7 @@
 
 namespace Afup\Site\Forum;
 
-use Afup\Site\Utils\Configuration;
-use Afup\Site\Utils\Mailing;
-use AppBundle\Email\Mailer\MailUser;
-use AppBundle\Email\Mailer\Message;
 use AppBundle\Event\Model\Talk;
-use Symfony\Component\Translation\Translator;
 
 class AppelConferencier
 {

diff --git a/sources/Afup/Utils/Configuration.php b/sources/Afup/Utils/Configuration.php
@@ -1,6 +1,9 @@
 <?php
+
 namespace Afup\Site\Utils;
 
+use Symfony\Component\Yaml\Yaml;
+
 define('EURO', '€');
 
 /**
@@ -33,6 +36,16 @@ public function __construct($chemin_fichier)
     {
         $this->_chemin_fichier = $chemin_fichier;
         $this->_valeurs = include($this->_chemin_fichier);
+
+        $parametersFile = dirname(__FILE__).'/../../../app/config/parameters.yml';
+        if (is_file($parametersFile)) {
+            $parameters = Yaml::parseFile($parametersFile)['parameters'];
+
+            $this->_valeurs['bdd']['hote'] = $parameters['database_host'];
+            $this->_valeurs['bdd']['base'] = $parameters['database_name'];
+            $this->_valeurs['bdd']['utilisateur'] = $parameters['database_user'];
+            $this->_valeurs['bdd']['mot_de_passe'] = $parameters['database_password'];
+        }
     }
 
     /**