create-prisma-php-app 1.10.18 → 1.10.20
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/bootstrap.php
CHANGED
|
@@ -77,14 +77,29 @@ function checkForDuplicateRoutes()
|
|
|
77
77
|
foreach ($routes as $route) {
|
|
78
78
|
$routeWithoutGroups = preg_replace('/\(.*?\)/', '', $route);
|
|
79
79
|
$routeTrimmed = ltrim($routeWithoutGroups, '.\\/');
|
|
80
|
+
$routeTrimmed = preg_replace('#/{2,}#', '/', $routeTrimmed);
|
|
81
|
+
$routeTrimmed = preg_replace('#\\\\{2,}#', '\\', $routeTrimmed);
|
|
80
82
|
$routeNormalized = str_replace(['\\', '/'], DIRECTORY_SEPARATOR, $routeTrimmed);
|
|
81
83
|
$normalizedRoutesMap[$routeNormalized][] = $route;
|
|
82
84
|
}
|
|
83
85
|
|
|
84
86
|
$errorMessages = [];
|
|
85
87
|
foreach ($normalizedRoutesMap as $normalizedRoute => $originalRoutes) {
|
|
88
|
+
$basename = basename($normalizedRoute);
|
|
89
|
+
if ($basename === 'layout.php') continue;
|
|
90
|
+
|
|
86
91
|
if (count($originalRoutes) > 1 && strpos($normalizedRoute, DIRECTORY_SEPARATOR) !== false) {
|
|
92
|
+
$directGroupMatchFound = false;
|
|
93
|
+
foreach ($originalRoutes as $originalRoute) {
|
|
94
|
+
if (preg_match('#^\\.\\/src\\/app\\\\\\((.*?)\\)\\\\([^\\\\]+\\.php)$#', $originalRoute, $matches)) {
|
|
95
|
+
$directGroupMatchFound = true;
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
if ($directGroupMatchFound) continue;
|
|
100
|
+
|
|
87
101
|
$errorMessages[] = "Duplicate route found after normalization: " . $normalizedRoute;
|
|
102
|
+
|
|
88
103
|
foreach ($originalRoutes as $originalRoute) {
|
|
89
104
|
$errorMessages[] = "- Grouped original route: " . $originalRoute;
|
|
90
105
|
}
|
|
@@ -93,7 +108,7 @@ function checkForDuplicateRoutes()
|
|
|
93
108
|
|
|
94
109
|
if (!empty($errorMessages)) {
|
|
95
110
|
$errorMessageString = implode("<br>", $errorMessages);
|
|
96
|
-
|
|
111
|
+
modifyOutputLayoutForError($errorMessageString);
|
|
97
112
|
}
|
|
98
113
|
}
|
|
99
114
|
|
package/dist/settings/paths.php
CHANGED
|
@@ -6,6 +6,5 @@ define("PUBLIC_PATH", dirname(SETTINGS_PATH) . "/public");
|
|
|
6
6
|
define("PRISMA_LIB_PATH", dirname(SETTINGS_PATH) . "/src/Lib/Prisma");
|
|
7
7
|
define("SRC_PATH", dirname(SETTINGS_PATH) . "/src");
|
|
8
8
|
define("APP_PATH", dirname(SETTINGS_PATH) . "/src/app");
|
|
9
|
-
define("API_PATH", dirname(SETTINGS_PATH) . "/src/app/api");
|
|
10
9
|
define("LIB_PATH", dirname(SETTINGS_PATH) . "/src/Lib");
|
|
11
10
|
define("DOCUMENT_PATH", dirname(SETTINGS_PATH));
|