Skip to content

Commit f94d8ab

Browse files
committed
Merge branch 'main' of github.com:MaplePHP/Emitron
2 parents 13fbde4 + b31259e commit f94d8ab

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

composer.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@
3737
"require-dev": {
3838
"maplephp/unitary": "^2.0"
3939
},
40+
"extra": {
41+
"branch-alias": {
42+
"dev-main": "1.x-dev"
43+
}
44+
},
4045
"autoload": {
4146
"psr-4": {
4247
"MaplePHP\\Emitron\\": "src"

src/AbstractKernel.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ public function __construct(
5757
/**
5858
* Makes it easy to specify a config file inside a custom kernel file
5959
*
60-
* @param string $path
60+
* @param string|null $path
6161
* @return void
6262
*/
63-
public static function setConfigFilePath(string $path): void
63+
public static function setConfigFilePath(?string $path): void
6464
{
6565
static::$configFilePath = $path;
6666
}
@@ -81,10 +81,10 @@ public static function getConfigFilePath(): string
8181
/**
8282
* Set router path
8383
*
84-
* @param string $path
84+
* @param string|null $path
8585
* @return void
8686
*/
87-
public static function setRouterFilePath(string $path): void
87+
public static function setRouterFilePath(?string $path): void
8888
{
8989
static::$routerFilePath = $path;
9090
}

src/DispatchConfig.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ public function loadConfigFile(string $path): void
127127
}
128128

129129
$config = require $path;
130+
// Add json logic here in the future
130131
if (!is_array($config)) {
131132
throw new Exception('The config file do not return a array');
132133
}

0 commit comments

Comments
 (0)