@@ -72,10 +72,10 @@ |
||
72 | 72 | if (0 === strpos($value, '{')) { |
73 | 73 | return $value; |
74 | 74 | } |
75 | - if ($value){ |
|
75 | + if ($value) { |
|
76 | 76 | $data = $this->geoClient->queryOne($value); |
77 | 77 | return $data['id']; |
78 | - }else{ |
|
78 | + } else { |
|
79 | 79 | return; |
80 | 80 | } |
81 | 81 | } |
@@ -75,7 +75,7 @@ |
||
75 | 75 | if ($value){ |
76 | 76 | $data = $this->geoClient->queryOne($value); |
77 | 77 | return $data['id']; |
78 | - }else{ |
|
78 | + } else{ |
|
79 | 79 | return; |
80 | 80 | } |
81 | 81 | } |
@@ -43,9 +43,9 @@ discard block |
||
43 | 43 | |
44 | 44 | public function __construct(RepositoryService $repositoryService, AuthenticationService $auth, Acl $acl) |
45 | 45 | { |
46 | - $this->repositoryService=$repositoryService; |
|
47 | - $this->auth=$auth; |
|
48 | - $this->acl=$acl; |
|
46 | + $this->repositoryService = $repositoryService; |
|
47 | + $this->auth = $auth; |
|
48 | + $this->acl = $acl; |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | public function __invoke() |
@@ -64,12 +64,12 @@ discard block |
||
64 | 64 | public function get(Params $params, $allowDraft = false, $getSnapshot = false) |
65 | 65 | { |
66 | 66 | /* @var \Jobs\Repository\Job $jobRepository */ |
67 | - $jobRepository = $this->repositoryService->get('Jobs/Job'); |
|
67 | + $jobRepository = $this->repositoryService->get('Jobs/Job'); |
|
68 | 68 | $idFromRoute = $params('id', 0); |
69 | 69 | $idFromQuery = $params->fromQuery('id', 0); |
70 | 70 | $idFromSubForm = $params->fromPost('job', 0); |
71 | 71 | |
72 | - $id = empty($idFromRoute)? (empty($idFromQuery)?$idFromSubForm:$idFromQuery) : $idFromRoute; |
|
72 | + $id = empty($idFromRoute) ? (empty($idFromQuery) ? $idFromSubForm : $idFromQuery) : $idFromRoute; |
|
73 | 73 | $snapshotId = $params->fromPost('snapshot') ?: ($params->fromQuery('snapshot') ?: null); |
74 | 74 | |
75 | 75 | if (empty($id) && empty($snapshotId) && $allowDraft) { |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | /** |
94 | 94 | * Switch to another user. |
95 | 95 | * |
96 | - * @param string|UserInterface $id user id of the user to switch to. |
|
96 | + * @param string $id user id of the user to switch to. |
|
97 | 97 | * @param array $params Additional parameters to store in the session container. |
98 | 98 | * |
99 | 99 | * @return bool |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | * @param string $key |
168 | 168 | * @param mixed $default Value to return if param $key is not set. |
169 | 169 | * |
170 | - * @return null |
|
170 | + * @return string |
|
171 | 171 | */ |
172 | 172 | public function getSessionParam($key, $default = null) |
173 | 173 | { |
@@ -65,6 +65,6 @@ |
||
65 | 65 | 'admin' => 1, |
66 | 66 | ]], |
67 | 67 | true |
68 | - ) . '&return=' . $this->returnUrl; |
|
68 | + ).'&return='.$this->returnUrl; |
|
69 | 69 | } |
70 | 70 | } |
71 | 71 | \ No newline at end of file |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | if (0 === strpos($value, '{')) { |
63 | 63 | return $value; |
64 | 64 | } |
65 | - if ($value){ |
|
65 | + if ($value) { |
|
66 | 66 | foreach ($this->getValueOptions() as $optValue => $opt) { |
67 | 67 | if (false !== strpos($value, $opt)) { |
68 | 68 | return $optValue; |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | }, |
76 | 76 | |
77 | 77 | /* hydrate */ |
78 | - function ($value) { |
|
78 | + function($value) { |
|
79 | 79 | if (empty($value) || 0 !== strpos($value, '{')) { |
80 | 80 | return null; |
81 | 81 | } |
@@ -32,7 +32,7 @@ |
||
32 | 32 | * |
33 | 33 | * @var array |
34 | 34 | */ |
35 | - protected $fields=[ |
|
35 | + protected $fields=[ |
|
36 | 36 | self::TITLE => [ |
37 | 37 | 'enabled' => true, |
38 | 38 | 'options' => [ |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | class BaseFieldsetOptions extends FieldsetCustomizationOptions |
25 | 25 | { |
26 | 26 | |
27 | - const TITLE = 'title'; |
|
27 | + const TITLE = 'title'; |
|
28 | 28 | const LOCATION = 'geoLocation'; |
29 | 29 | |
30 | 30 | /** |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | * |
33 | 33 | * @var array |
34 | 34 | */ |
35 | - protected $fields=[ |
|
35 | + protected $fields = [ |
|
36 | 36 | self::TITLE => [ |
37 | 37 | 'enabled' => true, |
38 | 38 | 'options' => [ |
@@ -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 | } |