Completed
Pull Request — develop (#235)
by ANTHONIUS
07:49
created
module/Jobs/src/Jobs/Form/ListFilterAdminFieldset.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@
 block discarded – undo
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
                 ]
Please login to merge, or discard this patch.
module/Install/Module.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -60,6 +60,6 @@
 block discarded – undo
60 60
         $services     = $application->getServiceManager();
61 61
 
62 62
         $services->get('Install/Listener/LanguageSetter')
63
-                 ->attach($eventManager);
63
+                    ->attach($eventManager);
64 64
     }
65 65
 }
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -24,23 +24,23 @@
 block discarded – undo
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
         );
Please login to merge, or discard this patch.
module/Auth/src/Acl/Controller/Plugin/Acl.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -155,8 +155,8 @@
 block discarded – undo
155 155
     }
156 156
 
157 157
     /**
158
-     * @param null $resource
159
-     * @param null $privilege
158
+     * @param null|string $resource
159
+     * @param null|string $privilege
160 160
      * @param string $mode
161 161
      * @return $this|bool
162 162
      */
Please login to merge, or discard this patch.
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -138,14 +138,14 @@
 block discarded – undo
138 138
         if (!$this->test($resource, $privilege)) {
139 139
             $msg = null === $privilege
140 140
                  ? sprintf(
141
-                     'You are not allowed to access resource "%s"',
142
-                     is_object($resource) ? $resource->getResourceId() : $resource
143
-                 )
141
+                        'You are not allowed to access resource "%s"',
142
+                        is_object($resource) ? $resource->getResourceId() : $resource
143
+                    )
144 144
                  : sprintf(
145
-                     'You are not allowed to execute operation "%s" on resource "%s"',
146
-                     $privilege,
147
-                     is_object($resource) ? $resource->getResourceId() : $resource
148
-                 );
145
+                        'You are not allowed to execute operation "%s" on resource "%s"',
146
+                        $privilege,
147
+                        is_object($resource) ? $resource->getResourceId() : $resource
148
+                    );
149 149
             
150 150
             if ($resource instanceof FileInterface && 0 == strpos($resource->type, 'image/')) {
151 151
                 throw new UnauthorizedImageAccessException(str_replace('resource', 'image', $msg));
Please login to merge, or discard this patch.
module/Core/src/Core/Form/Element/Phone.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -14,10 +14,10 @@
 block discarded – undo
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) {
Please login to merge, or discard this patch.
module/Auth/src/Auth/Factory/Listener/MailForgotPasswordFactory.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
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)
Please login to merge, or discard this patch.
module/Geo/src/Geo/Controller/Plugin/Photon.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
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
      */
Please login to merge, or discard this patch.
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -51,16 +51,16 @@
 block discarded – undo
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
         }
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -27,11 +27,11 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
     }
Please login to merge, or discard this patch.
Jobs/src/Jobs/Factory/Repository/Filter/PaginationAdminQueryFactory.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@
 block discarded – undo
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
     {
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/Factory/Repository/Filter/PaginationQueryFactory.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
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
     {
Please login to merge, or discard this patch.
module/Organizations/src/Organizations/Mail/EmployeeInvitationFactory.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -81,12 +81,12 @@  discard block
 block discarded – undo
81 81
         $url = $router->assemble(
82 82
             array('action' => 'accept'),
83 83
             array(
84
-                                     'name'  => 'lang/organizations/invite',
85
-                                     'query' => array(
86
-                                         'token'        => $this->options['token'],
87
-                                         'organization' => $org->getId()
88
-                                     )
89
-                                 )
84
+                                        'name'  => 'lang/organizations/invite',
85
+                                        'query' => array(
86
+                                            'token'        => $this->options['token'],
87
+                                            'organization' => $org->getId()
88
+                                        )
89
+                                    )
90 90
         );
91 91
 
92 92
         $variables = array(
@@ -107,14 +107,14 @@  discard block
 block discarded – undo
107 107
 
108 108
         $mail = $serviceLocator->get('htmltemplate');
109 109
         $mail->setTemplate($this->options['template'])
110
-             ->setVariables($variables)
111
-             ->setSubject(
112
-                 sprintf(
113
-                     /* @translate */ 'Invitation to join the team of %s',
114
-                     $orgName
115
-                 )
116
-             )
117
-             ->addTo($user->getEmail());
110
+                ->setVariables($variables)
111
+                ->setSubject(
112
+                    sprintf(
113
+                        /* @translate */ 'Invitation to join the team of %s',
114
+                        $orgName
115
+                    )
116
+                )
117
+                ->addTo($user->getEmail());
118 118
 
119 119
         return $mail;
120 120
     }
Please login to merge, or discard this patch.