Skip to content

Commit b06fd49

Browse files
committed
Merge branch 'v1.x' into v2.x
2 parents 2373042 + 34cbfda commit b06fd49

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

BaseMapper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
*/
3636
abstract class BaseMapper
3737
{
38-
/** @var string TABLE_NAME */
38+
/** @var string|null TABLE_NAME */
3939
public const TABLE_NAME = null;
4040
protected const PRIMARY_KEY = null;
4141
protected const OBJECT_NAME = null;

Main.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ protected function buildCliArguments(RouterInterface $router): void
8686
/** @var array{argv:array<string>} $_SERVER */
8787
$router->buildRouteForRequestUrl('CLI/index/index');
8888

89-
$_SERVER['argv'][0] = str_replace(':', DIRECTORY_SEPARATOR, $_SERVER['argv'][0]);
90-
$path = 'CLI' . DIRECTORY_SEPARATOR . implode(DIRECTORY_SEPARATOR, $_SERVER['argv']);
89+
$_SERVER['argv'][0] = str_replace(':', '/', $_SERVER['argv'][0]);
90+
$path = 'CLI' . '/' . implode('/', $_SERVER['argv']);
9191
$router->buildCliArguments($path);
9292
}
9393

0 commit comments

Comments
 (0)