Completed
Push — master ( ba4a87...be3f36 )
by Sinnarasa
02:49
created
src/Routing/Middleware.php 1 patch
Braces   +24 added lines, -13 removed lines patch added patch discarded remove patch
@@ -28,11 +28,14 @@  discard block
 block discarded – undo
28 28
      */
29 29
     public function globalMiddleware()
30 30
     {
31
-        if (isset($this->router->collection->middleware['global_middleware']))
32
-            foreach ($this->router->collection->middleware['global_middleware'] as $mid) {
31
+        if (isset($this->router->collection->middleware['global_middleware'])) {
32
+                    foreach ($this->router->collection->middleware['global_middleware'] as $mid) {
33 33
                 if (class_exists($mid)) {
34
-                    $mid_global = new $mid;
35
-                    if (method_exists($mid_global, 'handle')) $mid_global->handle($this->router->route);
34
+                    $mid_global = new $mid;
35
+        }
36
+                    if (method_exists($mid_global, 'handle')) {
37
+                        $mid_global->handle($this->router->route);
38
+                    }
36 39
                 }
37 40
             }
38 41
     }
@@ -42,11 +45,14 @@  discard block
 block discarded – undo
42 45
      */
43 46
     public function blockMiddleware()
44 47
     {
45
-        if (isset($this->router->collection->middleware['block_middleware']))
46
-            if (isset($this->router->collection->middleware['block_middleware'][$this->router->route->getBlock()]) && class_exists($this->router->collection->middleware['block_middleware'][$this->router->route->getBlock()])) {
47
-                $class = $this->router->collection->middleware['block_middleware'][$this->router->route->getBlock()];
48
+        if (isset($this->router->collection->middleware['block_middleware'])) {
49
+                    if (isset($this->router->collection->middleware['block_middleware'][$this->router->route->getBlock()]) && class_exists($this->router->collection->middleware['block_middleware'][$this->router->route->getBlock()])) {
50
+                $class = $this->router->collection->middleware['block_middleware'][$this->router->route->getBlock()];
51
+        }
48 52
                 $mid_block = new $class;
49
-                if (method_exists($mid_block, 'handle')) $mid_block->handle($this->router->route);
53
+                if (method_exists($mid_block, 'handle')) {
54
+                    $mid_block->handle($this->router->route);
55
+                }
50 56
             }
51 57
     }
52 58
 
@@ -60,7 +66,9 @@  discard block
 block discarded – undo
60 66
             if (isset($this->router->collection->middleware['class_middleware'][$ctrl]) && class_exists($this->router->route->getTarget('controller'))) {
61 67
                 $class = $this->router->collection->middleware['class_middleware'][$ctrl];
62 68
                 $mid_class = new $class;
63
-                if (method_exists($mid_class, 'handle')) $mid_class->handle($this->router->route);
69
+                if (method_exists($mid_class, 'handle')) {
70
+                    $mid_class->handle($this->router->route);
71
+                }
64 72
             }
65 73
         }
66 74
     }
@@ -70,11 +78,14 @@  discard block
 block discarded – undo
70 78
      */
71 79
     public function routeMiddleware()
