Skip to content

Commit 0677a35

Browse files
committed
fix: Undefined property: Config\Feature::$oldFilterOrder
When Config\Feature is not updated.
1 parent 8c91b0d commit 0677a35

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

system/CodeIgniter.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,8 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache
466466
if ($routeFilters !== null) {
467467
$filters->enableFilters($routeFilters, 'before');
468468

469-
if (! config(Feature::class)->oldFilterOrder) {
469+
$oldFilterOrder = config(Feature::class)->oldFilterOrder ?? false;
470+
if (! $oldFilterOrder) {
470471
$routeFilters = array_reverse($routeFilters);
471472
}
472473

system/Commands/Utilities/Routes/FilterFinder.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ public function find(string $uri): array
5757

5858
$this->filters->enableFilters($routeFilters, 'before');
5959

60-
if (! config(Feature::class)->oldFilterOrder) {
60+
$oldFilterOrder = config(Feature::class)->oldFilterOrder ?? false;
61+
if (! $oldFilterOrder) {
6162
$routeFilters = array_reverse($routeFilters);
6263
}
6364

system/Filters/Filters.php

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,8 @@ public function initialize(?string $uri = null)
384384
return $this;
385385
}
386386

387-
if (config(Feature::class)->oldFilterOrder) {
387+
$oldFilterOrder = config(Feature::class)->oldFilterOrder ?? false;
388+
if ($oldFilterOrder) {
388389
$this->processGlobals($uri);
389390
$this->processMethods();
390391
$this->processFilters($uri);
@@ -604,7 +605,8 @@ protected function processGlobals(?string $uri = null)
604605
}
605606

606607
if (isset($filters['before'])) {
607-
if (config(Feature::class)->oldFilterOrder) {
608+
$oldFilterOrder = config(Feature::class)->oldFilterOrder ?? false;
609+
if ($oldFilterOrder) {
608610
$this->filters['before'] = array_merge($this->filters['before'], $filters['before']);
609611
} else {
610612
$this->filters['before'] = array_merge($filters['before'], $this->filters['before']);
@@ -649,7 +651,8 @@ protected function processMethods()
649651
}
650652

651653
if ($found) {
652-
if (config(Feature::class)->oldFilterOrder) {
654+
$oldFilterOrder = config(Feature::class)->oldFilterOrder ?? false;
655+
if ($oldFilterOrder) {
653656
$this->filters['before'] = array_merge($this->filters['before'], $this->config->methods[$method]);
654657
} else {
655658
$this->filters['before'] = array_merge($this->config->methods[$method], $this->filters['before']);
@@ -706,16 +709,18 @@ protected function processFilters(?string $uri = null)
706709
}
707710
}
708711

712+
$oldFilterOrder = config(Feature::class)->oldFilterOrder ?? false;
713+
709714
if (isset($filters['before'])) {
710-
if (config(Feature::class)->oldFilterOrder) {
715+
if ($oldFilterOrder) {
711716
$this->filters['before'] = array_merge($this->filters['before'], $filters['before']);
712717
} else {
713718
$this->filters['before'] = array_merge($filters['before'], $this->filters['before']);
714719
}
715720
}
716721

717722
if (isset($filters['after'])) {
718-
if (! config(Feature::class)->oldFilterOrder) {
723+
if (! $oldFilterOrder) {
719724
$filters['after'] = array_reverse($filters['after']);
720725
}
721726

0 commit comments

Comments
 (0)