@@ -54,7 +54,7 @@ |
||
54 | 54 | $parameter_instances[] = $container->get($cn); |
55 | 55 | } catch (\Exception $x) { |
56 | 56 | echo __CLASS__ |
57 | - . " couldn't create an instance of $cn to satisfy the constructor for $requestedName."; |
|
57 | + . " couldn't create an instance of $cn to satisfy the constructor for $requestedName."; |
|
58 | 58 | exit; |
59 | 59 | } |
60 | 60 | } else { |
@@ -33,8 +33,8 @@ |
||
33 | 33 | |
34 | 34 | public function canCreate(ContainerInterface $container, $requestedName) |
35 | 35 | { |
36 | - list($module, ) = explode('\\', __NAMESPACE__, 2); |
|
37 | - return strstr($requestedName, $module . '\Controller') !== false; |
|
36 | + list($module,) = explode('\\', __NAMESPACE__, 2); |
|
37 | + return strstr($requestedName, $module.'\Controller') !== false; |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | public function __invoke(ContainerInterface $container, $requestedName, array $options = null) |
@@ -61,8 +61,8 @@ |
||
61 | 61 | $routeMatch->setParam('action', $p); |
62 | 62 | $response = $this->getResponse(); |
63 | 63 | $response->getHeaders() |
64 | - ->addHeaderLine('Content-Type', 'application/json') |
|
65 | - ->addHeaderLine('Content-Encoding', 'utf8'); |
|
64 | + ->addHeaderLine('Content-Type', 'application/json') |
|
65 | + ->addHeaderLine('Content-Encoding', 'utf8'); |
|
66 | 66 | } |
67 | 67 | } |
68 | 68 |
@@ -162,7 +162,7 @@ |
||
162 | 162 | parent::attachDefaultListeners(); |
163 | 163 | |
164 | 164 | $events = $this->getEventManager(); |
165 | - $events->attach(MvcEvent::EVENT_DISPATCH, array( $this, 'preDispatch' ), 100); |
|
165 | + $events->attach(MvcEvent::EVENT_DISPATCH, array($this, 'preDispatch'), 100); |
|
166 | 166 | } |
167 | 167 | |
168 | 168 | /** |
@@ -29,7 +29,7 @@ |
||
29 | 29 | |
30 | 30 | public function __construct() |
31 | 31 | { |
32 | - static::$yawikGlobalConfig = getcwd() . '/config/autoload/yawik.config.global.php'; |
|
32 | + static::$yawikGlobalConfig = getcwd().'/config/autoload/yawik.config.global.php'; |
|
33 | 33 | static::$yawikBackupConfig = str_replace('yawik.config.global.php', 'yawik.backup', static::$yawikGlobalConfig); |
34 | 34 | } |
35 | 35 |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | /** |
60 | 60 | * Get required modules for Yawik |
61 | 61 | * |
62 | - * @return array |
|
62 | + * @return string[] |
|
63 | 63 | */ |
64 | 64 | public static function getRequiredModules() |
65 | 65 | { |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | |
194 | 194 | /** |
195 | 195 | * Setup php server |
196 | - * @return bool |
|
196 | + * @return null|boolean |
|
197 | 197 | * @codeCoverageIgnore |
198 | 198 | */ |
199 | 199 | public static function setupCliServerEnv() |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | * @param array $loadModules |
93 | 93 | * @return array |
94 | 94 | */ |
95 | - public static function generateModuleConfiguration($loadModules=[]) |
|
95 | + public static function generateModuleConfiguration($loadModules = []) |
|
96 | 96 | { |
97 | 97 | $modules = array_merge( |
98 | 98 | static::getRequiredModules(), |
@@ -173,12 +173,12 @@ discard block |
||
173 | 173 | { |
174 | 174 | $modules = []; |
175 | 175 | $configDir = static::getConfigDir(); |
176 | - foreach (glob($configDir. '/autoload/*.module.php') as $moduleFile) { |
|
176 | + foreach (glob($configDir.'/autoload/*.module.php') as $moduleFile) { |
|
177 | 177 | $addModules = require $moduleFile; |
178 | 178 | foreach ($addModules as $addModule) { |
179 | 179 | if (strpos($addModule, '-') === 0) { |
180 | 180 | $remove = substr($addModule, 1); |
181 | - $modules = array_filter($modules, function ($elem) use ($remove) { |
|
181 | + $modules = array_filter($modules, function($elem) use ($remove) { |
|
182 | 182 | return strcasecmp($elem, $remove); |
183 | 183 | }); |
184 | 184 | } else { |
@@ -199,15 +199,15 @@ discard block |
||
199 | 199 | public static function setupCliServerEnv() |
200 | 200 | { |
201 | 201 | $parseUrl = parse_url(substr($_SERVER["REQUEST_URI"], 1)); |
202 | - $route = isset($parseUrl['path']) ? $parseUrl['path']:null; |
|
203 | - if (is_file(__DIR__ . '/' . $route)) { |
|
202 | + $route = isset($parseUrl['path']) ? $parseUrl['path'] : null; |
|
203 | + if (is_file(__DIR__.'/'.$route)) { |
|
204 | 204 | if (substr($route, -4) == ".php") { |
205 | - require __DIR__ . '/' . $route; // Include requested script files |
|
205 | + require __DIR__.'/'.$route; // Include requested script files |
|
206 | 206 | exit; |
207 | 207 | } |
208 | - return false; // Serve file as is |
|
208 | + return false; // Serve file as is |
|
209 | 209 | } else { // Fallback to index.php |
210 | - $_GET["q"] = $route; // Try to emulate the behaviour of a .htaccess here. |
|
210 | + $_GET["q"] = $route; // Try to emulate the behaviour of a .htaccess here. |
|
211 | 211 | } |
212 | 212 | return true; |
213 | 213 | } |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | */ |
218 | 218 | public static function loadDotEnv() |
219 | 219 | { |
220 | - static $isLoaded=false; |
|
220 | + static $isLoaded = false; |
|
221 | 221 | if ($isLoaded) { |
222 | 222 | return; |
223 | 223 | } |
@@ -329,7 +329,7 @@ discard block |
||
329 | 329 | } |
330 | 330 | |
331 | 331 | // setup docker environment |
332 | - if (getenv('DOCKER_ENV')=='yes') { |
|
332 | + if (getenv('DOCKER_ENV') == 'yes') { |
|
333 | 333 | $configuration = ArrayUtils::merge($configuration, static::getDockerEnv($configuration)); |
334 | 334 | } |
335 | 335 | return $configuration; |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | */ |
28 | 28 | public function getConfig() |
29 | 29 | { |
30 | - return ModuleConfigLoader::load(__DIR__ . '/../config'); |
|
30 | + return ModuleConfigLoader::load(__DIR__.'/../config'); |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | $createJobListener->attachShared($sharedManager); |
42 | 42 | |
43 | 43 | if ($e->getRequest() instanceof \Zend\Http\Request) { |
44 | - $eventManager->attach(MvcEvent::EVENT_DISPATCH_ERROR, function (MvcEvent $event) { |
|
44 | + $eventManager->attach(MvcEvent::EVENT_DISPATCH_ERROR, function(MvcEvent $event) { |
|
45 | 45 | $serviceManager = $event->getApplication() |
46 | 46 | ->getServiceManager(); |
47 | 47 | $options = $serviceManager->get('Organizations/ImageFileCacheOptions'); |