72 80
     {
73
-        if (isset($this->router->collection->middleware['route_middleware']))
74
-            if (isset($this->router->route->getPath()['middleware']) && class_exists($this->router->collection->middleware['route_middleware'][$this->router->route->getPath()['middleware']])) {
75
-                $class = $this->router->collection->middleware['route_middleware'][$this->router->route->getPath()['middleware']];
81
+        if (isset($this->router->collection->middleware['route_middleware'])) {
82
+                    if (isset($this->router->route->getPath()['middleware']) && class_exists($this->router->collection->middleware['route_middleware'][$this->router->route->getPath()['middleware']])) {
83
+                $class = $this->router->collection->middleware['route_middleware'][$this->router->route->getPath()['middleware']];
84
+        }
76 85
                 $mid_route = new $class;
77
-                if (method_exists($mid_route, 'handle')) $mid_route->handle($this->router->route);
86
+                if (method_exists($mid_route, 'handle')) {
87
+                    $mid_route->handle($this->router->route);
88
+                }
78 89
             }
79 90
     }
80 91
 
Please login to merge, or discard this patch.
src/Routing/RouteCollection.php 1 patch
Braces   +58 added lines, -29 removed lines patch added patch discarded remove patch
@@ -33,7 +33,9 @@  discard block
 block discarded – undo
33 33
      */
34 34
     public function __construct($routes = null, $options = [])
35 35
     {
36
-        if (!is_null($routes) || !empty($options)) $this->addRoutes($routes, $options);
36
+        if (!is_null($routes) || !empty($options)) {
37
+            $this->addRoutes($routes, $options);
38
+        }
37 39
     }
38 40
 
39 41
     /**
@@ -43,10 +45,16 @@  discard block
 block discarded – undo
43 45
     public function addRoutes($routes = null, $options = [])
44 46
     {
45 47
         if(!is_null($routes) && !is_array($routes)) {
46
-            if (strpos($routes, '.php') === false) $routes = trim($routes, '/') . '/';
47
-            if (is_file($routes . '/routes.php') && is_array($routesFile = include $routes . '/routes.php')) $routes = $routesFile;
48
-            elseif (is_file($routes) && is_array($routesFile = include $routes)) $routes = $routesFile;
49
-            else throw new \InvalidArgumentException('Argument for "' . get_called_class() . '" constructor is not recognized. Expected argument array or file containing array but "'.$routes.'" given');
48
+            if (strpos($routes, '.php') === false) {
49
+                $routes = trim($routes, '/') . '/';
50
+            }
51
+            if (is_file($routes . '/routes.php') && is_array($routesFile = include $routes . '/routes.php')) {
52
+                $routes = $routesFile;
53
+            } elseif (is_file($routes) && is_array($routesFile = include $routes)) {
54
+                $routes = $routesFile;
55
+            } else {
56
+                throw new \InvalidArgumentException('Argument for "' . get_called_class() . '" constructor is not recognized. Expected argument array or file containing array but "'.$routes.'" given');
57
+            }
50 58
         }
51 59
         $this->routes['routes_' . $this->countRoutes] = is_array($routes) ? $routes : [];
52 60
         $this->routes['path_' . $this->countRoutes] = (isset($options['path']) && !empty($options['path'])) ? rtrim($options['path'], '/') . '/' : '';
@@ -61,8 +69,9 @@  discard block
 block discarded – undo
61 69
      */
62 70
     public function getRoutes($key = null)
63 71
     {
64
-        if(!is_null($key))
65
-            return isset($this->routes[$key])?$this->routes[$key]:'';
72
+        if(!is_null($key)) {
73
+                    return isset($this->routes[$key])?$this->routes[$key]:'';
74
+        }
66 75
         return $this->routes;
67 76
     }
68 77
 
@@ -73,12 +82,18 @@  discard block
 block discarded – undo
73 82
     {
74 83
         if (is_array($args)) {
75 84
             $nbrArgs = count($args);
76
-            for ($i = 0; $i < $nbrArgs; ++$i)
77
-                $this->routes['prefix_' . $i] = '/' . trim($args[$i], '/');
78
-        } elseif (is_string($args))
79
-            for ($i = 0; $i < $this->countRoutes; ++$i)
80
-                $this->routes['prefix_' . $i] = '/' . trim($args, '/');
81
-        if($this->countRoutes == 0)$this->countRoutes++;
85
+            for ($i = 0; $i < $nbrArgs; ++$i) {
86
+                            $this->routes['prefix_' . $i] = '/' . trim($args[$i], '/');
87
+            }
88
+        } elseif (is_string($args)) {
89
+                    for ($i = 0;
90
+        }
91
+        $i < $this->countRoutes; ++$i) {
92
+                            $this->routes['prefix_' . $i] = '/' . trim($args, '/');
93
+            }
94
+        if($this->countRoutes == 0) {
95
+            $this->countRoutes++;
96
+        }
82 97
     }
83 98
 
