Skip to content

Suppression de la lecture de la config en yml #2051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Mopolo wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Suppression de la lecture de la config en yml #2051

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 0 additions & 26 deletions sources/Afup/Utils/Configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@

namespace Afup\Site\Utils;

use Symfony\Component\Yaml\Yaml;

/**
* Classe de gestion de la configuration
*/
Expand All @@ -19,7 +17,6 @@ public function __construct()
return;
}

$sfParameters = $this->loadSymfonyParameters();
$parameters = [
'database_host', 'database_name', 'database_user', 'database_password', 'database_port',
'smtp_host', 'smtp_port', 'smtp_tls', 'smtp_username', 'smtp_password',
Expand All @@ -31,30 +28,7 @@ public function __construct()
if (false !== $value = getenv(strtoupper($param))) {
self::$values[$param] = $value;
}

// override by parameter_ENV.yaml ?
if (isset($sfParameters[$param])) {
self::$values[$param] = $sfParameters[$param];
}
}
}

private function loadSymfonyParameters(): array
{
$parameters = [];
$basePath = __DIR__ . '/../../../app/config';

if (isset($_ENV['APP_ENV'])) {
$file = $basePath . '/config_' . $_ENV['APP_ENV'] . '.yml';
if (is_file($file)) {
$values = Yaml::parseFile($file);
if (isset($values['parameters'])) {
$parameters = array_merge($parameters, $values['parameters']);
}
}
}

return $parameters;
}

public function obtenir($cle)
Expand Down
Loading