Completed
Push — 4.0 ( cafdfc...affd8b )
by Marco
02:49
created
src/Comodojo/Dispatcher/Request/Headers.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -41,13 +41,13 @@
 block discarded – undo
41 41
      */
42 42
     private static function getHeaders() {
43 43
 
44
-        if ( function_exists('getallheaders') ) return getallheaders();
44
+        if (function_exists('getallheaders')) return getallheaders();
45 45
 
46 46
         $headers = array();
47 47
 
48
-        foreach ( $_SERVER as $name => $value ) {
48
+        foreach ($_SERVER as $name => $value) {
49 49
 
50
-            if ( substr($name, 0, 5) == 'HTTP_' ) {
50
+            if (substr($name, 0, 5) == 'HTTP_') {
51 51
 
52 52
                 $headers[str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))))] = $value;
53 53
 
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,9 @@
 block discarded – undo
41 41
      */
42 42
     private static function getHeaders() {
43 43
 
44
-        if ( function_exists('getallheaders') ) return getallheaders();
44
+        if ( function_exists('getallheaders') ) {
45
+            return getallheaders();
46
+        }
45 47
 
46 48
         $headers = array();
47 49
 
Please login to merge, or discard this patch.
src/Comodojo/Dispatcher/Request/Post.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
 
47 47
     private static function getParameters() {
48 48
 
49
-        switch( $_SERVER['REQUEST_METHOD'] ) {
49
+        switch ($_SERVER['REQUEST_METHOD']) {
50 50
 
51 51
             case 'POST':
52 52
 
Please login to merge, or discard this patch.
src/Comodojo/Dispatcher/Components/DefaultConfiguration.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -48,11 +48,11 @@
 block discarded – undo
48 48
 
49 49
     private static function urlGetAbsolute() {
50 50
 
51
-        $http = 'http' . ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 's' : '') . '://';
51
+        $http = 'http'.((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 's' : '').'://';
52 52
 
53 53
         $uri = self::uriGetAbsolute();
54 54
 
55
-        return ( $http . (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : 'localhost') . $uri . "/" );
55
+        return ($http.(isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : 'localhost').$uri."/");
56 56
 
57 57
     }
58 58
 
Please login to merge, or discard this patch.
src/Comodojo/Dispatcher/Response/Status.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 
49 49
     public function set($code) {
50 50
 
51
-        if ( !$this->codes->exists($code) ) {
51
+        if (!$this->codes->exists($code)) {
52 52
 
53 53
             throw new Exception("Invalid HTTP Status Code $code");
54 54
 
@@ -60,9 +60,9 @@  discard block
 block discarded – undo
60 60
 
61 61
     }
62 62
 
63
-    public function description($code=null) {
63
+    public function description($code = null) {
64 64
 
65
-        if ( is_null($code) ) return $this->codes->getMessage($this->status_code);
65
+        if (is_null($code)) return $this->codes->getMessage($this->status_code);
66 66
         
67 67
         return $this->codes->getMessage($code);
68 68
 
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -62,7 +62,9 @@
 block discarded – undo
62 62
 
63 63
     public function description($code=null) {
64 64
 
65
-        if ( is_null($code) ) return $this->codes->getMessage($this->status_code);
65
+        if ( is_null($code) ) {
66
+            return $this->codes->getMessage($this->status_code);
67
+        }
66 68
         
67 69
         return $this->codes->getMessage($code);
68 70
 
Please login to merge, or discard this patch.
src/Comodojo/Dispatcher/Components/HttpStatusCodes.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@
 block discarded – undo
102 102
 
103 103
     public function getMessage($code) {
104 104
 
105
-        if ( $this->exists($code) ) return $this->codes[$code];
105
+        if ($this->exists($code)) return $this->codes[$code];
106 106
 
107 107
         throw new Exception("Invalid HTTP status code $code");
108 108
 
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -102,7 +102,9 @@
 block discarded – undo
102 102
 
103 103
     public function getMessage($code) {
104 104
 
105
-        if ( $this->exists($code) ) return $this->codes[$code];
105
+        if ( $this->exists($code) ) {
106
+            return $this->codes[$code];
107
+        }
106 108
 
107 109
         throw new Exception("Invalid HTTP status code $code");
108 110
 
Please login to merge, or discard this patch.
src/Comodojo/Dispatcher/Request/File.php 3 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -44,6 +44,9 @@
 block discarded – undo
44 44
 
45 45
     }
46 46
 
47
+    /**
48
+     * @return string
49
+     */
47 50
     public function getTemporaryName() {
48 51
 
49 52
         return $this->tname;
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -84,7 +84,9 @@
 block discarded – undo
84 84
 
85 85
         $file = $this->getTemporaryName();
86 86
 
87
-        if (file_exists($file)) return file_get_contents($file);
87
+        if (file_exists($file)) {
88
+            return file_get_contents($file);
89
+        }
88 90
 
89 91
         throw new Exception("File does not exists");
90 92
 
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -108,9 +108,9 @@  discard block
 block discarded – undo
108 108
 
109 109
         if (!empty($path) && file_exists($path)) {
110 110
 
111
-            $local_name = "$path/" . ($as_slug ? $this->getSlug() : $this->getFileName());
111
+            $local_name = "$path/".($as_slug ? $this->getSlug() : $this->getFileName());
112 112
 
113
-            if ( file_exists($local_name) ) {
113
+            if (file_exists($local_name)) {
114 114
 
115 115
                 $files = glob("$local_name*");
116 116
 
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 
121 121
             }
122 122
 
123
-            if ( move_uploaded_file($this->getTemporaryName(), $local_name) ) {
123
+            if (move_uploaded_file($this->getTemporaryName(), $local_name)) {
124 124
 
125 125
                 // return file_exists($local_name);
126 126
                 return true;
Please login to merge, or discard this patch.
src/Comodojo/Dispatcher/Events/DispatcherEvent.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
 
30 30
     protected $dispatcher;
31 31
 
32
-    public function __construct( Dispatcher $dispatcher ) {
32
+    public function __construct(Dispatcher $dispatcher) {
33 33
 
34 34
         parent::__construct('dispatcher');
35 35
 
Please login to merge, or discard this patch.
src/Comodojo/Dispatcher/Dispatcher.php 3 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -207,6 +207,9 @@
 block discarded – undo
207 207
 
208 208
     }
209 209
 
210
+    /**
211
+     * @param string $name
212
+     */
210 213
     private function createServiceSpecializedEvents($name) {
211 214
 
212 215
         $this->logger->debug("Emitting $name service-event");
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -202,7 +202,9 @@
 block discarded – undo
202 202
         $params = $route->getParameter('headers');
203 203
 
204 204
         if ( !empty($params) && is_array($params) ) {
205
-            foreach($params as $name => $value) $this->getResponse()->getHeaders()->set($name, $value);
205
+            foreach($params as $name => $value) {
206
+                $this->getResponse()->getHeaders()->set($name, $value);
207
+            }
206 208
         }
207 209
 
208 210
     }
Please login to merge, or discard this patch.
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 
79 79
         // init core components
80 80
         // create new configuration object and merge configuration
81
-        $configuration_object = new Configuration( DefaultConfiguration::get() );
81
+        $configuration_object = new Configuration(DefaultConfiguration::get());
82 82
         $configuration_object->merge($configuration);
83 83
 
84 84
         $logger = is_null($logger) ? LogManager::createFromConfiguration($configuration_object)->getLogger() : $logger;
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 
103 103
         } catch (Exception $e) {
104 104
 
105
-            $this->logger->critical($e->getMessage(),$e->getTrace());
105
+            $this->logger->critical($e->getMessage(), $e->getTrace());
106 106
 
107 107
             throw $e;
108 108
 
@@ -122,9 +122,9 @@  discard block
 block discarded – undo
122 122
         $logger->debug("Starting to dispatch.");
123 123
 
124 124
         $logger->debug("Emitting global dispatcher event.");
125
-        $events->emit( new DispatcherEvent($this) );
125
+        $events->emit(new DispatcherEvent($this));
126 126
 
127
-        if ( $configuration->get('enabled') === false ) {
127
+        if ($configuration->get('enabled') === false) {
128 128
 
129 129
             $logger->debug("Dispatcher disabled, shutting down gracefully.");
130 130
 
@@ -140,11 +140,11 @@  discard block
 block discarded – undo
140 140
 
141 141
         $cache = new ServerCache($this->getCache());
142 142
 
143
-        $events->emit( $this->createServiceSpecializedEvents('dispatcher.request') );
144
-        $events->emit( $this->createServiceSpecializedEvents('dispatcher.request.'.$this->request->getMethod()->get()) );
145
-        $events->emit( $this->createServiceSpecializedEvents('dispatcher.request.#') );
143
+        $events->emit($this->createServiceSpecializedEvents('dispatcher.request'));
144
+        $events->emit($this->createServiceSpecializedEvents('dispatcher.request.'.$this->request->getMethod()->get()));
145
+        $events->emit($this->createServiceSpecializedEvents('dispatcher.request.#'));
146 146
 
147
-        if ( $cache->read($this->request, $this->response) ) {
147
+        if ($cache->read($this->request, $this->response)) {
148 148
             // we have a cache!
149 149
             // shutdown immediately
150 150
             return $this->shutdown();
@@ -170,10 +170,10 @@  discard block
 block discarded – undo
170 170
 
171 171
         $logger->debug("Route acquired, type $route_type directed to $route_service");
172 172
 
173
-        $events->emit( $this->createServiceSpecializedEvents('dispatcher.route') );
174
-        $events->emit( $this->createServiceSpecializedEvents('dispatcher.route.'.$route_type) );
175
-        $events->emit( $this->createServiceSpecializedEvents('dispatcher.route.'.$route_service) );
176
-        $events->emit( $this->createServiceSpecializedEvents('dispatcher.route.#') );
173
+        $events->emit($this->createServiceSpecializedEvents('dispatcher.route'));
174
+        $events->emit($this->createServiceSpecializedEvents('dispatcher.route.'.$route_type));
175
+        $events->emit($this->createServiceSpecializedEvents('dispatcher.route.'.$route_service));
176
+        $events->emit($this->createServiceSpecializedEvents('dispatcher.route.#'));
177 177
 
178 178
         // translate route to service
179 179
         $logger->debug("Running $route_service service");
@@ -201,8 +201,8 @@  discard block
 block discarded – undo
201 201
 
202 202
         $params = $route->getParameter('headers');
203 203
 
204
-        if ( !empty($params) && is_array($params) ) {
205
-            foreach($params as $name => $value) $this->getResponse()->getHeaders()->set($name, $value);
204
+        if (!empty($params) && is_array($params)) {
205
+            foreach ($params as $name => $value) $this->getResponse()->getHeaders()->set($name, $value);
206 206
         }
207 207
 
208 208
     }
@@ -247,9 +247,9 @@  discard block
 block discarded – undo
247 247
 
248 248
         $response->consolidate($request, $this->route);
249 249
 
250
-        $events->emit( $this->createServiceSpecializedEvents('dispatcher.response') );
251
-        $events->emit( $this->createServiceSpecializedEvents('dispatcher.response.' . $response->getStatus()->get()) );
252
-        $events->emit( $this->createServiceSpecializedEvents('dispatcher.response.#') );
250
+        $events->emit($this->createServiceSpecializedEvents('dispatcher.response'));
251
+        $events->emit($this->createServiceSpecializedEvents('dispatcher.response.'.$response->getStatus()->get()));
252
+        $events->emit($this->createServiceSpecializedEvents('dispatcher.response.#'));
253 253
 
254 254
         $this->logger->debug("Composing return value");
255 255
 
Please login to merge, or discard this patch.
src/Comodojo/Dispatcher/Traits/HeadersTrait.php 2 patches
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -28,9 +28,9 @@  discard block
 block discarded – undo
28 28
 
29 29
     public function get($header = null) {
30 30
 
31
-        if ( is_null($header) ) return $this->headers;
31
+        if (is_null($header)) return $this->headers;
32 32
 
33
-        else if ( array_key_exists($header, $this->headers) ) return $this->headers[$header];
33
+        else if (array_key_exists($header, $this->headers)) return $this->headers[$header];
34 34
 
35 35
         else return null;
36 36
 
@@ -38,14 +38,14 @@  discard block
 block discarded – undo
38 38
 
39 39
     public function getAsString($header = null) {
40 40
 
41
-        if ( is_null($header) ) {
41
+        if (is_null($header)) {
42 42
 
43
-            return array_map( [$this, 'headerToString'],
43
+            return array_map([$this, 'headerToString'],
44 44
                 array_keys($this->headers),
45 45
                 array_values($this->headers)
46 46
             );
47 47
 
48
-        } else if ( array_key_exists($header, $this->headers) ) {
48
+        } else if (array_key_exists($header, $this->headers)) {
49 49
 
50 50
             return self::headerToString($header, $this->headers[$header]);
51 51
 
@@ -53,9 +53,9 @@  discard block
 block discarded – undo
53 53
 
54 54
     }
55 55
 
56
-    public function set($header, $value=null) {
56
+    public function set($header, $value = null) {
57 57
 
58
-        if ( is_null($value) ) {
58
+        if (is_null($value)) {
59 59
 
60 60
             $header = explode(":", $header, 2);
61 61
 
@@ -73,13 +73,13 @@  discard block
 block discarded – undo
73 73
 
74 74
     public function delete($header = null) {
75 75
 
76
-        if ( is_null($header) ) {
76
+        if (is_null($header)) {
77 77
 
78 78
             $this->headers = array();
79 79
 
80 80
             return true;
81 81
 
82
-        } else if ( array_key_exists($header, $this->headers) ) {
82
+        } else if (array_key_exists($header, $this->headers)) {
83 83
 
84 84
             unset($this->headers[$header]);
85 85
 
Please login to merge, or discard this patch.
Braces   +10 added lines, -6 removed lines patch added patch discarded remove patch
@@ -28,11 +28,13 @@  discard block
 block discarded – undo
28 28
 
29 29
     public function get($header = null) {
30 30
 
31
-        if ( is_null($header) ) return $this->headers;
32
-
33
-        else if ( array_key_exists($header, $this->headers) ) return $this->headers[$header];
34
-
35
-        else return null;
31
+        if ( is_null($header) ) {
32
+            return $this->headers;
33
+        } else if ( array_key_exists($header, $this->headers) ) {
34
+            return $this->headers[$header];
35
+        } else {
36
+            return null;
37
+        }
36 38
 
37 39
     }
38 40
 
@@ -49,7 +51,9 @@  discard block
 block discarded – undo
49 51
 
50 52
             return self::headerToString($header, $this->headers[$header]);
51 53
 
52
-        } else return null;
54
+        } else {
55
+            return null;
56
+        }
53 57
 
54 58
     }
55 59
 
Please login to merge, or discard this patch.