84 99
     /**
@@ -92,10 +107,14 @@  discard block
 block discarded – undo
92 107
                 $this->routes['path_' . $i] = (isset($args[$i]['path']) && !empty($args[$i]['path'])) ? rtrim($args[$i]['path'], '/') . '/' : '';
93 108
                 $this->routes['namespace_' . $i] = (isset($args[$i]['namespace']) && !empty($args[$i]['namespace'])) ? trim($args[$i]['namespace'], '\\') . '\\' : '';
94 109
                 $this->routes['prefix_' . $i] = (isset($args[$i]['prefix']) && !empty($args[$i]['prefix'])) ? '/'.trim($args[$i]['prefix'], '/') : '';
95
-                if(!isset($this->routes['routes_' . $i]))$this->routes['routes_' . $i] = [];
110
+                if(!isset($this->routes['routes_' . $i])) {
111
+                    $this->routes['routes_' . $i] = [];
112
+                }
96 113
             }
97 114
         }
98
-        if($this->countRoutes == 0)$this->countRoutes++;
115
+        if($this->countRoutes == 0) {
116
+            $this->countRoutes++;
117
+        }
99 118
     }
100 119
 
101 120
     /**
@@ -104,12 +123,16 @@  discard block
 block discarded – undo
104 123
      */
105 124
     public function setMiddleware($middleware)
106 125
     {
107
-        if (is_string($middleware)) $middleware = rtrim($middleware, '/');
108
-        if (is_file($middleware) && is_array($mid = include $middleware))
109
-            $this->middleware = $mid;
110
-        elseif (is_array($middleware))
111
-            $this->middleware = $middleware;
112
-        else throw new \InvalidArgumentException('Accepted argument for setMiddleware are array and array file');
126
+        if (is_string($middleware)) {
127
+            $middleware = rtrim($middleware, '/');
128
+        }
129
+        if (is_file($middleware) && is_array($mid = include $middleware)) {
130
+                    $this->middleware = $mid;
131
+        } elseif (is_array($middleware)) {
132
+                    $this->middleware = $middleware;
133
+        } else {
134
+            throw new \InvalidArgumentException('Accepted argument for setMiddleware are array and array file');
135
+        }
113 136
     }
114 137
 
115 138
     /**
@@ -121,12 +144,13 @@  discard block
 block discarded – undo
121 144
         $count = 0;
122 145
         for ($i = 0; $i < $this->countRoutes; ++$i) {
123 146
             $prefix = (isset($this->routes['prefix_' . $i])) ? $this->routes['prefix_' . $i] : '';
124
-            if (isset($this->routes['routes_' . $i]))
125
-                foreach ($this->routes['routes_' . $i] as $route => $dependencies) {
147
+            if (isset($this->routes['routes_' . $i])) {
148
+                            foreach ($this->routes['routes_' . $i] as $route => $dependencies) {
126 149
                     if (is_array($dependencies) && isset($dependencies['use']))
127
-                        $use = (is_object($dependencies['use'])) ? 'closure-' . $count : trim($dependencies['use'], '/');
128
-                    else
129
-                        $use = (is_object($dependencies)) ? 'closure-' . $count : trim($dependencies, '/');
150
+                        $use = (is_object($dependencies['use'])) ? 'closure-' . $count : trim($dependencies['use'], '/');
151
+            } else {
152
+                                            $use = (is_object($dependencies)) ? 'closure-' . $count : trim($dependencies, '/');
153
+                    }
130 154
                     (!is_object($dependencies) && isset($dependencies['name'])) ? $this->routesByName[$use . '#' . $dependencies['name']] = $root . $prefix . $route : $this->routesByName[$use] = $root . $prefix . $route;
131 155
                     $count++;
132 156
                 }
@@ -143,9 +167,14 @@  discard block
 block discarded – undo
143 167
     {
144 168
         foreach ($this->routesByName as $key => $route) {
145 169
             $param = explode('#', $key);
146
-            foreach ($params as $key2 => $value) $route = str_replace(':' . $key2, $value, $route);
147
-            if ($param[0] == trim($name, '/')) return $route;
148
-            else if (isset($param[1]) && $param[1] == $name) return $route;
170
+            foreach ($params as $key2 => $value) {
171
+                $route = str_replace(':' . $key2, $value, $route);
172
+            }
173
+            if ($param[0] == trim($name, '/')) {
174
+                return $route;
175
+            } else if (isset($param[1]) && $param[1] == $name) {
176
+                return $route;
177
+            }
149 178
         }
150 179
         return null;
151 180
     }
Please login to merge, or discard this patch.
src/Routing/Router.php 1 patch
Braces   +13 added lines, -7 removed lines patch added patch discarded remove patch
@@ -71,7 +71,9 @@  discard block
 block discarded – undo
71 71
     public function run()
72 72
     {
73 73
         $this->setUrl();
74
-        if ($this->config['generateRoutesPath']) $this->collection->generateRoutesPath();
74
+        if ($this->config['generateRoutesPath']) {
75
+            $this->collection->generateRoutesPath();
76
+        }
75 77
         if ($this->match()) {
76 78
             $this->handle();
77 79
             $this->callTarget();
@@ -84,8 +86,9 @@  discard block
 block discarded – undo
84 86
      */
