Completed
Pull Request — develop (#329)
by Carsten
09:54
created
module/Auth/src/Auth/Repository/User.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
      */
117 117
     public function findByProfileIdentifier($identifier, $provider, array $options = [])
118 118
     {
119
-        return $this->findOneBy(array('profiles.' . $provider . '.auth.identifier' => $identifier), $options) ?: $this->findOneBy(array('profile.identifier' => $identifier), $options);
119
+        return $this->findOneBy(array('profiles.'.$provider.'.auth.identifier' => $identifier), $options) ?: $this->findOneBy(array('profile.identifier' => $identifier), $options);
120 120
     }
121 121
     
122 122
     /**
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
         $qb->field('_id')->notEqual($curentUserId)
134 134
             ->addAnd(
135 135
                 $qb->expr()
136
-                    ->addOr($qb->expr()->field('profiles.' . $provider . '.auth.identifier' )->equals($identifier))
136
+                    ->addOr($qb->expr()->field('profiles.'.$provider.'.auth.identifier')->equals($identifier))
137 137
                     ->addOr($qb->expr()->field('profile.identifier')->equals($identifier))
138 138
             );
139 139
         
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
         return $this->findOneBy(
190 190
             array(
191 191
             '$or' => array(
192
-                array('login' => $identity . $suffix),
192
+                array('login' => $identity.$suffix),
193 193
                 array('info.email' => $identity)
194 194
             )
195 195
             )
@@ -238,10 +238,10 @@  discard block
 block discarded – undo
238 238
     public function findByQuery($query)
239 239
     {
240 240
         $qb = $this->createQueryBuilder();
241
-        $parts  = explode(' ', trim($query));
241
+        $parts = explode(' ', trim($query));
242 242
         
243 243
         foreach ($parts as $q) {
244
-            $regex = new \MongoRegex('/^' . $query . '/i');
244
+            $regex = new \MongoRegex('/^'.$query.'/i');
245 245
             $qb->addOr($qb->expr()->field('info.firstName')->equals($regex));
246 246
             $qb->addOr($qb->expr()->field('info.lastName')->equals($regex));
247 247
             $qb->addOr($qb->expr()->field('info.email')->equals($regex));
Please login to merge, or discard this patch.
module/Auth/src/Auth/Form/UserStatusFieldset.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -121,7 +121,7 @@
 block discarded – undo
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
             )
Please login to merge, or discard this patch.
module/Auth/src/Auth/Entity/Status.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -53,10 +53,10 @@
 block discarded – undo
53 53
     public function __construct($status = self::ACTIVE)
54 54
     {
55 55
         if (!isset(static::$orderMap[$status])) {
56
-            throw new \DomainException('Unknown status: ' . $status);
56
+            throw new \DomainException('Unknown status: '.$status);
57 57
         }
58 58
         
59
-        $constant = 'self::' . strtoupper($status);
59
+        $constant = 'self::'.strtoupper($status);
60 60
         $this->name = constant($constant);
61 61
         $this->order = $this->getOrder();
62 62
     }
Please login to merge, or discard this patch.
module/Auth/config/module.config.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
                  * for multiple paths.
30 30
                  * example https://github.com/doctrine/DoctrineORMModule
31 31
                  */
32
-                'paths' => array( __DIR__ . '/../src/Auth/Entity'),
32
+                'paths' => array(__DIR__.'/../src/Auth/Entity'),
33 33
             ),
34 34
         ),
35 35
     ),
@@ -107,13 +107,13 @@  discard block
 block discarded – undo
107 107
     'hybridauth' => array(
108 108
         "Facebook" => array(
109 109
             "enabled" => true,
110
-            "keys"    => array( "id" => "", "secret" => "" ),
110
+            "keys"    => array("id" => "", "secret" => ""),
111 111
             "scope"      => 'email, user_about_me, user_birthday, user_hometown, user_website',
112 112
             "display" => 'popup',
113 113
         ),
114 114
         "LinkedIn" => array(
115 115
             "enabled" => true,
116
-            "keys"    => array( "key" => "", "secret" => "" ),
116
+            "keys"    => array("key" => "", "secret" => ""),
117 117
         ),
118 118
         "XING" => array(
119 119
             "enabled" => true,
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
                 'class' => 'Hybrid_Providers_XING',
124 124
                 'path' => __FILE__,
125 125
             ),
126
-            "keys"    => array( "key" => "", "secret" => "" ),
126
+            "keys"    => array("key" => "", "secret" => ""),
127 127
         ),
