@@ -40,7 +40,7 @@ |
||
| 40 | 40 | // Set profiles. |
| 41 | 41 | $container->setParameter('ongr_settings.settings_container.profiles', $config['profiles']); |
| 42 | 42 | |
| 43 | - $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config')); |
|
| 43 | + $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); |
|
| 44 | 44 | $loader->load('services/twig_extension.yml'); |
| 45 | 45 | $loader->load('services/personal_settings.yml'); |
| 46 | 46 | $loader->load('services/general_settings.yml'); |
@@ -46,6 +46,6 @@ |
||
| 46 | 46 | */ |
| 47 | 47 | public function registerContainerConfiguration(LoaderInterface $loader) |
| 48 | 48 | { |
| 49 | - $loader->load(__DIR__ . '/config/config_' . $this->getEnvironment() . '.yml'); |
|
| 49 | + $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml'); |
|
| 50 | 50 | } |
| 51 | 51 | } |
@@ -85,7 +85,7 @@ |
||
| 85 | 85 | |
| 86 | 86 | /** @var Setting $setting */ |
| 87 | 87 | $setting = $this->manager->get($name); |
| 88 | - $settingProfile = is_array($setting->getProfile())?$setting->getProfile():[$setting->getProfile()]; |
|
| 88 | + $settingProfile = is_array($setting->getProfile()) ? $setting->getProfile() : [$setting->getProfile()]; |
|
| 89 | 89 | if ($setting && array_intersect($settingProfile, $allProfiles)) { |
| 90 | 90 | $settingValue = $setting->getValue(); |
| 91 | 91 | } else { |