85 87
     public function setUrl($url = null)
86 88
     {
87
-        if (is_null($url))
88
-            $url = (isset($_GET['url'])) ? $_GET['url'] : substr(str_replace(str_replace('/index.php', '', $_SERVER['SCRIPT_NAME']), '', $_SERVER['REQUEST_URI']), 1);
89
+        if (is_null($url)) {
90
+                    $url = (isset($_GET['url'])) ? $_GET['url'] : substr(str_replace(str_replace('/index.php', '', $_SERVER['SCRIPT_NAME']), '', $_SERVER['REQUEST_URI']), 1);
91
+        }
89 92
         $this->route->setUrl('/' . trim(explode('?', $url)[0], '/'));
90 93
     }
91 94
 
@@ -96,8 +99,9 @@  discard block
 block discarded – undo
96 99
     {
97 100
         foreach ($this->config['matcher'] as $matcher) {
98 101
             $this->config['matcherInstance'][$matcher] = new $matcher($this);
99
-            if (call_user_func([$this->config['matcherInstance'][$matcher], 'match']))
100
-                return true;
102
+            if (call_user_func([$this->config['matcherInstance'][$matcher], 'match'])) {
103
+                            return true;
104
+            }
101 105
         }
102 106
         return false;
103 107
     }
@@ -140,8 +144,10 @@  discard block
 block discarded – undo
140 144
         if (isset($this->route->getResponse()['templates']) && isset($this->route->getResponse()['templates'][$this->route->getResponse('code')])) {
141 145
             $this->route->setCallback($this->route->getResponse()['templates'][$this->route->getResponse('code')]);
142 146
             foreach($this->config['matcherInstance'] as $matcher) {
143
-                foreach (call_user_func([$matcher, 'getMatcher']) as $match)
144
-                    if (call_user_func([$matcher, $match])){ $this->callTarget(); break; }
147
+                foreach (call_user_func([$matcher, 'getMatcher']) as $match) {
148
+                                    if (call_user_func([$matcher, $match])){ $this->callTarget();
149
+                }
150
+                break; }
145 151
             }
146 152
         }
147 153
         http_response_code($this->route->getResponse('code'));
Please login to merge, or discard this patch.
src/Routing/Response.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -166,8 +166,9 @@
 block discarded – undo
166 166
      */
167 167
     public function sendHeaders()
168 168
     {
169
-        foreach($this->headers as $key => $content)
170
-            header($key.' : '.$content);
169
+        foreach($this->headers as $key => $content) {
170
+                    header($key.' : '.$content);
171
+        }
171 172
         http_response_code($this->getStatusCode());
172 173
         return $this;
173 174
     }
Please login to merge, or discard this patch.
src/Routing/Match/RoutesMatch.php 1 patch
Braces   +31 added lines, -18 removed lines patch added patch discarded remove patch
@@ -78,8 +78,9 @@  discard block
 block discarded – undo
78 78
                 $this->request['path'] = $dependencies;
79 79
                 $this->request['index'] = $i;
80 80
                 $this->request['route'] = preg_replace_callback('#:([\w]+)#', [$this, 'paramMatch'], '/' . trim(trim($this->request['prefix'], '/') . '/' . trim($route, '/'), '/'));
81
-                if ($this->routeMatch('#^' . $this->request['route'] . '$#'))
82
-                    return $this->generateTarget();
81
+                if ($this->routeMatch('#^' . $this->request['route'] . '$#')) {
82
+                                    return $this->generateTarget();
83
+                }
83 84
             }
84 85
         }
85 86
         unset($this->request);
@@ -107,8 +108,9 @@  discard block
 block discarded – undo
