Completed
Pull Request — develop (#229)
by ANTHONIUS
08:26
created
module/Auth/Module.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
      */
38 38
     public function getConfig()
39 39
     {
40
-        return ModuleConfigLoader::load(__DIR__ . '/config');
40
+        return ModuleConfigLoader::load(__DIR__.'/config');
41 41
     }
42 42
 
43 43
     /**
@@ -53,19 +53,19 @@  discard block
 block discarded – undo
53 53
                 // This ensures the class from "addtional-providers" is loaded.
54 54
                 array(
55 55
                     'Hybrid_Providers_XING'
56
-                    => __DIR__ . '/../../vendor/hybridauth/hybridauth/additional-providers/hybridauth-xing/Providers/XING.php',
56
+                    => __DIR__.'/../../vendor/hybridauth/hybridauth/additional-providers/hybridauth-xing/Providers/XING.php',
57 57
                 ),
58 58
                 array(
59 59
                     'Hybrid_Providers_Github'
60
-                    => __DIR__ . '/../../vendor/hybridauth/hybridauth/additional-providers/hybridauth-github/Providers/GitHub.php',
60
+                    => __DIR__.'/../../vendor/hybridauth/hybridauth/additional-providers/hybridauth-github/Providers/GitHub.php',
61 61
                 ),
62 62
             ),
63 63
             'Zend\Loader\StandardAutoloader' => array(
64 64
                 'namespaces' => array(
65
-                    __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
66
-                    'AuthTest' => __DIR__ . '/test/AuthTest',
67
-                    'Acl' => __DIR__ . '/src/Acl',
68
-                    'AclTest' => __DIR__ . '/test/AclTest',
65
+                    __NAMESPACE__ => __DIR__.'/src/'.__NAMESPACE__,
66
+                    'AuthTest' => __DIR__.'/test/AuthTest',
67
+                    'Acl' => __DIR__.'/src/Acl',
68
+                    'AclTest' => __DIR__.'/test/AclTest',
69 69
                 ),
70 70
             ),
71 71
         );
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 
82 82
         $eventManager->attach(
83 83
             MvcEvent::EVENT_ROUTE,
84
-            function (MvcEvent $e) use ($services) {
84
+            function(MvcEvent $e) use ($services) {
85 85
             /** @var CheckPermissionsListener $checkPermissionsListener */
86 86
                 $checkPermissionsListener = $services->get('Auth/CheckPermissionsListener');
87 87
                 $checkPermissionsListener->onRoute($e);
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 
92 92
         $eventManager->attach(
93 93
             MvcEvent::EVENT_DISPATCH,
94
-            function (MvcEvent $e) use ($services) {
94
+            function(MvcEvent $e) use ($services) {
95 95
             /** @var CheckPermissionsListener $checkPermissionsListener */
96 96
                 $checkPermissionsListener = $services->get('Auth/CheckPermissionsListener');
97 97
                 $checkPermissionsListener->onDispatch($e);
Please login to merge, or discard this patch.
module/Install/config/module.config.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -78,12 +78,12 @@  discard block
 block discarded – undo
78 78
         'exception_template' => 'error/index',
79 79
         // Map template to files. Speeds up the lookup through the template stack.
80 80
         'template_map' => array(
81
-            'layout/layout' => __DIR__ . '/../view/layout/layout.phtml',
82
-            'error/index' => __DIR__ . '/../view/error/index.phtml',
81
+            'layout/layout' => __DIR__.'/../view/layout/layout.phtml',
82
+            'error/index' => __DIR__.'/../view/error/index.phtml',
83 83
         ),
84 84
         // Where to look for view templates not mapped above
85 85
         'template_path_stack' => array(
86
-            __DIR__ . '/../view',
86
+            __DIR__.'/../view',
87 87
         ),
88 88
     ),
89 89
 
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
         'translation_file_patterns' => array(
92 92
             array(
93 93
                 'type' => 'gettext',
94
-                'base_dir' => __DIR__ . '/../language',
94
+                'base_dir' => __DIR__.'/../language',
95 95
                 'pattern' => '%s.mo',
96 96
                 'text_domain' => 'Install',
97 97
             ),
Please login to merge, or discard this patch.
module/Install/src/Listener/LanguageSetter.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -79,13 +79,13 @@
 block discarded – undo
79 79
 
80 80
         /* Set locale */
81 81
         $translator = $e->getApplication()->getServiceManager()->get('mvctranslator');
82
-        $locale     = $lang . '_' . strtoupper($lang);
82
+        $locale     = $lang.'_'.strtoupper($lang);
83 83
 
84 84
         setlocale(
85 85
             LC_ALL,
86 86
             array(
87
-                            $locale . ".utf8",
88
-                            $locale . ".iso88591",
87
+                            $locale.".utf8",
88
+                            $locale.".iso88591",
89 89
                             $locale,
90 90
                             substr($locale, 0, 2),
91 91
                             'de_DE.utf8',
Please login to merge, or discard this patch.
module/Install/src/Controller/Plugin/YawikConfigCreator.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -92,9 +92,9 @@  discard block
 block discarded – undo
92 92
 
93 93
         // Create a file with the class/file map.
94 94
         // Stupid syntax highlighters make separating < from PHP declaration necessary
95
-        $content = '<' . "?php\n"
95
+        $content = '<'."?php\n"
96 96
                    . "\n"
97
-                   . 'return ' . var_export($config, true) . ';';
97
+                   . 'return '.var_export($config, true).';';
98 98
 
99 99
         // Fix \' strings from injected DIRECTORY_SEPARATOR usage in iterator_apply op
100 100
         $content = str_replace("\\'", "'", $content);
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
         $content = str_replace('array (', 'array(', $content);
108 108
 
109 109
         // Make the file end by EOL
110
-        $content = rtrim($content, "\n") . "\n";
110
+        $content = rtrim($content, "\n")."\n";
111 111
 
112 112
         return $content;
113 113
 
Please login to merge, or discard this patch.
module/Install/src/autoload_classmap.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -1,15 +1,15 @@
 block discarded – undo
1 1
 <?php
2 2
 // Generated by ZF2's ./bin/classmap_generator.php
3 3
 return array(
4
-  'Install\Filter\DbNameExtractor'                              => __DIR__ . '/Filter/DbNameExtractor.php',
5
-  'Install\Form\Installation'                                   => __DIR__ . '/Form/Installation.php',
6
-  'Install\Controller\Index'                                    => __DIR__ . '/Controller/Index.php',
7
-  'Install\Controller\Plugin\Prerequisites'                     => __DIR__ . '/Controller/Plugin/Prerequisites.php',
8
-  'Install\Controller\Plugin\YawikConfigCreator'                => __DIR__ . '/Controller/Plugin/YawikConfigCreator.php',
9
-  'Install\Controller\Plugin\UserCreator'                       => __DIR__ . '/Controller/Plugin/UserCreator.php',
10
-  'Install\Listener\LanguageSetter'                             => __DIR__ . '/Listener/LanguageSetter.php',
11
-  'Install\Validator\MongoDbConnection'                         => __DIR__ . '/Validator/MongoDbConnection.php',
12
-  'Install\Validator\MongoDbConnectionString'                   => __DIR__ . '/Validator/MongoDbConnectionString.php',
13
-  'Install\Factory\Controller\Plugin\UserCreatorFactory'        => __DIR__ . '/Factory/Controller/Plugin/UserCreatorFactory.php',
14
-  'Install\Factory\Controller\Plugin\YawikConfigCreatorFactory' => __DIR__ . '/Factory/Controller/Plugin/YawikConfigCreatorFactory.php',
4
+  'Install\Filter\DbNameExtractor'                              => __DIR__.'/Filter/DbNameExtractor.php',
5
+  'Install\Form\Installation'                                   => __DIR__.'/Form/Installation.php',
6
+  'Install\Controller\Index'                                    => __DIR__.'/Controller/Index.php',
7
+  'Install\Controller\Plugin\Prerequisites'                     => __DIR__.'/Controller/Plugin/Prerequisites.php',
8
+  'Install\Controller\Plugin\YawikConfigCreator'                => __DIR__.'/Controller/Plugin/YawikConfigCreator.php',
9
+  'Install\Controller\Plugin\UserCreator'                       => __DIR__.'/Controller/Plugin/UserCreator.php',
10
+  'Install\Listener\LanguageSetter'                             => __DIR__.'/Listener/LanguageSetter.php',
11
+  'Install\Validator\MongoDbConnection'                         => __DIR__.'/Validator/MongoDbConnection.php',
12
+  'Install\Validator\MongoDbConnectionString'                   => __DIR__.'/Validator/MongoDbConnectionString.php',
13
+  'Install\Factory\Controller\Plugin\UserCreatorFactory'        => __DIR__.'/Factory/Controller/Plugin/UserCreatorFactory.php',
14
+  'Install\Factory\Controller\Plugin\YawikConfigCreatorFactory' => __DIR__.'/Factory/Controller/Plugin/YawikConfigCreatorFactory.php',
15 15
 );
Please login to merge, or discard this patch.
module/Install/Module.php 1 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/Install/autoload_classmap.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,5 +8,5 @@
 block discarded – undo
8 8
 $env = getenv('APPLICATION_ENV') ?: 'production';
9 9
 
10 10
 return 'production' == $env
11
-       ? include __DIR__ . '/src/autoload_classmap.php'
11
+       ? include __DIR__.'/src/autoload_classmap.php'
12 12
        : array(); /* no class map in test and development. */
Please login to merge, or discard this patch.
module/Applications/src/Applications/Entity/Attachment.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,6 +33,6 @@
 block discarded – undo
33 33
      */
34 34
     public function getUri()
35 35
     {
36
-        return "/file/Applications.Attachment/" . $this->id . "/" .urlencode($this->name);
36
+        return "/file/Applications.Attachment/".$this->id."/".urlencode($this->name);
37 37
     }
38 38
 }
Please login to merge, or discard this patch.
module/Applications/src/Applications/Entity/Status.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -50,12 +50,12 @@
 block discarded – undo
50 50
 
51 51
     public function __construct($status = self::INCOMING)
52 52
     {
53
-        $constant = 'self::' . strtoupper($status);
53
+        $constant = 'self::'.strtoupper($status);
54 54
         if (!defined($constant)) {
55
-            throw new \DomainException('Unknown status: ' . $status);
55
+            throw new \DomainException('Unknown status: '.$status);
56 56
         }
57
-        $this->name=constant($constant);
58
-        $this->order=$this->getOrder();
57
+        $this->name = constant($constant);
58
+        $this->order = $this->getOrder();
59 59
     }
60 60
 
61 61
     /**
Please login to merge, or discard this patch.