@@ -121,7 +121,7 @@ |
||
121 | 121 | 'attributes' => [ |
122 | 122 | 'data-placeholder' => /*@translate*/ 'please select', |
123 | 123 | 'data-allowclear' => 'false', |
124 | - 'data-searchbox' => -1, // hide the search box |
|
124 | + 'data-searchbox' => -1, // hide the search box |
|
125 | 125 | 'required' => true, // mark label as required |
126 | 126 | ], |
127 | 127 | ) |
@@ -55,7 +55,7 @@ |
||
55 | 55 | ), |
56 | 56 | 'attributes' => [ |
57 | 57 | 'value' => '10', // default distance |
58 | - 'data-searchbox' => -1, // hide the search box |
|
58 | + 'data-searchbox' => -1, // hide the search box |
|
59 | 59 | 'data-allowclear' => 'false', // allow to clear a selected value |
60 | 60 | 'data-placeholder' => /*@translate*/ 'Distance', |
61 | 61 | ] |
@@ -60,6 +60,6 @@ |
||
60 | 60 | $services = $application->getServiceManager(); |
61 | 61 | |
62 | 62 | $services->get('Install/Listener/LanguageSetter') |
63 | - ->attach($eventManager); |
|
63 | + ->attach($eventManager); |
|
64 | 64 | } |
65 | 65 | } |
@@ -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' => array( |
34 | - __DIR__ . '/autoload_classmap.php', |
|
34 | + __DIR__.'/autoload_classmap.php', |
|
35 | 35 | array( |
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 | ); |
@@ -14,10 +14,10 @@ |
||
14 | 14 | protected $validator; |
15 | 15 | |
16 | 16 | /** |
17 | - * Get a validator if none has been set. |
|
18 | - * https://github.com/posabsolute/jQuery-Validation-Engine/issues/265 |
|
19 | - * @return RegexValidator |
|
20 | - */ |
|
17 | + * Get a validator if none has been set. |
|
18 | + * https://github.com/posabsolute/jQuery-Validation-Engine/issues/265 |
|
19 | + * @return RegexValidator |
|
20 | + */ |
|
21 | 21 | public function getValidator() |
22 | 22 | { |
23 | 23 | if (null === $this->validator) { |
@@ -22,7 +22,7 @@ |
||
22 | 22 | * Creates an instance of MailForgotPassword |
23 | 23 | * |
24 | 24 | * @param ServiceLocatorInterface $serviceLocator |
25 | - * @return \Auth\View\Helper\Auth |
|
25 | + * @return MailForgotPassword |
|
26 | 26 | * @see \Zend\ServiceManager\FactoryInterface::createService() |
27 | 27 | */ |
28 | 28 | public function createService(ServiceLocatorInterface $serviceLocator) |
@@ -55,7 +55,7 @@ |
||
55 | 55 | * @param Params $params |
56 | 56 | * @param bool $allowDraft |
57 | 57 | * |
58 | - * @return object|\Organizations\Entity\Organization |
|
58 | + * @return \Organizations\Entity\OrganizationInterface |
|
59 | 59 | * @throws UnauthorizedAccessException |
60 | 60 | * @throws \Doctrine\ODM\MongoDB\LockException |
61 | 61 | */ |
@@ -40,10 +40,10 @@ discard block |
||
40 | 40 | */ |
41 | 41 | protected $acl; |
42 | 42 | |
43 | - public function __construct(RepositoryService $repositoryService,AuthenticationService $auth, Acl $acl) { |
|
44 | - $this->repositoryService=$repositoryService; |
|
45 | - $this->auth=$auth; |
|
46 | - $this->acl=$acl; |
|
43 | + public function __construct(RepositoryService $repositoryService, AuthenticationService $auth, Acl $acl) { |
|
44 | + $this->repositoryService = $repositoryService; |
|
45 | + $this->auth = $auth; |
|
46 | + $this->acl = $acl; |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | public function __invoke() |
@@ -59,9 +59,9 @@ discard block |
||
59 | 59 | * @throws UnauthorizedAccessException |
60 | 60 | * @throws \Doctrine\ODM\MongoDB\LockException |
61 | 61 | */ |
62 | - public function process(Params $params,$allowDraft = true) |
|
62 | + public function process(Params $params, $allowDraft = true) |
|
63 | 63 | { |
64 | - $repositories = $this->repositoryService; |
|
64 | + $repositories = $this->repositoryService; |
|
65 | 65 | $organizationRepository = $this->repositoryService->get('Organizations/Organization'); |
66 | 66 | |
67 | 67 | $idFromRoute = $params('id', 0); |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | $user = $this->auth->getUser(); /* @var $user \Auth\Entity\UserInterface */ |
70 | 70 | |
71 | 71 | /* @var $organizationId string */ |
72 | - $organizationId = empty($idFromRoute)?$idFromSubForm:$idFromRoute; |
|
72 | + $organizationId = empty($idFromRoute) ? $idFromSubForm : $idFromRoute; |
|
73 | 73 | |
74 | 74 | $editOwnOrganization = '__my__' === $organizationId; |
75 | 75 | |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | return $organization; |
105 | 105 | } |
106 | 106 | |
107 | - $organization = $organizationRepository->find($organizationId); |
|
107 | + $organization = $organizationRepository->find($organizationId); |
|
108 | 108 | if (!$organization) { |
109 | 109 | throw new \RuntimeException('No Organization found with id "' . $organizationId . '"'); |
110 | 110 | } |
@@ -17,7 +17,7 @@ |
||
17 | 17 | /** |
18 | 18 | * @param string $par Query Parameter |
19 | 19 | * @param string $geoCoderUrl Url of the geo location service |
20 | - * @param string $land language |
|
20 | + * @param string $lang language |
|
21 | 21 | * |
22 | 22 | * @return array|mixed|string |
23 | 23 | */ |
@@ -51,16 +51,16 @@ |
||
51 | 51 | $r=[]; |
52 | 52 | foreach ($result as $key => $val) { |
53 | 53 | $row=['name' => (property_exists($val->properties, 'name') ? $val->properties->name:''), |
54 | - 'postcode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode:''), |
|
55 | - 'city' =>(property_exists($val->properties, 'city') ? $val->properties->city:''), |
|
56 | - 'street' => (property_exists($val->properties, 'street') ? $val->properties->street : ''), |
|
57 | - 'state' => (property_exists($val->properties, 'state') ? $val->properties->state : ''), |
|
58 | - 'country' => (property_exists($val->properties, 'country') ? $val->properties->country : ''), |
|
59 | - 'coordinates' => implode(":", $val->geometry->coordinates), |
|
60 | - 'osm_key' => (property_exists($val->properties, 'osm_key') ? $val->properties->osm_key : ''), |
|
61 | - 'osm_value' => (property_exists($val->properties, 'osm_value') ? $val->properties->osm_value : ''), |
|
62 | - 'osm_id' => (property_exists($val->properties, 'osm_id') ? $val->properties->osm_id : ''), |
|
63 | - 'data' => json_encode($val), |
|
54 | + 'postcode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode:''), |
|
55 | + 'city' =>(property_exists($val->properties, 'city') ? $val->properties->city:''), |
|
56 | + 'street' => (property_exists($val->properties, 'street') ? $val->properties->street : ''), |
|
57 | + 'state' => (property_exists($val->properties, 'state') ? $val->properties->state : ''), |
|
58 | + 'country' => (property_exists($val->properties, 'country') ? $val->properties->country : ''), |
|
59 | + 'coordinates' => implode(":", $val->geometry->coordinates), |
|
60 | + 'osm_key' => (property_exists($val->properties, 'osm_key') ? $val->properties->osm_key : ''), |
|
61 | + 'osm_value' => (property_exists($val->properties, 'osm_value') ? $val->properties->osm_value : ''), |
|
62 | + 'osm_id' => (property_exists($val->properties, 'osm_id') ? $val->properties->osm_id : ''), |
|
63 | + 'data' => json_encode($val), |
|
64 | 64 | ]; |
65 | 65 | $r[]=$row; |
66 | 66 | } |
@@ -27,11 +27,11 @@ discard block |
||
27 | 27 | $client->setMethod('GET'); |
28 | 28 | |
29 | 29 | $osmTags = [ |
30 | - 'tourism','aeroway','railway', 'amenity', 'historic', 'tunnel', 'mountain_pass', |
|
30 | + 'tourism', 'aeroway', 'railway', 'amenity', 'historic', 'tunnel', 'mountain_pass', |
|
31 | 31 | 'leisure', 'natural', 'bridge', 'waterway' |
32 | 32 | ]; |
33 | 33 | |
34 | - $osmTags = array_map(function($i) { return urlencode('!' . $i); }, $osmTags); |
|
34 | + $osmTags = array_map(function($i) { return urlencode('!'.$i); }, $osmTags); |
|
35 | 35 | |
36 | 36 | $uri = sprintf( |
37 | 37 | '%s?q=%s&lang=%s&osm_tag=%s', |
@@ -48,11 +48,11 @@ discard block |
||
48 | 48 | $result = $response->getBody(); |
49 | 49 | $result = json_decode($result); |
50 | 50 | $result = $result->features; |
51 | - $r=[]; |
|
51 | + $r = []; |
|
52 | 52 | foreach ($result as $key => $val) { |
53 | - $row=['name' => (property_exists($val->properties, 'name') ? $val->properties->name:''), |
|
54 | - 'postcode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode:''), |
|
55 | - 'city' =>(property_exists($val->properties, 'city') ? $val->properties->city:''), |
|
53 | + $row = ['name' => (property_exists($val->properties, 'name') ? $val->properties->name : ''), |
|
54 | + 'postcode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode : ''), |
|
55 | + 'city' =>(property_exists($val->properties, 'city') ? $val->properties->city : ''), |
|
56 | 56 | 'street' => (property_exists($val->properties, 'street') ? $val->properties->street : ''), |
57 | 57 | 'state' => (property_exists($val->properties, 'state') ? $val->properties->state : ''), |
58 | 58 | 'country' => (property_exists($val->properties, 'country') ? $val->properties->country : ''), |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | 'osm_id' => (property_exists($val->properties, 'osm_id') ? $val->properties->osm_id : ''), |
63 | 63 | 'data' => json_encode($val), |
64 | 64 | ]; |
65 | - $r[]=$row; |
|
65 | + $r[] = $row; |
|
66 | 66 | } |
67 | 67 | return $r; |
68 | 68 | } |
@@ -19,7 +19,7 @@ |
||
19 | 19 | { |
20 | 20 | /** |
21 | 21 | * @param ServiceLocatorInterface $serviceLocator |
22 | - * @return PaginationAdminQuery|mixed |
|
22 | + * @return PaginationAdminQuery |
|
23 | 23 | */ |
24 | 24 | public function createService(ServiceLocatorInterface $serviceLocator) |
25 | 25 | { |
@@ -14,7 +14,7 @@ |
||
14 | 14 | { |
15 | 15 | /** |
16 | 16 | * @param ServiceLocatorInterface $serviceLocator |
17 | - * @return PaginationQuery|mixed |
|
17 | + * @return PaginationQuery |
|
18 | 18 | */ |
19 | 19 | public function createService(ServiceLocatorInterface $serviceLocator) |
20 | 20 | { |