128 128
         "Github" => array(
129 129
             "enabled" => true,
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
                 'class' => 'Hybrid_Providers_Github',
134 134
                 'path' => __FILE__,
135 135
             ),
136
-            "keys"    => array( "key" => "", "secret" => "" ),
136
+            "keys"    => array("key" => "", "secret" => ""),
137 137
         ),
138 138
 
139 139
     ),
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
         'translation_file_patterns' => array(
234 234
             array(
235 235
                 'type'     => 'gettext',
236
-                'base_dir' => __DIR__ . '/../language',
236
+                'base_dir' => __DIR__.'/../language',
237 237
                 'pattern'  => '%s.mo',
238 238
             ),
239 239
         ),
@@ -242,25 +242,25 @@  discard block
 block discarded – undo
242 242
     // Configure the view service manager
243 243
     'view_manager' => array(
244 244
         'template_map' => array(
245
-            'form/auth/contact.form' => __DIR__ . '/../view/form/contact.form.phtml',
246
-            'form/auth/contact.view' => __DIR__ . '/../view/form/contact.view.phtml',
247
-            'form/auth/status.form' => __DIR__ . '/../view/form/status.form.phtml',
248
-            'form/auth/status.view' => __DIR__ . '/../view/form/status.view.phtml',
249
-            'auth/error/social-profiles-unconfigured' => __DIR__ . '/../view/error/social-profiles-unconfigured.phtml',
250
-            'auth/form/user-info-container' => __DIR__ . '/../view/form/user-info-container.phtml',
251
-            'auth/form/user-status-container' => __DIR__ . '/../view/form/user-status-container.phtml',
252
-            'auth/form/userselect' => __DIR__ . '/../view/form/userselect.phtml',
253
-            'auth/form/social-profiles-fieldset' => __DIR__ . '/../view/form/social-profiles-fieldset.phtml',
254
-            'auth/form/social-profiles-button' => __DIR__ . '/../view/form/social-profiles-button.phtml',
255
-            'auth/sidebar/groups-menu' => __DIR__ . '/../view/sidebar/groups-menu.phtml',
256
-            'mail/first-external-login' => __DIR__ . '/../view/mail/first-external-login.phtml',
257
-            'mail/first-socialmedia-login' => __DIR__ . '/../view/mail/first-socialmedia-login.phtml',
258
-            'mail/forgotPassword' =>  __DIR__ . '/../view/mail/forgot-password.phtml',
259
-            'mail/register' =>  __DIR__ . '/../view/mail/register.phtml',
245
+            'form/auth/contact.form' => __DIR__.'/../view/form/contact.form.phtml',
246
+            'form/auth/contact.view' => __DIR__.'/../view/form/contact.view.phtml',
247
+            'form/auth/status.form' => __DIR__.'/../view/form/status.form.phtml',
248
+            'form/auth/status.view' => __DIR__.'/../view/form/status.view.phtml',
249
+            'auth/error/social-profiles-unconfigured' => __DIR__.'/../view/error/social-profiles-unconfigured.phtml',
250
+            'auth/form/user-info-container' => __DIR__.'/../view/form/user-info-container.phtml',
251
+            'auth/form/user-status-container' => __DIR__.'/../view/form/user-status-container.phtml',
252
+            'auth/form/userselect' => __DIR__.'/../view/form/userselect.phtml',
253
+            'auth/form/social-profiles-fieldset' => __DIR__.'/../view/form/social-profiles-fieldset.phtml',
254
+            'auth/form/social-profiles-button' => __DIR__.'/../view/form/social-profiles-button.phtml',
255
+            'auth/sidebar/groups-menu' => __DIR__.'/../view/sidebar/groups-menu.phtml',
256
+            'mail/first-external-login' => __DIR__.'/../view/mail/first-external-login.phtml',
257
+            'mail/first-socialmedia-login' => __DIR__.'/../view/mail/first-socialmedia-login.phtml',
258
+            'mail/forgotPassword' =>  __DIR__.'/../view/mail/forgot-password.phtml',
259
+            'mail/register' =>  __DIR__.'/../view/mail/register.phtml',
260 260
         ),
261 261
     
262 262
         'template_path_stack' => array(
263
-            'Auth' => __DIR__ . '/../view',
263
+            'Auth' => __DIR__.'/../view',
264 264
         ),
265 265
     ),
