Completed
Push — develop ( 257d08...3d165a )
by greg
02:23
created
Module.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -4,4 +4,4 @@
 block discarded – undo
4 4
  * It allows usage of this module even without composer.
5 5
  * The original Module.php is in 'src/PlaygroundCore' in order to respect PSR-0
6 6
  */
7
-require_once __DIR__ . '/src/PlaygroundCore/Module.php';
7
+require_once __DIR__.'/src/PlaygroundCore/Module.php';
Please login to merge, or discard this patch.
autoload_function.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2
-return function ($class) {
2
+return function($class) {
3 3
     static $map;
4
-    if (!$map) $map = include __DIR__ . '/autoload_classmap.php';
4
+    if (!$map) $map = include __DIR__.'/autoload_classmap.php';
5 5
     if (!isset($map[$class])) return false;
6 6
 
7 7
     return include $map[$class];
Please login to merge, or discard this patch.
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,8 +1,12 @@
 block discarded – undo
1 1
 <?php
2 2
 return function ($class) {
3 3
     static $map;
4
-    if (!$map) $map = include __DIR__ . '/autoload_classmap.php';
5
-    if (!isset($map[$class])) return false;
4
+    if (!$map) {
5
+        $map = include __DIR__ . '/autoload_classmap.php';
6
+    }
7
+    if (!isset($map[$class])) {
8
+        return false;
9
+    }
6 10
 
7 11
     return include $map[$class];
8 12
 };
Please login to merge, or discard this patch.
autoload_register.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,2 +1,2 @@
 block discarded – undo
1 1
 <?php
2
-spl_autoload_register(include __DIR__ . '/autoload_function.php');
2
+spl_autoload_register(include __DIR__.'/autoload_function.php');
Please login to merge, or discard this patch.
language/en_US.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -309,13 +309,13 @@  discard block
 block discarded – undo
309 309
     'Object' => 'Object',
310 310
     'Message' => 'Message',
311 311
     
312
-	// CONTACT FORM
313
-	'Contact us' => 'Contact us',
314
-	'A question to ask ?' => 'A question to ask ?',
315
-	'Your name' => 'Your name',
316
-	'Your first name' => 'Your first name',
317
-	'Your email' => 'Your email',
318
-	'I have a technical problem' => 'I have a technical problem',
312
+    // CONTACT FORM
313
+    'Contact us' => 'Contact us',
314
+    'A question to ask ?' => 'A question to ask ?',
315
+    'Your name' => 'Your name',
316
+    'Your first name' => 'Your first name',
317
+    'Your email' => 'Your email',
318
+    'I have a technical problem' => 'I have a technical problem',
319 319
     'I have a question about games' => 'I have a question about games',
320 320
     'I have not received my lot or my invitation' => 'I have not received my lot or my invitation',
321 321
     'I have a comment or suggestion' => 'I have a comment or suggestion',
@@ -344,9 +344,9 @@  discard block
 block discarded – undo
344 344
     'Previous exceptions' => 'Previous exceptions',
345 345
     'No Exception available' => 'No Exception available',
346 346
     'Other games in' => 'Other games in',
347
-	'' => '',
348
-	'' => '',
349
-	'' => '',
350
-	'' => '',
351
-	'' => '',
347
+    '' => '',
348
+    '' => '',
349
+    '' => '',
350
+    '' => '',
351
+    '' => '',
352 352
 );
Please login to merge, or discard this patch.
config/module.config.php 2 patches
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
             'playgroundcore_entity' => array(
12 12
                 'class' => 'Doctrine\ORM\Mapping\Driver\AnnotationDriver',
13 13
                 'cache' => 'array',
14
-                'paths' => __DIR__ . '/../src/PlaygroundCore/Entity'
14
+                'paths' => __DIR__.'/../src/PlaygroundCore/Entity'
15 15
             ),
16 16
 
17 17
             'orm_default' => array(
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
         'rule_providers' => array(
54 54
             'BjyAuthorize\Provider\Rule\Config' => array(
55 55
                 'allow' => array(
56
-                    array(array('admin'), 'core',           array('dashboard', 'edit')),
56
+                    array(array('admin'), 'core', array('dashboard', 'edit')),
57 57
                 ),
58 58
             ),
59 59
         ),
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
                 'collections' => array(    
83 83
                     'core_flags' => array(
84 84
                         'assets' => array(
85
-                            __DIR__ . '/../view/images/flag/*.png',
85
+                            __DIR__.'/../view/images/flag/*.png',
86 86
                         ),
87 87
                         'options' => array(
88 88
                             'move_raw' => true,
@@ -515,25 +515,25 @@  discard block
 block discarded – undo
515 515
         'translation_file_patterns' => array(
516 516
             array(
517 517
                 'type'         => 'phpArray',
518
-                'base_dir'     => __DIR__ . '/../../../../language',
518
+                'base_dir'     => __DIR__.'/../../../../language',
519 519
                 'pattern'      => 'routes_%s.php',
520 520
                 'text_domain'  => 'routes'
521 521
             ),
522 522
             array(
523 523
                 'type'         => 'phpArray',
524
-                'base_dir'     => __DIR__ . '/../language',
524
+                'base_dir'     => __DIR__.'/../language',
525 525
                 'pattern'      => 'routes_%s.php',
526 526
                 'text_domain'  => 'routes'
527 527
             ),
528 528
             array(
529 529
                 'type'         => 'phpArray',
530
-                'base_dir'     => __DIR__ . '/../../../../language',
530
+                'base_dir'     => __DIR__.'/../../../../language',
531 531
                 'pattern'      => '%s.php',
532 532
                 'text_domain'  => 'playgroundcore'
533 533
             ),
534 534
             array(
535 535
                 'type'         => 'phpArray',
536
-                'base_dir'     => __DIR__ . '/../language',
536
+                'base_dir'     => __DIR__.'/../language',
537 537
                 'pattern'      => '%s.php',
538 538
                 'text_domain'  => 'playgroundcore'
539 539
             ),
@@ -542,8 +542,8 @@  discard block
 block discarded – undo
542 542
 
543 543
     'view_manager' => array(
544 544
         'template_path_stack' => array(
545
-            __DIR__ . '/../view/admin',
546
-            __DIR__ . '/../view/frontend',
545
+            __DIR__.'/../view/admin',
546
+            __DIR__.'/../view/frontend',
547 547
         ),
548 548
     ),
549 549
 
Please login to merge, or discard this patch.
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -139,19 +139,19 @@  discard block
 block discarded – undo
139 139
                             ),
140 140
                         ),
141 141
                     ),
142
-		            // Give the possibility to call Cron from browser
143
-		            'cron' => array(
144
-		                'type' => 'Literal',
145
-		                'options' => array(
146
-		                    'route' => 'cron',
147
-		                    'defaults' => array(
148
-		                        'controller' => 'playgroundcore_console',
149
-		                        'action' => 'cron'
150
-		                    ),
151
-		                ),
152
-		            ),
153
-        		),
154
-        	),
142
+                    // Give the possibility to call Cron from browser
143
+                    'cron' => array(
144
+                        'type' => 'Literal',
145
+                        'options' => array(
146
+                            'route' => 'cron',
147
+                            'defaults' => array(
148
+                                'controller' => 'playgroundcore_console',
149
+                                'action' => 'cron'
150
+                            ),
151
+                        ),
152
+                    ),
153
+                ),
154
+            ),
155 155
             'admin' => array(
156 156
                 'type' => 'Literal',
157 157
                 'priority' => -1000,
@@ -448,7 +448,7 @@  discard block
 block discarded – undo
448 448
                             'list' => array(
449 449
                                 'type' => 'Segment',
450 450
                                 'options' => array(
451
-                                     'route' => '/list',
451
+                                        'route' => '/list',
452 452
                                     'defaults' => array(
453 453
                                         'controller' => 'playgroundcore_admin_website',
454 454
                                         'action'     => 'list',
@@ -459,7 +459,7 @@  discard block
 block discarded – undo
459 459
                             'edit-active' => array(
460 460
                                 'type' => 'Segment',
461 461
                                 'options' => array(
462
-                                     'route' => '/edit-active/[:websiteId]',
462
+                                        'route' => '/edit-active/[:websiteId]',
463 463
                                     'defaults' => array(
464 464
                                         'controller' => 'playgroundcore_admin_website',
465 465
                                         'action'     => 'editactive',
@@ -566,6 +566,6 @@  discard block
 block discarded – undo
566 566
         'invokables' => array(
567 567
             'NotInBlacklist' => 'PlaygroundCore\Validator\Blacklist',
568 568
             'InMailDomainList' => 'PlaygroundCore\Validator\MailDomain',
569
-         ),
569
+            ),
570 570
     ),
571 571
 );
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
     // Zend\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.
src/Controller/Plugin/Recaptcha.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
      * set service
37 37
      *
38 38
      * @param  $service
39
-     * @return String
39
+     * @return Recaptcha
40 40
      */
41 41
     public function setService($service)
42 42
     {
Please login to merge, or discard this patch.
src/Controller/Plugin/ShortenUrl.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@
 block discarded – undo
32 32
      * set service
33 33
      *
34 34
      * @param  $service
35
-     * @return String
35
+     * @return ShortenUrl
36 36
      */
37 37
     public function setService($service)
38 38
     {
Please login to merge, or discard this patch.
src/Entity/Locale.php 2 patches
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -130,7 +130,6 @@
 block discarded – undo
130 130
 
131 131
 
132 132
     /**
133
-     * @param int $id
134 133
      * @return Locale
135 134
      */
136 135
     public function setActiveFront($activeFront)
Please login to merge, or discard this patch.
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -37,15 +37,15 @@  discard block
 block discarded – undo
37 37
      */
38 38
     protected $locale;
39 39
 
40
-     /**
41
-     * active_back
42
-     * @ORM\Column(type="boolean", nullable=false)
43
-     */
40
+        /**
41
+         * active_back
42
+         * @ORM\Column(type="boolean", nullable=false)
43
+         */
44 44
     protected $active_back = 0;
45
-     /**
46
-     * active_front
47
-     * @ORM\Column(type="boolean", nullable=false)
48
-     */
45
+        /**
46
+         * active_front
47
+         * @ORM\Column(type="boolean", nullable=false)
48
+         */
49 49
     protected $active_front = 0;
50 50
 
51 51
     /**
@@ -232,19 +232,19 @@  discard block
 block discarded – undo
232 232
 
233 233
 
234 234
     /**
235
-    * setInputFilter
236
-    * @param InputFilterInterface $inputFilter
237
-    */
235
+     * setInputFilter
236
+     * @param InputFilterInterface $inputFilter
237
+     */
238 238
     public function setInputFilter(InputFilterInterface $inputFilter)
239 239
     {
240 240
         throw new \Exception("Not used");
241 241
     }
242 242
 
243 243
     /**
244
-    * getInputFilter
245
-    *
246
-    * @return  InputFilter $inputFilter
247
-    */
244
+     * getInputFilter
245
+     *
246
+     * @return  InputFilter $inputFilter
247
+     */
248 248
     public function getInputFilter()
249 249
     {
250 250
         if (!$this->inputFilter) {
Please login to merge, or discard this patch.