Skip to content

Commit ca8ad8c

Browse files
dconcodconco
authored
Merge pull request #21 from PhpSlides/dev
Fixes error
2 parents 9b7f115 + acbfec2 commit ca8ad8c

File tree

5 files changed

+160
-252
lines changed

5 files changed

+160
-252
lines changed

‎Router/MapRoute.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class MapRoute extends Controller implements MapInterface
2525
public function match(string $method, string|array $route): bool|array
2626
{
2727
$config_file = self::config_file();
28-
self::$charset = $config_file['charset'];
28+
self::$charset = $config_file['charset'] ?? 'UTF-8';
2929
self::$method = explode('|', $method);
3030
/**
3131
* ----------------------------------------------

‎Router/Route.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -142,15 +142,15 @@ public static function config(): void
142142
$file_type = $file ? self::file_type($dir . '/public/' . $req) : null;
143143
$config_file = self::config_file();
144144

145-
$charset = $config_file['charset'];
145+
$charset = $config_file['charset'] ?? 'UTF-8';
146146

147147
/**
148148
* ----------------------------------------------
149149
* Config File & Request Router configurations
150150
* ----------------------------------------------
151151
*/
152152
if (!empty($config_file) && $file_type != null) {
153-
$config = $config_file['public'];
153+
$config = $config_file['public'] ?? [];
154154
$accept = true;
155155

156156
// loop over the requested URL folders

‎src/Globals/Functions.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ function route(
5959
string|null $name = null,
6060
array|null $param = null
6161
): array|object|string {
62-
$routes = $GLOBALS['__routes'];
62+
$routes = $GLOBALS['__routes'] ?? [];
6363

6464
if ($name === null) {
6565
$route_class = new stdClass();

‎src/Traits/Resources/ApiResources.php

+44-70
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php
1+
<?php declare(strict_types=1);
22

33
namespace PhpSlides\Traits\Resources;
44

@@ -19,18 +19,16 @@ trait ApiResources
1919

2020
protected static ?array $apiMiddleware = null;
2121

22-
protected function __route (): void
22+
protected function __route(): void
2323
{
2424
$match = new MapRoute();
2525
self::$map_info = $match->match(
26-
self::$route['r_method'] ?? 'dynamic',
27-
self::$route['url']
26+
self::$route['r_method'] ?? 'dynamic',
27+
self::$route['url'] ?? ''
2828
);
2929

30-
if (self::$map_info)
31-
{
32-
if (self::$apiMiddleware !== null)
33-
{
30+
if (self::$map_info) {
31+
if (self::$apiMiddleware !== null) {
3432
$this->__api_middleware();
3533
}
3634

@@ -39,41 +37,37 @@ protected function __route (): void
3937
}
4038
}
4139

42-
protected function __routeSelection (?Request $request = null)
40+
protected function __routeSelection(?Request $request = null)
4341
{
4442
$info = self::$map_info;
4543
$route = self::$route ?? self::$apiMap;
4644

4745
$method = $_SERVER['REQUEST_METHOD'];
48-
$controller = $route['controller'];
46+
$controller = $route['controller'] ?? '';
4947

50-
if (!class_exists($controller))
51-
{
48+
if (!class_exists($controller)) {
5249
throw new Exception(
53-
"Api controller class `$controller` does not exist."
50+
"Api controller class `$controller` does not exist."
5451
);
5552
}
5653
$params = $info['params'] ?? null;
5754

58-
if (!class_exists($controller))
59-
{
55+
if (!class_exists($controller)) {
6056
throw new Exception(
61-
"Api controller class does not exist: `$controller`"
57+
"Api controller class does not exist: `$controller`"
6258
);
6359
}
6460
$cc = new $controller();
6561

6662
$r_method = '';
6763
$method = strtoupper($_SERVER['REQUEST_METHOD']);
6864

69-
if (isset($route['c_method']))
70-
{
65+
if (isset($route['c_method'])) {
7166
$r_method = $route['c_method'];
7267
goto EXECUTE;
7368
}
7469

75-
switch ($method)
76-
{
70+
switch ($method) {
7771
case 'GET':
7872
global $r_method;
7973
$r_method = $params === null ? 'index' : 'show';
@@ -96,12 +90,9 @@ protected function __routeSelection (?Request $request = null)
9690
break;
9791

9892
default:
99-
if (method_exists($cc, '__default'))
100-
{
93+
if (method_exists($cc, '__default')) {
10194
$r_method = '__default';
102-
}
103-
else
104-
{
95+
} else {
10596
http_response_code(405);
10697
self::log();
10798
exit('Request method not allowed.');
@@ -110,15 +101,12 @@ protected function __routeSelection (?Request $request = null)
110101
}
111102

112103
EXECUTE:
113-
if ($cc instanceof ApiController)
114-
{
115-
if ($request === null)
116-
{
104+
if ($cc instanceof ApiController) {
105+
if ($request === null) {
117106
$request = new Request($params);
118107
}
119108

120-
if (method_exists($cc, $r_method))
121-
{
109+
if (method_exists($cc, $r_method)) {
122110
$response = $cc->$r_method($request);
123111
}
124112

@@ -127,64 +115,53 @@ protected function __routeSelection (?Request $request = null)
127115

128116
self::log();
129117
return $response;
130-
}
131-
else
132-
{
118+
} else {
133119
throw new Exception(
134-
'Api controller class must implements `ApiController`'
120+
'Api controller class must implements `ApiController`'
135121
);
136122
}
137123
}
138124

139-
protected function __api_middleware (): void
125+
protected function __api_middleware(): void
140126
{
141127
$middleware = self::$apiMiddleware ?? [];
142128
$response = '';
143129

144-
$params = self::$map_info['params'];
130+
$params = self::$map_info['params'] ?? null;
145131
$request = new Request($params);
146132

147-
for ($i = 0; $i < count((array) $middleware); $i++)
148-
{
133+
for ($i = 0; $i < count((array) $middleware); $i++) {
149134
$middlewares = (new FileLoader())
150-
->load(__DIR__ . '/../../Config/middleware.php')
151-
->getLoad();
135+
->load(__DIR__ . '/../../Config/middleware.php')
136+
->getLoad();
152137

153-
if (array_key_exists($middleware[$i], $middlewares))
154-
{
138+
if (array_key_exists($middleware[$i], $middlewares)) {
155139
$middleware = $middlewares[$middleware[$i]];
156-
}
157-
else
158-
{
140+
} else {
159141
self::log();
160142
throw new Exception(
161-
'No Registered Middleware as `' . $middleware[$i] . '`'
143+
'No Registered Middleware as `' . $middleware[$i] . '`'
162144
);
163145
}
164146

165-
if (!class_exists($middleware))
166-
{
147+
if (!class_exists($middleware)) {
167148
self::log();
168149
throw new Exception(
169-
"Middleware class does not exist: `{$middleware}`"
150+
"Middleware class does not exist: `{$middleware}`"
170151
);
171152
}
172153
$mw = new $middleware();
173154

174-
if ($mw instanceof MiddlewareInterface)
175-
{
176-
$next = function (Request $request)
177-
{
155+
if ($mw instanceof MiddlewareInterface) {
156+
$next = function (Request $request) {
178157
return $this->__routeSelection($request);
179158
};
180159

181160
$response = $mw->handle($request, $next);
182-
}
183-
else
184-
{
161+
} else {
185162
self::log();
186163
throw new Exception(
187-
'Middleware class must implements `MiddlewareInterface`'
164+
'Middleware class must implements `MiddlewareInterface`'
188165
);
189166
}
190167
}
@@ -194,31 +171,28 @@ protected function __api_middleware (): void
194171
exit();
195172
}
196173

197-
protected function __api_map (?Request $request = null): void
174+
protected function __api_map(?Request $request = null): void
198175
{
199176
$map = self::$apiMap;
200-
$base_url = $map['base_url'];
201-
$controller = $map['controller'];
177+
$base_url = $map['base_url'] ?? '';
178+
$controller = $map['controller'] ?? '';
202179

203-
foreach ($map as $route => $method)
204-
{
180+
foreach ($map as $route => $method) {
205181
$r_method = $method[0];
206182
$c_method = $method[1];
207183
$url = $base_url . trim($route, '/');
208184

209185
self::$apiMap = [
210-
'controller' => $controller,
211-
'c_method' => trim($c_method, '@'),
212-
'url' => $base_url
186+
'controller' => $controller,
187+
'c_method' => trim($c_method, '@'),
188+
'url' => $base_url
213189
];
214190

215191
$match = new MapRoute();
216192
self::$map_info = $match->match($r_method, $url);
217193

218-
if (self::$map_info)
219-
{
220-
if (self::$apiMiddleware !== null)
221-
{
194+
if (self::$map_info) {
195+
if (self::$apiMiddleware !== null) {
222196
$this->__api_middleware();
223197
}
224198

0 commit comments

Comments
 (0)