266 266
     
Please login to merge, or discard this patch.
module/Core/src/Core/EventManager/ListenerAggregateTrait.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@
 block discarded – undo
90 90
             $method = $spec[1];
91 91
             $priority = isset($spec[2]) ? $spec[2] : 0;
92 92
 
93
-            $this->listeners[] = $events->attach($event, [ $this, $method ], $priority);
93
+            $this->listeners[] = $events->attach($event, [$this, $method], $priority);
94 94
         }
95 95
 
96 96
         return $this;
Please login to merge, or discard this patch.
module/Orders/src/Controller/ListController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
     {
27 27
         return $this->pagination([
28 28
                                      'form' => ['Core/TextSearch', 'as' => 'form'],
29
-                                     'paginator' => ['Orders', [ 'sort' => 'date'], 'as' => 'orders']
29
+                                     'paginator' => ['Orders', ['sort' => 'date'], 'as' => 'orders']
30 30
                                  ]);
31 31
     }
32 32
 
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
         $order = $repository->find($id);
45 45
 
46 46
         if (!$order) {
47
-            throw new \InvalidArgumentException('No order with id "' . $id . '" found.');
47
+            throw new \InvalidArgumentException('No order with id "'.$id.'" found.');
48 48
         }
49 49
 
50 50
         return [
Please login to merge, or discard this patch.
module/Core/src/Core/Controller/Plugin/PaginationBuilder.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
         }
71 71
 
72 72
         if (!is_array($stack)) {
73
-            throw new \InvalidArgumentException('Expected argument to be of type array, but received ' . gettype($stack));
73
+            throw new \InvalidArgumentException('Expected argument to be of type array, but received '.gettype($stack));
74 74
         }
75 75
 
76 76
         $this->stack = $stack;
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
      *
137 137
      * @return self
138 138
      */
139
-    public function params($namespace, $defaults = [ 'page' => 1 ])
139
+    public function params($namespace, $defaults = ['page' => 1])
140 140
     {
141 141
         $this->stack['params'] = [$namespace, $defaults];
142 142
         return $this;
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/Controller/AdminController.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -26,9 +26,9 @@  discard block
 block discarded – undo
26 26
     public function indexAction()
27 27
     {
28 28
         return $this->pagination([
29
-            'params'    => [ 'Jobs_Admin', ['text', 'page' => 1, 'companyId', 'status' ] ],
30
-            'form'      => [ 'as' => 'form', 'Jobs/AdminSearch' ],
31
-            'paginator' => [ 'as' => 'jobs', 'Jobs/Admin' ],
29
+            'params'    => ['Jobs_Admin', ['text', 'page' => 1, 'companyId', 'status']],
30
+            'form'      => ['as' => 'form', 'Jobs/AdminSearch'],
31
+            'paginator' => ['as' => 'jobs', 'Jobs/Admin'],
32 32
         ]);
33 33
     }
34 34
 
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
                     $oldStatus = $job->getStatus();
55 55
                     $job->changeStatus($post['status'], '[System] Status changed via Admin GUI.');
56 56
                     $events = $services->get('Jobs/Events');
57
-                    $events->trigger(JobEvent::EVENT_STATUS_CHANGED, $this, [ 'job' => $job, 'status' => $oldStatus ]);
57
+                    $events->trigger(JobEvent::EVENT_STATUS_CHANGED, $this, ['job' => $job, 'status' => $oldStatus]);
58 58
                 }
59 59
             }
60 60
 
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 
67 67
         $form->bind($job);
68 68
 
