Skip to content

Commit adb9781

Browse files
committed
refactor build.php
1 parent 8693e0a commit adb9781

File tree

2 files changed

+12
-16
lines changed

2 files changed

+12
-16
lines changed

api.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4839,7 +4839,11 @@ public function register(string $method, string $path, array $handler)
48394839
$routeNumber = count($this->routeHandlers);
48404840
$this->routeHandlers[$routeNumber] = $handler;
48414841
if ($this->registration) {
4842-
$parts = explode('/', trim($path, '/'));
4842+
$path = trim($path, '/');
4843+
$parts = array();
4844+
if ($path) {
4845+
$parts = explode('/', $path);
4846+
}
48434847
array_unshift($parts, $method);
48444848
$this->routes->put($parts, $routeNumber);
48454849
}

build.php

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function removeIgnored(string $dir, array &$entries, array $ignore)
99
}
1010
}
1111

12-
function prioritySort(string $dir, array &$entries, array $priority)
12+
function prioritySort(string $dir, array &$entries)
1313
{
1414
$first = array();
1515
foreach ($entries as $i => $entry) {
@@ -24,19 +24,19 @@ function prioritySort(string $dir, array &$entries, array $priority)
2424
}
2525
}
2626

27-
function runDir(string $base, string $dir, array &$lines, array $ignore, array $priority): int
27+
function runDir(string $base, string $dir, array &$lines, array $ignore): int
2828
{
2929
$count = 0;
3030
$entries = scandir($dir);
3131
removeIgnored($dir, $entries, $ignore);
32-
prioritySort($dir, $entries, $priority);
32+
prioritySort($dir, $entries);
3333
foreach ($entries as $entry) {
3434
if ($entry === '.' || $entry === '..') {
3535
continue;
3636
}
3737
$filename = "$base/$dir/$entry";
3838
if (is_dir($filename)) {
39-
$count += runDir($base, "$dir/$entry", $lines, $ignore, $priority);
39+
$count += runDir($base, "$dir/$entry", $lines, $ignore);
4040
}
4141
}
4242
foreach ($entries as $entry) {
@@ -83,16 +83,15 @@ function addHeader(array &$lines)
8383
}
8484
}
8585

86-
function run(string $base, array $dirs, string $filename, array $ignore, array $priority)
86+
function run(string $base, array $dirs, string $filename, array $ignore)
8787
{
8888
$lines = [];
8989
$start = microtime(true);
9090
addHeader($lines);
9191
$ignore = array_flip($ignore);
92-
$priority = array_flip($priority);
9392
$count = 0;
9493
foreach ($dirs as $dir) {
95-
$count += runDir($base, $dir, $lines, $ignore, $priority);
94+
$count += runDir($base, $dir, $lines, $ignore);
9695
}
9796
$data = implode("\n", $lines);
9897
$data = preg_replace('/\n({)?\s*\n\s*\n/', "\n$1\n", $data);
@@ -107,14 +106,7 @@ function run(string $base, array $dirs, string $filename, array $ignore, array $
107106
}
108107

109108
$ignore = [
110-
'vendor/autoload.php',
111-
'vendor/composer',
112-
'vendor/php-http',
113109
'vendor/nyholm/psr7/src/Factory/HttplugFactory.php',
114110
];
115111

116-
$priority = [
117-
'vendor/psr',
118-
];
119-
120-
run(__DIR__, ['vendor', 'src'], 'api.php', $ignore, $priority);
112+
run(__DIR__, ['vendor/psr', 'vendor/nyholm', 'src'], 'api.php', $ignore);

0 commit comments

Comments
 (0)