@@ -18,11 +18,11 @@ |
||
18 | 18 | */ |
19 | 19 | class Module |
20 | 20 | { |
21 | - /** |
|
22 | - * Loads module specific configuration. |
|
23 | - * |
|
24 | - * @return array |
|
25 | - */ |
|
21 | + /** |
|
22 | + * Loads module specific configuration. |
|
23 | + * |
|
24 | + * @return array |
|
25 | + */ |
|
26 | 26 | public function getConfig() |
27 | 27 | { |
28 | 28 | return include __DIR__ . '/config/module.config.php'; |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | */ |
26 | 26 | public function getConfig() |
27 | 27 | { |
28 | - return include __DIR__ . '/config/module.config.php'; |
|
28 | + return include __DIR__.'/config/module.config.php'; |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | /** |
@@ -37,11 +37,11 @@ discard block |
||
37 | 37 | { |
38 | 38 | return array( |
39 | 39 | 'Zend\Loader\ClassMapAutoloader' => [ |
40 | - __DIR__ . '/src/autoload_classmap.php' |
|
40 | + __DIR__.'/src/autoload_classmap.php' |
|
41 | 41 | ], |
42 | 42 | 'Zend\Loader\StandardAutoloader' => array( |
43 | 43 | 'namespaces' => array( |
44 | - __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__, |
|
44 | + __NAMESPACE__ => __DIR__.'/src/'.__NAMESPACE__, |
|
45 | 45 | ), |
46 | 46 | ), |
47 | 47 | ); |
@@ -1,15 +1,15 @@ |
||
1 | 1 | <?php |
2 | 2 | // Generated by ZF2's ./bin/classmap_generator.php |
3 | 3 | return array( |
4 | - 'Install\Controller\Index' => __DIR__ . '/Controller/Index.php', |
|
5 | - 'Install\Controller\Plugin\Prerequisites' => __DIR__ . '/Controller/Plugin/Prerequisites.php', |
|
6 | - 'Install\Controller\Plugin\UserCreator' => __DIR__ . '/Controller/Plugin/UserCreator.php', |
|
7 | - 'Install\Controller\Plugin\YawikConfigCreator' => __DIR__ . '/Controller/Plugin/YawikConfigCreator.php', |
|
8 | - 'Install\Factory\Controller\Plugin\UserCreatorFactory' => __DIR__ . '/Factory/Controller/Plugin/UserCreatorFactory.php', |
|
9 | - 'Install\Factory\Controller\Plugin\YawikConfigCreatorFactory' => __DIR__ . '/Factory/Controller/Plugin/YawikConfigCreatorFactory.php', |
|
10 | - 'Install\Filter\DbNameExtractor' => __DIR__ . '/Filter/DbNameExtractor.php', |
|
11 | - 'Install\Form\Installation' => __DIR__ . '/Form/Installation.php', |
|
12 | - 'Install\Listener\LanguageSetter' => __DIR__ . '/Listener/LanguageSetter.php', |
|
13 | - 'Install\Validator\MongoDbConnection' => __DIR__ . '/Validator/MongoDbConnection.php', |
|
14 | - 'Install\Validator\MongoDbConnectionString' => __DIR__ . '/Validator/MongoDbConnectionString.php', |
|
4 | + 'Install\Controller\Index' => __DIR__.'/Controller/Index.php', |
|
5 | + 'Install\Controller\Plugin\Prerequisites' => __DIR__.'/Controller/Plugin/Prerequisites.php', |
|
6 | + 'Install\Controller\Plugin\UserCreator' => __DIR__.'/Controller/Plugin/UserCreator.php', |
|
7 | + 'Install\Controller\Plugin\YawikConfigCreator' => __DIR__.'/Controller/Plugin/YawikConfigCreator.php', |
|
8 | + 'Install\Factory\Controller\Plugin\UserCreatorFactory' => __DIR__.'/Factory/Controller/Plugin/UserCreatorFactory.php', |
|
9 | + 'Install\Factory\Controller\Plugin\YawikConfigCreatorFactory' => __DIR__.'/Factory/Controller/Plugin/YawikConfigCreatorFactory.php', |
|
10 | + 'Install\Filter\DbNameExtractor' => __DIR__.'/Filter/DbNameExtractor.php', |
|
11 | + 'Install\Form\Installation' => __DIR__.'/Form/Installation.php', |
|
12 | + 'Install\Listener\LanguageSetter' => __DIR__.'/Listener/LanguageSetter.php', |
|
13 | + 'Install\Validator\MongoDbConnection' => __DIR__.'/Validator/MongoDbConnection.php', |
|
14 | + 'Install\Validator\MongoDbConnectionString' => __DIR__.'/Validator/MongoDbConnectionString.php', |
|
15 | 15 | ); |
@@ -24,23 +24,23 @@ |
||
24 | 24 | |
25 | 25 | public function getConfig() |
26 | 26 | { |
27 | - return include __DIR__ . '/config/module.config.php'; |
|
27 | + return include __DIR__.'/config/module.config.php'; |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | public function getAutoloaderConfig() |
31 | 31 | { |
32 | 32 | return array( |
33 | 33 | 'Zend\Loader\ClassMapAutoloader' => [ |
34 | - __DIR__ . '/src/autoload_classmap.php', |
|
34 | + __DIR__.'/src/autoload_classmap.php', |
|
35 | 35 | [ |
36 | 36 | // We need this filter for initial user creation. |
37 | - 'Auth\Entity\Filter\CredentialFilter' => __DIR__ . '/../Auth/src/Auth/Entity/Filter/CredentialFilter.php', |
|
37 | + 'Auth\Entity\Filter\CredentialFilter' => __DIR__.'/../Auth/src/Auth/Entity/Filter/CredentialFilter.php', |
|
38 | 38 | ], |
39 | 39 | ], |
40 | 40 | 'Zend\Loader\StandardAutoloader' => array( |
41 | 41 | 'namespaces' => array( |
42 | - __NAMESPACE__ => __DIR__ . '/src' /* . __NAMESPACE__*/, |
|
43 | - __NAMESPACE__ . 'Test' => __DIR__ . '/test/' . __NAMESPACE__ . 'Test', |
|
42 | + __NAMESPACE__ => __DIR__.'/src' /* . __NAMESPACE__*/, |
|
43 | + __NAMESPACE__.'Test' => __DIR__.'/test/'.__NAMESPACE__.'Test', |
|
44 | 44 | ), |
45 | 45 | ), |
46 | 46 | ); |
@@ -62,13 +62,13 @@ |
||
62 | 62 | $services = $application->getServiceManager(); |
63 | 63 | |
64 | 64 | $services->get('Install/Listener/LanguageSetter') |
65 | - ->attach($eventManager); |
|
65 | + ->attach($eventManager); |
|
66 | 66 | |
67 | - $tracyConfig = $services->get('Config')['tracy']; |
|
67 | + $tracyConfig = $services->get('Config')['tracy']; |
|
68 | 68 | |
69 | - if ($tracyConfig['enabled']) { |
|
70 | - (new TracyService())->register($tracyConfig); |
|
71 | - (new TracyListener())->attach($eventManager); |
|
72 | - } |
|
69 | + if ($tracyConfig['enabled']) { |
|
70 | + (new TracyService())->register($tracyConfig); |
|
71 | + (new TracyListener())->attach($eventManager); |
|
72 | + } |
|
73 | 73 | } |
74 | 74 | } |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | */ |
39 | 39 | public function getConfig() |
40 | 40 | { |
41 | - return ModuleConfigLoader::load(__DIR__ . '/config'); |
|
41 | + return ModuleConfigLoader::load(__DIR__.'/config'); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | /** |
@@ -50,12 +50,12 @@ discard block |
||
50 | 50 | { |
51 | 51 | return array( |
52 | 52 | 'Zend\Loader\ClassMapAutoloader' => [ |
53 | - __DIR__ . '/src/autoload_classmap.php' |
|
53 | + __DIR__.'/src/autoload_classmap.php' |
|
54 | 54 | ], |
55 | 55 | 'Zend\Loader\StandardAutoloader' => array( |
56 | 56 | 'namespaces' => array( |
57 | - __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__, |
|
58 | - __NAMESPACE__ . 'Test' => __DIR__ . '/test/' . __NAMESPACE__ . 'Test', |
|
57 | + __NAMESPACE__ => __DIR__.'/src/'.__NAMESPACE__, |
|
58 | + __NAMESPACE__.'Test' => __DIR__.'/test/'.__NAMESPACE__.'Test', |
|
59 | 59 | ), |
60 | 60 | ), |
61 | 61 | ); |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | */ |
29 | 29 | public function getConfig() |
30 | 30 | { |
31 | - return include __DIR__ . '/config/module.config.php'; |
|
31 | + return include __DIR__.'/config/module.config.php'; |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | /** |
@@ -41,11 +41,11 @@ discard block |
||
41 | 41 | |
42 | 42 | return array( |
43 | 43 | 'Zend\Loader\ClassMapAutoloader' => [ |
44 | - __DIR__ . '/src/autoload_classmap.php' |
|
44 | + __DIR__.'/src/autoload_classmap.php' |
|
45 | 45 | ], |
46 | 46 | 'Zend\Loader\StandardAutoloader' => array( |
47 | 47 | 'namespaces' => array( |
48 | - __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__, |
|
48 | + __NAMESPACE__ => __DIR__.'/src/'.__NAMESPACE__, |
|
49 | 49 | ), |
50 | 50 | ), |
51 | 51 | ); |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | * @param string $requestedName |
114 | 114 | * @param null|array $options |
115 | 115 | * |
116 | - * @return object |
|
116 | + * @return \Zend\EventManager\EventManagerInterface |
|
117 | 117 | * @throws ServiceNotFoundException if unable to resolve the service. |
118 | 118 | * @throws ServiceNotCreatedException if an exception is raised when |
119 | 119 | * creating a service. |
@@ -333,7 +333,7 @@ discard block |
||
333 | 333 | * @param string|array $options String is either event name or aggregate name (when name is int). |
334 | 334 | * Array are the options from config. [ [event,..], method, priority, lazy] |
335 | 335 | * |
336 | - * @return array |
|
336 | + * @return \Zend\EventManager\EventManagerInterface |
|
337 | 337 | */ |
338 | 338 | protected function normalizeListenerOptions($name, $options) |
339 | 339 | { |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | */ |
165 | 165 | public function createServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName) |
166 | 166 | { |
167 | - return $this($serviceLocator,$requestedName); |
|
167 | + return $this($serviceLocator, $requestedName); |
|
168 | 168 | } |
169 | 169 | |
170 | 170 | /** |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | $defaults = [ |
184 | 184 | 'service' => 'EventManager', |
185 | 185 | 'configure' => true, |
186 | - 'identifiers' => [ $name ], |
|
186 | + 'identifiers' => [$name], |
|
187 | 187 | 'event' => '\Zend\EventManager\Event', |
188 | 188 | 'listeners' => [], |
189 | 189 | ]; |
@@ -274,7 +274,7 @@ discard block |
||
274 | 274 | foreach ($listeners as $name => $options) { |
275 | 275 | $options = $this->normalizeListenerOptions($name, $options); |
276 | 276 | |
277 | - if ($options['lazy'] && null !== $options['attach'] ) { |
|
277 | + if ($options['lazy'] && null !== $options['attach']) { |
|
278 | 278 | foreach ($options['attach'] as $spec) { |
279 | 279 | $lazyListeners[] = [ |
280 | 280 | 'service' => $options['service'], |
@@ -304,7 +304,7 @@ discard block |
||
304 | 304 | } |
305 | 305 | |
306 | 306 | foreach ($options['attach'] as $spec) { |
307 | - $callback = $spec['method'] ? [ $listener, $spec['method'] ] : $listener; |
|
307 | + $callback = $spec['method'] ? [$listener, $spec['method']] : $listener; |
|
308 | 308 | $eventManager->attach($spec['event'], $callback, $spec['priority']); |
309 | 309 | } |
310 | 310 | } |
@@ -375,7 +375,7 @@ discard block |
||
375 | 375 | |
376 | 376 | if (is_string($options)) { |
377 | 377 | /* Only an event name is provided in config */ |
378 | - $normalized['attach'] = [ [ 'event' => $options, 'method' => null, 'priority' => 1 ] ]; |
|
378 | + $normalized['attach'] = [['event' => $options, 'method' => null, 'priority' => 1]]; |
|
379 | 379 | return $normalized; |
380 | 380 | |
381 | 381 | } |
@@ -404,7 +404,7 @@ discard block |
||
404 | 404 | } else if (is_string($opt)) { |
405 | 405 | if (null === $event) { |
406 | 406 | /* first string found is assumed to be the event name */ |
407 | - $event = [ $opt ]; |
|
407 | + $event = [$opt]; |
|
408 | 408 | } else { |
409 | 409 | /* second string found must be a method name. */ |
410 | 410 | $method = $opt; |
@@ -421,7 +421,7 @@ discard block |
||
421 | 421 | } |
422 | 422 | |
423 | 423 | foreach ($event as &$eventSpec) { |
424 | - $eventSpec = [ 'event' => $eventSpec, 'method' => $method, 'priority' => $priority ]; |
|
424 | + $eventSpec = ['event' => $eventSpec, 'method' => $method, 'priority' => $priority]; |
|
425 | 425 | } |
426 | 426 | |
427 | 427 | $normalized['attach'] = $event; |
@@ -433,7 +433,7 @@ discard block |
||
433 | 433 | protected function normalizeEventsSpec($options) |
434 | 434 | { |
435 | 435 | $listenerPriority = isset($options['priority']) ? $options['priority'] : 1; |
436 | - $listenerMethod = isset($options['method']) ? $options['method'] : '__none__'; |
|
436 | + $listenerMethod = isset($options['method']) ? $options['method'] : '__none__'; |
|
437 | 437 | $events = []; |
438 | 438 | |
439 | 439 | foreach ($options['events'] as $event => $spec) { |
@@ -453,7 +453,7 @@ discard block |
||
453 | 453 | } else if (is_array($spec)) { |
454 | 454 | if (isset($spec['method'])) { |
455 | 455 | if (!is_array($spec['method'])) { |
456 | - $spec['method'] = [ $spec['method'] ]; |
|
456 | + $spec['method'] = [$spec['method']]; |
|
457 | 457 | } |
458 | 458 | |
459 | 459 | foreach ($spec['method'] as $method => $methodPriority) { |
@@ -239,9 +239,9 @@ discard block |
||
239 | 239 | |
240 | 240 | $events->setIdentifiers($config['identifiers']); |
241 | 241 | |
242 | - /* @var \Zend\EventManager\EventInterface $event */ |
|
243 | - $event = $services->has($config['event']) ? $services->get($config['event']) : new $config['event'](); |
|
244 | - $events->setEventPrototype($event); |
|
242 | + /* @var \Zend\EventManager\EventInterface $event */ |
|
243 | + $event = $services->has($config['event']) ? $services->get($config['event']) : new $config['event'](); |
|
244 | + $events->setEventPrototype($event); |
|
245 | 245 | |
246 | 246 | if ('EventManager' != $config['service'] && method_exists($events, 'setSharedManager') && $services->has('SharedEventManager')) { |
247 | 247 | /* @var \Zend\EventManager\SharedEventManagerInterface $sharedEvents */ |
@@ -307,7 +307,7 @@ discard block |
||
307 | 307 | /* @var \Core\Listener\DeferredListenerAggregate $aggregate */ |
308 | 308 | $aggregate = $services->get('Core/Listener/DeferredListenerAggregate'); |
309 | 309 | $aggregate->setListeners($lazyListeners) |
310 | - ->attach($eventManager); |
|
310 | + ->attach($eventManager); |
|
311 | 311 | } |
312 | 312 | } |
313 | 313 |
@@ -30,7 +30,7 @@ |
||
30 | 30 | * @param string $requestedName |
31 | 31 | * @param null|array $options |
32 | 32 | * |
33 | - * @return object |
|
33 | + * @return MultipostingSelect |
|
34 | 34 | * @throws ServiceNotFoundException if unable to resolve the service. |
35 | 35 | * @throws ServiceNotCreatedException if an exception is raised when |
36 | 36 | * creating a service. |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | $router = $container->get('Router'); |
47 | 47 | $select = new MultipostingSelect(); |
48 | 48 | $helpers = $container->get('ViewHelperManager'); |
49 | - $currencyFormat = $helpers->get('currencyFormat'); |
|
49 | + $currencyFormat = $helpers->get('currencyFormat'); |
|
50 | 50 | |
51 | 51 | $channels = $container->get('Jobs/Options/Provider'); |
52 | 52 | |
@@ -67,11 +67,11 @@ discard block |
||
67 | 67 | |
68 | 68 | $link = $router->assemble($channel->getParams(), array('name' => $channel->getRoute())); |
69 | 69 | $groups[$category]['options'][$channel->getKey()] = |
70 | - $channel->getLabel() . '|' |
|
71 | - . $channel->getHeadLine() . '|' |
|
72 | - . $channel->getDescription() . '|' |
|
73 | - . $channel->getLinkText() . '|' |
|
74 | - . $link . '|' . $channel->getPublishDuration() . '|' |
|
70 | + $channel->getLabel().'|' |
|
71 | + . $channel->getHeadLine().'|' |
|
72 | + . $channel->getDescription().'|' |
|
73 | + . $channel->getLinkText().'|' |
|
74 | + . $link.'|'.$channel->getPublishDuration().'|' |
|
75 | 75 | . $channel->getLogo(); |
76 | 76 | } |
77 | 77 |
@@ -25,7 +25,7 @@ |
||
25 | 25 | * @param string $requestedName |
26 | 26 | * @param null|array $options |
27 | 27 | * |
28 | - * @return object |
|
28 | + * @return PaginationAdminQuery |
|
29 | 29 | * @throws ServiceNotFoundException if unable to resolve the service. |
30 | 30 | * @throws ServiceNotCreatedException if an exception is raised when |
31 | 31 | * creating a service. |
@@ -38,7 +38,7 @@ |
||
38 | 38 | $core = $container->get("Core/Options"); |
39 | 39 | |
40 | 40 | if ('' == $channel->getCurrency()) { |
41 | - $currency=$core->getDefaultCurrencyCode(); |
|
41 | + $currency = $core->getDefaultCurrencyCode(); |
|
42 | 42 | $channel->setCurrency($currency); |
43 | 43 | } |
44 | 44 |