Skip to content

Commit dcaffcc

Browse files
committed
Fix routes order not respected in some case + Moved userfrosting/uniformresourcelocator requirement to main composer file + Updated userfrosting/uniformresourcelocator minimum version
1 parent 5483ff2 commit dcaffcc

6 files changed

Lines changed: 8 additions & 5 deletions

File tree

app/sprinkles/core/composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
"userfrosting/cache": "~4.2.0",
5151
"userfrosting/fortress": "~4.2.0",
5252
"userfrosting/i18n": "~4.2.0",
53-
"userfrosting/uniformresourcelocator": "~4.2.0",
5453
"userfrosting/session": "~4.2.0",
5554
"userfrosting/support": "~4.2.0",
5655
"vlucas/phpdotenv": "^2"

app/sprinkles/core/src/Database/Migrator/MigrationLocator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function __construct(ResourceLocator $locator)
4949
*/
5050
public function getMigrations()
5151
{
52-
$migrationFiles = $this->locator->listResources($this->scheme);
52+
$migrationFiles = $this->locator->listResources($this->scheme, false, false);
5353

5454
$migrations = [];
5555
foreach ($migrationFiles as $migrationFile) {

app/sprinkles/core/src/Database/Seeder/Seeder.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ public function __construct(ContainerInterface $ci)
4949
*/
5050
public function getSeeds()
5151
{
52-
return $this->loadSeeders($this->ci->locator->listResources($this->scheme));
52+
$seeds = $this->ci->locator->listResources($this->scheme, false, false);
53+
54+
return $this->loadSeeders($seeds);
5355
}
5456

5557
/**

app/sprinkles/core/src/Router.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@ public function loadRoutes(App $slimApp)
104104

105105
$ci = $app->getContainer();
106106

107-
$routeFiles = array_reverse($ci->locator->listResources('routes://', true));
107+
// Reverse the list, so the lower priority are required first
108+
$routeFiles = array_reverse($ci->locator->listResources('routes://', true, false));
108109
foreach ($routeFiles as $routeFile) {
109110
require $routeFile;
110111
}

app/system/Bakery/Bakery.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ protected function loadCommands()
9292
$locator = $this->ci->locator;
9393

9494
// Get Bakery command resources
95-
$commandResources = $locator->listResources($this->scheme);
95+
$commandResources = $locator->listResources($this->scheme, false, false);
9696

9797
// Add commands to the App
9898
foreach ($commandResources as $commandResource) {

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"php": ">=5.6",
1919
"ext-gd": "*",
2020
"composer/installers": "^1.4.0",
21+
"userfrosting/uniformresourcelocator": "~4.2.3",
2122
"symfony/console": "^3.3",
2223
"wikimedia/composer-merge-plugin": "^1.4.0"
2324
},

0 commit comments

Comments
 (0)