107 108
     {
108 109
         if (substr($this->request['route'], -1) == '*') {
109 110
             $pos = strpos($this->request['route'], '*');
110
-            if (substr($this->router->route->getUrl(), 0, $pos) == substr($this->request['route'], 0, $pos))
111
-                if (isset($this->request)) return true;
111
+            if (substr($this->router->route->getUrl(), 0, $pos) == substr($this->request['route'], 0, $pos)) {
112
+                            if (isset($this->request)) return true;
113
+            }
112 114
         }
113 115
         if (preg_match($regex, $this->router->route->getUrl(), $this->request['parameters'])) {
114 116
             array_shift($this->request['parameters']);
@@ -128,19 +130,26 @@  discard block
 block discarded – undo
128 130
             $this->matchClosure();
129 131
             $this->router->response->setStatusCode(202);
130 132
         } else {
131
-            if (isset($this->request['path']['name'])) $this->router->route->setName($this->request['path']['name']);
132
-            if (isset($this->request['path']['method'])) $this->request['path']['method'] = is_array($this->request['path']['method']) ? $this->request['path']['method'] : [$this->request['path']['method']];
133
-            if (isset($this->request['path']))
134
-                (is_array($this->request['path']) && isset($this->request['path']['use']))
133
+            if (isset($this->request['path']['name'])) {
134
+                $this->router->route->setName($this->request['path']['name']);
135
+            }
136
+            if (isset($this->request['path']['method'])) {
137
+                $this->request['path']['method'] = is_array($this->request['path']['method']) ? $this->request['path']['method'] : [$this->request['path']['method']];
138
+            }
139
+            if (isset($this->request['path'])) {
140
+                            (is_array($this->request['path']) && isset($this->request['path']['use']))
135 141
                     ? $this->router->route->setCallback($this->request['path']['use'])
136
-                    : $this->router->route->setCallback($this->request['path']);
142
+                    : $this->router->route->setCallback($this->request['path']);
143
+            }
137 144
             $this->router->route->setDetail($this->request);
138 145
             if($this->validMethod()) {
139
-                foreach($this->matcher as $matcher)
140
-                    call_user_func([$this,$matcher]);
146
+                foreach($this->matcher as $matcher) {
147
+                                    call_user_func([$this,$matcher]);
148
+                }
141 149
                 $this->router->response->setStatusCode(202);
142
-            }else
143
-                $this->router->response->setStatusCode(405);
150
+            } else {
151
+                            $this->router->response->setStatusCode(405);
152
+            }
144 153
         }
145 154
         return $this->router->route->hasTarget();
146 155
     }
@@ -150,8 +159,9 @@  discard block
 block discarded – undo
150 159
      */
151 160
     public function validMethod()
152 161
     {
153
-        if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest')
154
-            return (isset($this->request['path']['ajax']) && $this->request['path']['ajax'] === true) ? true : false;
162
+        if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') {
163
+                    return (isset($this->request['path']['ajax']) && $this->request['path']['ajax'] === true) ? true : false;
164
+        }
155 165
         $method = (isset($this->router->route->getDetail()['path']['method'])) ? $this->router->route->getDetail()['path']['method'] : ['GET'];
156 166
         return (in_array($this->router->route->getMethod(), $method)) ? true : false;
157 167
     }
@@ -177,13 +187,16 @@  discard block
 block discarded – undo
