Completed
Push — develop ( eaabb5...15c5ff )
by greg
12s
created
src/Query/Mysql/Conv.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -18,9 +18,9 @@
 block discarded – undo
18 18
 
19 19
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
20 20
     {
21
-        return 'CONV(' . $this->firstArithmetic->dispatch($sqlWalker) . ', '
22
-            . $this->secondArithmetic->dispatch($sqlWalker) . ', '
23
-            . $this->thirdArithmetic->dispatch($sqlWalker) . ')';
21
+        return 'CONV('.$this->firstArithmetic->dispatch($sqlWalker).', '
22
+            . $this->secondArithmetic->dispatch($sqlWalker).', '
23
+            . $this->thirdArithmetic->dispatch($sqlWalker).')';
24 24
     }
25 25
 
26 26
     public function parse(\Doctrine\ORM\Query\Parser $parser)
Please login to merge, or discard this patch.
src/Guard/Controller.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -76,8 +76,8 @@
 block discarded – undo
76 76
             null,
77 77
             $event->getParams()
78 78
         );
79
-        $return  = $results->last();
80
-        if (! $return) {
79
+        $return = $results->last();
80
+        if (!$return) {
81 81
             return $event->getResult();
82 82
         }
83 83
 
Please login to merge, or discard this patch.
src/Module.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
                     if (empty($locale) && in_array('cookie', $pgstrat)) {
90 90
                         $serviceManager->get('router')->setTranslator($translator);
91 91
                         if ($serviceManager->get('router')->match($serviceManager->get('request')) &&
92
-                            strpos($serviceManager->get('router')->match($serviceManager->get('request'))->getMatchedRouteName(), 'admin') !==false
92
+                            strpos($serviceManager->get('router')->match($serviceManager->get('request'))->getMatchedRouteName(), 'admin') !== false
93 93
                         ) {
94 94
                             if ($e->getRequest()->getCookie() &&
95 95
                                 $e->getRequest()->getCookie()->offsetExists('pg_locale_back')
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
 
197 197
         // Google Analytics : When the render event is triggered, we invoke the view helper to
198 198
         // render the javascript code.
199
-        $e->getApplication()->getEventManager()->attach(\Laminas\Mvc\MvcEvent::EVENT_RENDER, function (\Laminas\Mvc\MvcEvent $e) use ($serviceManager) {
199
+        $e->getApplication()->getEventManager()->attach(\Laminas\Mvc\MvcEvent::EVENT_RENDER, function(\Laminas\Mvc\MvcEvent $e) use ($serviceManager) {
200 200
             $view   = $serviceManager->get('ViewHelperManager');
201 201
             $plugin = $view->get('googleAnalytics');
202 202
             $plugin();
@@ -223,8 +223,8 @@  discard block
 block discarded – undo
223 223
                 // that they need to send the user back to FB...
224 224
 
225 225
                 if (!count($_COOKIE) > 0 && strpos($_SERVER['HTTP_USER_AGENT'], 'Safari')) {
226
-                    echo '<script type="text/javascript">' .
227
-                    'window.top.location.href = window.location.href+"?redir_fb_page_id='. $data["page"]["id"]. '";' .
226
+                    echo '<script type="text/javascript">'.
227
+                    'window.top.location.href = window.location.href+"?redir_fb_page_id='.$data["page"]["id"].'";'.
228 228
                     '</script>';
229 229
                 }
230 230
 
@@ -254,21 +254,21 @@  discard block
 block discarded – undo
254 254
 
255 255
     public function getConfig()
256 256
     {
257
-        return include __DIR__ . '/../config/module.config.php';
257
+        return include __DIR__.'/../config/module.config.php';
258 258
     }
259 259
 
260 260
     public function getViewHelperConfig()
261 261
     {
262 262
         return array(
263 263
             'factories' => array(
264
-                'QgCKEditor' => function (\Laminas\ServiceManager\ServiceManager $sm) {
264
+                'QgCKEditor' => function(\Laminas\ServiceManager\ServiceManager $sm) {
265 265
                     $config = $sm->get('config');
266 266
                     $QuCk = new View\Helper\AdCKEditor($config['playgroundcore']['ckeditor']);
267 267
 
268 268
                     return $QuCk;
269 269
                 },
270 270
 
271
-                'googleAnalytics' => function (\Laminas\ServiceManager\ServiceManager $sm) {
271
+                'googleAnalytics' => function(\Laminas\ServiceManager\ServiceManager $sm) {
272 272
                     $tracker = $sm->get('PlaygroundCore\Analytics\Tracker');
273 273
     
274 274
                     $helper  = new View\Helper\GoogleAnalytics($tracker, $sm->get('Request'));
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
276 276
                     return $helper;
277 277
                 },
278 278
 
279
-                'facebookOpengraph' => function (\Laminas\ServiceManager\ServiceManager $sm) {
279
+                'facebookOpengraph' => function(\Laminas\ServiceManager\ServiceManager $sm) {
280 280
                     $tracker = $sm->get('facebook-opengraph');
281 281
 
282 282
                     $helper  = new View\Helper\FacebookOpengraph($tracker, $sm->get('Request'));
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
284 284
                     return $helper;
285 285
                 },
286 286
                 
287
-                'twitterCard' => function (\Laminas\ServiceManager\ServiceManager $sm) {
287
+                'twitterCard' => function(\Laminas\ServiceManager\ServiceManager $sm) {
288 288
                     $viewHelper = new View\Helper\TwitterCard();
289 289
                     $viewHelper->setConfig($sm->get('twitter-card'));
290 290
                     $viewHelper->setRequest($sm->get('Request'));
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
                     return $viewHelper;
293 293
                 },
294 294
 
295
-                'switchLocaleWidget' => function (\Laminas\ServiceManager\ServiceManager $sm) {
295
+                'switchLocaleWidget' => function(\Laminas\ServiceManager\ServiceManager $sm) {
296 296
                     $viewHelper = new View\Helper\SwitchLocaleWidget();
297 297
                     $viewHelper->setLocaleService($sm->get('playgroundcore_locale_service'));
298 298
                     $viewHelper->setWebsiteService($sm->get('playgroundcore_website_service'));
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
                     return $viewHelper;
302 302
                 },
303 303
 
304
-                'countryName' => function (\Laminas\ServiceManager\ServiceManager $sm) {
304
+                'countryName' => function(\Laminas\ServiceManager\ServiceManager $sm) {
305 305
                     $service = $sm->get('playgroundcore_country_service');
306 306
                     $viewHelper = new View\Helper\CountryName($service);
307 307
 
@@ -322,13 +322,13 @@  discard block
 block discarded – undo
322 322
                 ),
323 323
 
324 324
                 'factories' => array(
325
-                    'playgroundcore_module_options' => function (\Laminas\ServiceManager\ServiceManager $sm) {
325
+                    'playgroundcore_module_options' => function(\Laminas\ServiceManager\ServiceManager $sm) {
326 326
                         $config = $sm->get('Configuration');
327 327
 
328 328
                         return new Options\ModuleOptions(isset($config['playgroundcore']) ? $config['playgroundcore'] : array());
329 329
                     },
330 330
 
331
-                    'playgroundcore_formgen_mapper' => function (\Laminas\ServiceManager\ServiceManager $sm) {
331
+                    'playgroundcore_formgen_mapper' => function(\Laminas\ServiceManager\ServiceManager $sm) {
332 332
                         return new Mapper\Formgen(
333 333
                             $sm->get('playgroundcore_doctrine_em'),
334 334
                             $sm->get('playgroundcore_module_options'),
@@ -336,7 +336,7 @@  discard block
 block discarded – undo
336 336
                         );
337 337
                     },
338 338
 
339
-                    'playgroundcore_website_mapper' => function (\Laminas\ServiceManager\ServiceManager $sm) {
339
+                    'playgroundcore_website_mapper' => function(\Laminas\ServiceManager\ServiceManager $sm) {
340 340
 
341 341
                         return new Mapper\Website(
342 342
                             $sm->get('playgroundcore_doctrine_em'),
@@ -345,14 +345,14 @@  discard block
 block discarded – undo
345 345
                         );
346 346
                     },
347 347
 
348
-                    'playgroundcore_locale_mapper' => function (\Laminas\ServiceManager\ServiceManager $sm) {
348
+                    'playgroundcore_locale_mapper' => function(\Laminas\ServiceManager\ServiceManager $sm) {
349 349
                         return new Mapper\Locale(
350 350
                             $sm->get('playgroundcore_doctrine_em'),
351 351
                             $sm->get('playgroundcore_module_options'),
352 352
                             $sm
353 353
                         );
354 354
                     },
355
-                    'PlaygroundCore\Analytics\Tracker' => function (\Laminas\ServiceManager\ServiceManager $sm) {
355
+                    'PlaygroundCore\Analytics\Tracker' => function(\Laminas\ServiceManager\ServiceManager $sm) {
356 356
                         return new Analytics\Tracker($sm->get('playgrounddesign_company_mapper'));
357 357
                     },
358 358
                     // DEPRECATED
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
391 391
 
392 392
                     //     return $tracker;
393 393
                     // },
394
-                    'PlaygroundCore\Opengraph\Tracker' => function (\Laminas\ServiceManager\ServiceManager $sm) {
394
+                    'PlaygroundCore\Opengraph\Tracker' => function(\Laminas\ServiceManager\ServiceManager $sm) {
395 395
                         $config = $sm->get('config');
396 396
                         $config = isset($config['playgroundcore']['facebookOpengraph']) ? $config['playgroundcore']['facebookOpengraph'] : array('appId' => '');
397 397
 
@@ -410,7 +410,7 @@  discard block
 block discarded – undo
410 410
 
411 411
                         return $tracker;
412 412
                     },
413
-                    'PlaygroundCore\TwitterCard\Config' => function (\Laminas\ServiceManager\ServiceManager $sm) {
413
+                    'PlaygroundCore\TwitterCard\Config' => function(\Laminas\ServiceManager\ServiceManager $sm) {
414 414
                         $config = $sm->get('config');
415 415
                         $config = isset($config['playgroundcore']['twitterCard']) ? $config['playgroundcore']['twitterCard'] : array();
416 416
                         return new TwitterCard\Config($config);
Please login to merge, or discard this patch.
src/Options/ModuleOptions.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
13 13
     protected $bitlyUrl      = 'http://api.bit.ly/v3/shorten';
14 14
     protected $transport_class = 'Laminas\Mail\Transport\File';
15 15
     protected $options_class   = 'Laminas\Mail\Transport\FileOptions';
16
-    protected $options   = array('path' => 'data/mail/');
16
+    protected $options = array('path' => 'data/mail/');
17 17
     protected $twilio = array();
18 18
     protected $phpvideotoolkit = array();
19 19
     protected $quConfig = array();
Please login to merge, or discard this patch.
src/Mail/Service/Message.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -57,8 +57,8 @@  discard block
 block discarded – undo
57 57
         $content = $renderer->render($nameOrModel, $values);
58 58
         $resolver = $this->serviceLocator->get('Laminas\View\Resolver\TemplatePathStack');
59 59
         // check if plain text email template exist
60
-        if ($resolver->resolve($nameOrModel . '-plain')) {
61
-            $contentText = $renderer->render($nameOrModel . '-plain', $values);
60
+        if ($resolver->resolve($nameOrModel.'-plain')) {
61
+            $contentText = $renderer->render($nameOrModel.'-plain', $values);
62 62
         } else {
63 63
             $contentText = '';
64 64
         }
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
         $html->encoding    = Mime::ENCODING_QUOTEDPRINTABLE;
78 78
         $html->disposition = Mime::DISPOSITION_INLINE;
79 79
         $html->charset     = 'UTF-8';
80
-        $bodyMessage     = new MimeMessage();
80
+        $bodyMessage = new MimeMessage();
81 81
 
82 82
         $multiPartContentMessage = new MimeMessage();
83 83
         $multiPartContentMessage->addPart($text);
Please login to merge, or discard this patch.
language/nl.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -11,8 +11,8 @@
 block discarded – undo
11 11
  * NL-Revision: 06 Nov 2015 *** G.Besson ***
12 12
  */
13 13
 return array(
14
-	// PlaygroundCore\Validator\Blacklist
15
-	"You're not allowed to use this word" => "Het is niet toegestaan ​​om dit woord te gebruiken",
14
+    // PlaygroundCore\Validator\Blacklist
15
+    "You're not allowed to use this word" => "Het is niet toegestaan ​​om dit woord te gebruiken",
16 16
 
17 17
     // Laminas\I18n\Validator\Alnum
18 18
     "Invalid type given. String, integer or float expected" => "Ongeldig type opgegeven, waarde moet een float, string of integer zijn",
Please login to merge, or discard this patch.
config/module.config.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -452,7 +452,7 @@  discard block
 block discarded – undo
452 452
                             'list' => array(
453 453
                                 'type' => 'Segment',
454 454
                                 'options' => array(
455
-                                     'route' => '/list',
455
+                                        'route' => '/list',
456 456
                                     'defaults' => array(
457 457
                                         'controller' => 'playgroundcore_admin_website',
458 458
                                         'action'     => 'list',
@@ -463,7 +463,7 @@  discard block
 block discarded – undo
463 463
                             'edit-active' => array(
464 464
                                 'type' => 'Segment',
465 465
                                 'options' => array(
466
-                                     'route' => '/edit-active/[:websiteId]',
466
+                                        'route' => '/edit-active/[:websiteId]',
467 467
                                     'defaults' => array(
468 468
                                         'controller' => 'playgroundcore_admin_website',
469 469
                                         'action'     => 'editactive',
@@ -572,6 +572,6 @@  discard block
 block discarded – undo
572 572
             'NotInBlacklist' => 'PlaygroundCore\Validator\Blacklist',
573 573
             'InMailDomainList' => 'PlaygroundCore\Validator\MailDomain',
574 574
             'InEmailList' => 'PlaygroundCore\Validator\EmailList',
575
-         ),
575
+            ),
576 576
     ),
577 577
 );
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
             'playgroundcore_entity' => array(
36 36
                 'class' => \Doctrine\ORM\Mapping\Driver\AnnotationDriver::class,
37 37
                 'cache' => 'array',
38
-                'paths' => [__DIR__ . '/../src/Entity']
38
+                'paths' => [__DIR__.'/../src/Entity']
39 39
             ),
40 40
 
41 41
             'orm_default' => array(
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
         'rule_providers' => array(
78 78
             'BjyAuthorize\Provider\Rule\Config' => array(
79 79
                 'allow' => array(
80
-                    array(array('admin'), 'core',           array('dashboard', 'edit')),
80
+                    array(array('admin'), 'core', array('dashboard', 'edit')),
81 81
                 ),
82 82
             ),
83 83
         ),
@@ -536,25 +536,25 @@  discard block
 block discarded – undo
536 536
         'translation_file_patterns' => array(
537 537
             array(
538 538
                 'type'         => 'phpArray',
539
-                'base_dir'     => __DIR__ . '/../language',
539
+                'base_dir'     => __DIR__.'/../language',
540 540
                 'pattern'      => '%s.php',
541 541
                 'text_domain'  => 'playgroundcore'
542 542
             ),
543 543
             array(
544 544
                 'type'         => 'phpArray',
545
-                'base_dir'     => __DIR__ . '/../../../../language',
545
+                'base_dir'     => __DIR__.'/../../../../language',
546 546
                 'pattern'      => '%s.php',
547 547
                 'text_domain'  => 'playgroundcore'
548 548
             ),
549 549
             array(
550 550
                 'type'         => 'phpArray',
551
-                'base_dir'     => __DIR__ . '/../language',
551
+                'base_dir'     => __DIR__.'/../language',
552 552
                 'pattern'      => 'routes_%s.php',
553 553
                 'text_domain'  => 'routes'
554 554
             ),
555 555
             array(
556 556
                 'type'         => 'phpArray',
557
-                'base_dir'     => __DIR__ . '/../../../../language',
557
+                'base_dir'     => __DIR__.'/../../../../language',
558 558
                 'pattern'      => 'routes_%s.php',
559 559
                 'text_domain'  => 'routes'
560 560
             ),
@@ -563,8 +563,8 @@  discard block
 block discarded – undo
563 563
 
564 564
     'view_manager' => array(
565 565
         'template_path_stack' => array(
566
-            __DIR__ . '/../view/admin',
567
-            __DIR__ . '/../view/frontend',
566
+            __DIR__.'/../view/admin',
567
+            __DIR__.'/../view/frontend',
568 568
         ),
569 569
     ),
570 570
 
Please login to merge, or discard this patch.