Completed
Pull Request — master (#3527)
by Craig
10:00
created
src/system/ExtensionsModule/Helper/ExtensionDependencyHelper.php 2 patches
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -203,9 +203,9 @@
 block discarded – undo
203 203
     /**
204 204
      * Determine if a $currentVersion value is between $requiredMin and $requiredMax.
205 205
      *
206
-     * @param $requiredMin
207
-     * @param $requiredMax
208
-     * @param $currentVersion
206
+     * @param string $requiredMin
207
+     * @param string $requiredMax
208
+     * @param string $currentVersion
209 209
      * @return bool
210 210
      */
211 211
     private function meetsVersionRequirements($requiredMin, $requiredMax, $currentVersion)
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -158,7 +158,7 @@
 block discarded – undo
158 158
      * @param ExtensionDependencyEntity $dependency
159 159
      * @return bool
160 160
      */
161
-    private function bundleDependencySatisfied(ExtensionDependencyEntity &$dependency)
161
+    private function bundleDependencySatisfied(ExtensionDependencyEntity & $dependency)
162 162
     {
163 163
         if ($dependency->getModname() == "php") {
164 164
             // Do not use PHP_VERSION constant, because it might throw off the semver parser.
Please login to merge, or discard this patch.
RoutesModule/Validator/Constraints/Base/AbstractListEntryValidator.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@
 block discarded – undo
63 63
 
64 64
         if ($constraint->propertyName == 'workflowState' && in_array($value, ['initial', 'deleted'])) {
65 65
             return;
66
-    	}
66
+        }
67 67
 
68 68
         $listEntries = $this->listEntriesHelper->getEntries($constraint->entityName, $constraint->propertyName);
69 69
         $allowedValues = [];
Please login to merge, or discard this patch.
lib/Zikula/Bundle/CoreInstallerBundle/Controller/AjaxUpgradeController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -43,8 +43,8 @@  discard block
 block discarded – undo
43 43
     public function __construct(ContainerInterface $container)
44 44
     {
45 45
         parent::__construct($container);
46
-        $originalParameters = Yaml::parse(file_get_contents($this->container->get('kernel')->getRootDir() .'/config/parameters.yml'));
47
-        $this->yamlManager = new YamlDumper($this->container->get('kernel')->getRootDir() .'/config', 'custom_parameters.yml');
46
+        $originalParameters = Yaml::parse(file_get_contents($this->container->get('kernel')->getRootDir() . '/config/parameters.yml'));
47
+        $this->yamlManager = new YamlDumper($this->container->get('kernel')->getRootDir() . '/config', 'custom_parameters.yml');
48 48
         // load and set new default values from the original parameters.yml file into the custom_parameters.yml file.
49 49
         $this->yamlManager->setParameters(array_merge($originalParameters['parameters'], $this->yamlManager->getParameters()));
50 50
         $currentVersion = $this->container->getParameter(ZikulaKernel::CORE_INSTALLED_VERSION_PARAM);
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
         $stage = $request->request->get('stage');
57 57
         $this->container->setParameter('upgrading', true);
58 58
         $status = $this->executeStage($stage);
59
-        $response = ['status' => (bool) $status];
59
+        $response = ['status' => (bool)$status];
60 60
         if (is_array($status)) {
61 61
             $response['results'] = $status;
62 62
         }
Please login to merge, or discard this patch.
Bundle/CoreInstallerBundle/EventListener/InstallUpgradeCheckListener.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@
 block discarded – undo
50 50
         $containsUpgrade = $routeInfo['_route'] == 'upgrade';
51 51
         $containsLogin = $routeInfo['_controller'] == 'Zikula\\UsersModule\\Controller\\AccessController::loginAction';
52 52
         $containsDoc = $routeInfo['_route'] == 'doc';
53
-        $containsWdt =  $routeInfo['_route'] == '_wdt';
53
+        $containsWdt = $routeInfo['_route'] == '_wdt';
54 54
         $containsProfiler = strpos($routeInfo['_route'], '_profiler') !== false;
55 55
         $containsRouter = $routeInfo['_route'] == 'fos_js_routing_js';
56 56
         $doNotRedirect = $containsProfiler || $containsWdt || $containsRouter || $request->isXmlHttpRequest();
Please login to merge, or discard this patch.
src/system/SecurityCenterModule/Api/HtmlFilterApi.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -114,7 +114,7 @@
 block discarded – undo
114 114
             // Fix the HTML that we want
115 115
             $value = preg_replace_callback(
116 116
                 '#\022([^\024]*)\024#',
117
-                    function ($matches) {
117
+                    function($matches) {
118 118
                         if (!$matches) {
119 119
                             return;
120 120
                         }
Please login to merge, or discard this patch.
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.