Completed
Push — develop ( 10d90b...60de6f )
by greg
10:54
created
config/module.config.php 1 patch
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.
language/fr.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Zend Framework (http://framework.zend.com/)
4
- *
5
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
6
- * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
7
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
8
- */
3
+     * Zend Framework (http://framework.zend.com/)
4
+     *
5
+     * @link      http://github.com/zendframework/zf2 for the canonical source repository
6
+     * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
7
+     * @license    http://framework.zend.com/license/new-bsd     New BSD License
8
+     */
9 9
 
10 10
 
11 11
 /**
Please login to merge, or discard this patch.