177 187
     {
178 188
         if (!$this->router->route->hasTarget() && strpos($this->router->route->getCallback(), '@') !== false) {
179 189
             $routes = explode('@', $this->router->route->getCallback());
180
-            if (!isset($routes[1])) $routes[1] = 'index';
190
+            if (!isset($routes[1])) {
191
+                $routes[1] = 'index';
192
+            }
181 193
             $index = isset($this->request['index']) ? $this->request['index'] : 0;
182 194
             $class = (class_exists($routes[0]))
183 195
                 ? $routes[0]
184 196
                 : $this->router->collection->getRoutes()['namespace_'.$index].$routes[0];
185
-            if (!class_exists($class))
186
-                throw new \Exception('Class "' . $class . '." is not found');
197
+            if (!class_exists($class)) {
198
+                            throw new \Exception('Class "' . $class . '." is not found');
199
+            }
187 200
             if (method_exists($class, $routes[1])) {
188 201
                 $this->router->route->setTarget([
189 202
                     'dispatcher' => $this->dispatcher['matchController'],
Please login to merge, or discard this patch.
src/Routing/Dispatcher/TemplateDispatcher.php 1 patch
Braces   +8 added lines, -6 removed lines patch added patch discarded remove patch
@@ -47,12 +47,14 @@
 block discarded – undo
47 47
      */
48 48
     public function call()
49 49
     {
50
-        if ($this->response->getStatusCode() == 202)
51
-            $this->setContentType($this->route->getTarget('extension'));
52
-        if (isset($this->route->getTarget()['callback'][$this->route->getTarget('extension')]))
53
-            $this->response->setContent(call_user_func_array($this->route->getTarget()['callback'][$this->route->getTarget('extension')], [$this->route]));
54
-        else
55
-            $this->response->setContent(require($this->route->getTarget('template')));
50
+        if ($this->response->getStatusCode() == 202) {
51
+                    $this->setContentType($this->route->getTarget('extension'));
52
+        }
53
+        if (isset($this->route->getTarget()['callback'][$this->route->getTarget('extension')])) {
54
+                    $this->response->setContent(call_user_func_array($this->route->getTarget()['callback'][$this->route->getTarget('extension')], [$this->route]));
55
+        } else {
56
+                    $this->response->setContent(require($this->route->getTarget('template')));
57
+        }
56 58
     }
57 59
 
58 60
     /**
Please login to merge, or discard this patch.
src/Routing/Dispatcher/ControllerDispatcher.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -48,8 +48,9 @@  discard block
 block discarded – undo
48 48
                 array_unshift($dependencies, call_user_func_array($this->route->getTarget('di'),[$class]));
49 49
             }
50 50
         }
51
-        if ($this->response->getStatusCode() == 202)
52
-            $this->response->setStatusCode(200);
51
+        if ($this->response->getStatusCode() == 202) {
52
+                    $this->response->setStatusCode(200);
53
+        }
53 54
         return $this->response->setContent($reflectionMethod->invokeArgs($this->getController(), $dependencies));
54 55
     }
55 56
 
@@ -61,8 +62,9 @@  discard block
 block discarded – undo
61 62
     private function getController()
62 63
     {
63 64
         $reflector = new ReflectionClass($this->route->getTarget('controller'));
64
-        if (!$reflector->isInstantiable())
65
-            throw new \Exception('Target [' . $this->route->getTarget('controller') . '] is not instantiable.');
65
+        if (!$reflector->isInstantiable()) {
66
+                    throw new \Exception('Target [' . $this->route->getTarget('controller') . '] is not instantiable.');
67
+        }
66 68
         $constructor = $reflector->getConstructor();
67 69
         if (is_null($constructor)) {
68 70
             $class = $this->route->getTarget('controller');
Please login to merge, or discard this patch.
src/Routing/Route.php 1 patch
Braces   +18 added lines, -8 removed lines patch added patch discarded remove patch
@@ -52,10 +52,18 @@  discard block
 block discarded – undo
52 52
      */
53 53
     public function set($args = [])
54 54
     {
55
-        if (isset($args['name'])) $this->name = $args['name'];
56
-        if (isset($args['callback'])) $this->callback = $args['callback'];
57
-        if (isset($args['target'])) $this->target = $args['target'];
58
-        if (isset($args['detail'])) $this->detail = $args['detail'];
55
+        if (isset($args['name'])) {
56
+            $this->name = $args['name'];
57
+        }
58
+        if (isset($args['callback'])) {
59
+            $this->callback = $args['callback'];
60
+        }
61
+        if (isset($args['target'])) {
62
+            $this->target = $args['target'];
63
+        }
64
+        if (isset($args['detail'])) {
65
+            $this->detail = $args['detail'];
66
+        }
59 67
     }
60 68
 
61 69
     /**
@@ -145,8 +153,9 @@  discard block
 block discarded – undo
145 153
      */
146 154
     public function getTarget($key = null)
147 155
     {
148
-        if (!is_null($key))
149
-            return isset($this->target[$key]) ? $this->target[$key] : '';
156
+        if (!is_null($key)) {
157
+                    return isset($this->target[$key]) ? $this->target[$key] : '';
158
+        }
150 159
         return empty($this->target) ? '' : $this->target;
151 160
     }
152 161
 
@@ -165,8 +174,9 @@  discard block
 block discarded – undo
165 174
      */
166 175
     public function hasTarget($key = null)
167 176
     {
168
-        if (!is_null($key))
169
-            return isset($this->target[$key]) ? true : false;
177
+        if (!is_null($key)) {
178
+                    return isset($this->target[$key]) ? true : false;
179
+        }
170 180
         return empty($this->target) ? false : true;
171 181
     }
172 182
 
Please login to merge, or discard this patch.