Completed
Pull Request — master (#3527)
by Craig
10:00
created
src/lib/bootstrap.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -12,11 +12,11 @@  discard block
 block discarded – undo
12 12
 use Symfony\Component\Debug\Debug;
13 13
 use Symfony\Component\Yaml\Yaml;
14 14
 
15
-require __DIR__.'/../app/autoload.php';
16
-require __DIR__.'/../lib/requirementCheck.php';
15
+require __DIR__ . '/../app/autoload.php';
16
+require __DIR__ . '/../lib/requirementCheck.php';
17 17
 
18
-$kernelConfig = Yaml::parse(file_get_contents(__DIR__.'/../app/config/parameters.yml'));
19
-if (is_readable($file = __DIR__.'/../app/config/custom_parameters.yml')) {
18
+$kernelConfig = Yaml::parse(file_get_contents(__DIR__ . '/../app/config/parameters.yml'));
19
+if (is_readable($file = __DIR__ . '/../app/config/custom_parameters.yml')) {
20 20
     $kernelConfig = array_merge($kernelConfig, Yaml::parse(file_get_contents($file)));
21 21
 }
22 22
 $kernelConfig = $kernelConfig['parameters'];
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 }
26 26
 if ($kernelConfig['env'] == 'prod') {
27 27
     // improves performance for prod env
28
-    include_once __DIR__.'/../var/bootstrap.php.cache';
28
+    include_once __DIR__ . '/../var/bootstrap.php.cache';
29 29
 }
30 30
 
31 31
 if ((isset($kernelConfig['umask'])) && (!is_null($kernelConfig['umask']))) {
Please login to merge, or discard this patch.
src/app/ZikulaKernel.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -63,10 +63,10 @@  discard block
 block discarded – undo
63 63
 
64 64
     public function registerContainerConfiguration(LoaderInterface $loader)
65 65
     {
66
-        $loader->load($this->rootDir.'/config/config_'.$this->getEnvironment().'.yml');
67
-        $loader->load($this->rootDir.'/config/parameters.yml');
68
-        if (is_readable($this->rootDir.'/config/custom_parameters.yml')) {
69
-            $loader->load($this->rootDir.'/config/custom_parameters.yml');
66
+        $loader->load($this->rootDir . '/config/config_' . $this->getEnvironment() . '.yml');
67
+        $loader->load($this->rootDir . '/config/parameters.yml');
68
+        if (is_readable($this->rootDir . '/config/custom_parameters.yml')) {
69
+            $loader->load($this->rootDir . '/config/custom_parameters.yml');
70 70
         }
71 71
 
72 72
         if (!is_readable($this->rootDir . '/config/' . DynamicConfigDumper::CONFIG_GENERATED)) {
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
      */
92 92
     public function getCacheDir()
93 93
     {
94
-        return dirname(__DIR__).'/var/cache/'.$this->environment;
94
+        return dirname(__DIR__) . '/var/cache/' . $this->environment;
95 95
     }
96 96
 
97 97
     /**
@@ -99,6 +99,6 @@  discard block
 block discarded – undo
99 99
      */
100 100
     public function getLogDir()
101 101
     {
102
-        return dirname(__DIR__).'/var/logs';
102
+        return dirname(__DIR__) . '/var/logs';
103 103
     }
104 104
 }
Please login to merge, or discard this patch.