69
-        return [ 'form' => $form, 'job' => $job ];
69
+        return ['form' => $form, 'job' => $job];
70 70
     }
71 71
     
72 72
 }
73 73
\ No newline at end of file
Please login to merge, or discard this patch.
module/Jobs/config/module.config.php 1 patch
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
                  * for multiple paths.
16 16
                  * example https://github.com/doctrine/DoctrineORMModule
17 17
                  */
18
-                'paths' => array( __DIR__ . '/../src/Jobs/Entity'),
18
+                'paths' => array(__DIR__.'/../src/Jobs/Entity'),
19 19
             ),
20 20
         ),
21 21
         'eventmanager' => array(
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
             'translation_file_patterns' => array(
47 47
                     array(
48 48
                             'type'     => 'gettext',
49
-                            'base_dir' => __DIR__ . '/../language',
49
+                            'base_dir' => __DIR__.'/../language',
50 50
                             'pattern'  => '%s.mo',
51 51
                     ),
52 52
             ),
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
                 'allow' => array(
85 85
                     'Jobboard',
86 86
                     'Jobs/Jobboard',
87
-                    'Jobs/Template' => [ 'view', 'edittemplate' ],
87
+                    'Jobs/Template' => ['view', 'edittemplate'],
88 88
                     'Jobs/Manage' => array(
89 89
                         'template',
90 90
                     ),
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
     ),
214 214
 
215 215
     'event_manager' => [
216
-        'Core/AdminController/Events' => [ 'listeners' => [
216
+        'Core/AdminController/Events' => ['listeners' => [
217 217
             'Jobs/Listener/AdminWidgetProvider' => \Core\Controller\AdminControllerEvent::EVENT_DASHBOARD,
218 218
         ]],
219 219
 
@@ -266,39 +266,39 @@  discard block
 block discarded – undo
266 266
     'view_manager' => array(
267 267
         // Map template to files. Speeds up the lookup through the template stack.
268 268
         'template_map' => array(
269
-            'jobs/form/list-filter' => __DIR__ . '/../view/form/list-filter.phtml',
270
-            'jobs/form/apply-identifier' => __DIR__ . '/../view/form/apply-identifier.phtml',
271
-            'jobs/form/hiring-organization-select' => __DIR__ . '/../view/form/hiring-organization-select.phtml',
272
-            'jobs/form/multiposting-select' => __DIR__ . '/../view/form/multiposting-select.phtml',
273
-            'jobs/form/multiposting-checkboxes' => __DIR__ . '/../view/form/multiposting-checkboxes.phtml',
274
-            'jobs/form/ats-mode.view' => __DIR__ . '/../view/form/ats-mode.view.phtml',
275
-            'jobs/form/ats-mode.form' => __DIR__ . '/../view/form/ats-mode.form.phtml',
276
-            'jobs/form/preview' => __DIR__ . '/../view/form/preview.phtml',
277
-            'jobs/partials/channel-list' => __DIR__ . '/../view/partials/channel-list.phtml',
278
-            'jobs/assign-user' => __DIR__ . '/../view/jobs/manage/assign-user.phtml',
279
-            'jobs/snapshot_or_preview' => __DIR__ . '/../view/partials/snapshot_or_preview.phtml',
280
-            'jobs/history' => __DIR__ . '/../view/partials/history.phtml',
281
-            'jobs/portalsummary' => __DIR__ . '/../view/partials/portalsummary.phtml',
282
-            'content/jobs-publish-on-yawik' => __DIR__ . '/../view/modals/yawik.phtml',
283
-            'content/jobs-publish-on-jobsintown' => __DIR__ . '/../view/modals/jobsintown.phtml',
284
-            'content/jobs-publish-on-homepage' => __DIR__ . '/../view/modals/homepage.phtml',
285
-            'content/jobs-publish-on-fazjob' => __DIR__ . '/../view/modals/fazjob.phtml',
286
-            'content/jobs-terms-and-conditions' => __DIR__ . '/../view/jobs/index/terms.phtml',
287
-            'mail/job-created' => __DIR__ . '/../view/mails/job-created.phtml',
288
-            'mail/job-pending' => __DIR__ . '/../view/mails/job-pending.phtml',
289
-            'mail/job-accepted' => __DIR__ . '/../view/mails/job-accepted.phtml',
290
-            'mail/job-rejected' => __DIR__ . '/../view/mails/job-rejected.phtml',
291
-            'mail/job-created.en' => __DIR__ . '/../view/mails/job-created.en.phtml',
292
-            'mail/job-pending.en' => __DIR__ . '/../view/mails/job-pending.en.phtml',
293
-            'mail/job-accepted.en' => __DIR__ . '/../view/mails/job-accepted.en.phtml',
294
-            'mail/job-rejected.en' => __DIR__ . '/../view/mails/job-rejected.en.phtml',
295
-            'jobs/error/no-parent' => __DIR__ . '/../view/error/no-parent.phtml',
296
-            'jobs/error/expired' => __DIR__ . '/../view/error/expired.phtml',
269
+            'jobs/form/list-filter' => __DIR__.'/../view/form/list-filter.phtml',
270
+            'jobs/form/apply-identifier' => __DIR__.'/../view/form/apply-identifier.phtml',
271
+            'jobs/form/hiring-organization-select' => __DIR__.'/../view/form/hiring-organization-select.phtml',
272
+            'jobs/form/multiposting-select' => __DIR__.'/../view/form/multiposting-select.phtml',
273
+            'jobs/form/multiposting-checkboxes' => __DIR__.'/../view/form/multiposting-checkboxes.phtml',
274
+            'jobs/form/ats-mode.view' => __DIR__.'/../view/form/ats-mode.view.phtml',
275
+            'jobs/form/ats-mode.form' => __DIR__.'/../view/form/ats-mode.form.phtml',
276
+            'jobs/form/preview' => __DIR__.'/../view/form/preview.phtml',
277
+            'jobs/partials/channel-list' => __DIR__.'/../view/partials/channel-list.phtml',
278
+            'jobs/assign-user' => __DIR__.'/../view/jobs/manage/assign-user.phtml',
279
+            'jobs/snapshot_or_preview' => __DIR__.'/../view/partials/snapshot_or_preview.phtml',
280
+            'jobs/history' => __DIR__.'/../view/partials/history.phtml',
281
+            'jobs/portalsummary' => __DIR__.'/../view/partials/portalsummary.phtml',
282
+            'content/jobs-publish-on-yawik' => __DIR__.'/../view/modals/yawik.phtml',
283
+            'content/jobs-publish-on-jobsintown' => __DIR__.'/../view/modals/jobsintown.phtml',
284
+            'content/jobs-publish-on-homepage' => __DIR__.'/../view/modals/homepage.phtml',
285
+            'content/jobs-publish-on-fazjob' => __DIR__.'/../view/modals/fazjob.phtml',
286
+            'content/jobs-terms-and-conditions' => __DIR__.'/../view/jobs/index/terms.phtml',
287
+            'mail/job-created' => __DIR__.'/../view/mails/job-created.phtml',
288
+            'mail/job-pending' => __DIR__.'/../view/mails/job-pending.phtml',
289
+            'mail/job-accepted' => __DIR__.'/../view/mails/job-accepted.phtml',
290
+            'mail/job-rejected' => __DIR__.'/../view/mails/job-rejected.phtml',
291
+            'mail/job-created.en' => __DIR__.'/../view/mails/job-created.en.phtml',
292
+            'mail/job-pending.en' => __DIR__.'/../view/mails/job-pending.en.phtml',
293
+            'mail/job-accepted.en' => __DIR__.'/../view/mails/job-accepted.en.phtml',
294
+            'mail/job-rejected.en' => __DIR__.'/../view/mails/job-rejected.en.phtml',
295
+            'jobs/error/no-parent' => __DIR__.'/../view/error/no-parent.phtml',
296
+            'jobs/error/expired' => __DIR__.'/../view/error/expired.phtml',
297 297
         ),
298 298
 
299 299
         // Where to look for view templates not mapped above
300 300
         'template_path_stack' => array(
301
-            __DIR__ . '/../view',
301
+            __DIR__.'/../view',
302 302
         ),
303 303
     ),
304 304
 
Please login to merge, or discard this patch.