@@ -384,7 +384,8 @@ public function initialize(?string $uri = null)
384
384
return $ this ;
385
385
}
386
386
387
- if (config (Feature::class)->oldFilterOrder ) {
387
+ $ oldFilterOrder = config (Feature::class)->oldFilterOrder ?? false ;
388
+ if ($ oldFilterOrder ) {
388
389
$ this ->processGlobals ($ uri );
389
390
$ this ->processMethods ();
390
391
$ this ->processFilters ($ uri );
@@ -604,7 +605,8 @@ protected function processGlobals(?string $uri = null)
604
605
}
605
606
606
607
if (isset ($ filters ['before ' ])) {
607
- if (config (Feature::class)->oldFilterOrder ) {
608
+ $ oldFilterOrder = config (Feature::class)->oldFilterOrder ?? false ;
609
+ if ($ oldFilterOrder ) {
608
610
$ this ->filters ['before ' ] = array_merge ($ this ->filters ['before ' ], $ filters ['before ' ]);
609
611
} else {
610
612
$ this ->filters ['before ' ] = array_merge ($ filters ['before ' ], $ this ->filters ['before ' ]);
@@ -649,7 +651,8 @@ protected function processMethods()
649
651
}
650
652
651
653
if ($ found ) {
652
- if (config (Feature::class)->oldFilterOrder ) {
654
+ $ oldFilterOrder = config (Feature::class)->oldFilterOrder ?? false ;
655
+ if ($ oldFilterOrder ) {
653
656
$ this ->filters ['before ' ] = array_merge ($ this ->filters ['before ' ], $ this ->config ->methods [$ method ]);
654
657
} else {
655
658
$ this ->filters ['before ' ] = array_merge ($ this ->config ->methods [$ method ], $ this ->filters ['before ' ]);
@@ -706,16 +709,18 @@ protected function processFilters(?string $uri = null)
706
709
}
707
710
}
708
711
712
+ $ oldFilterOrder = config (Feature::class)->oldFilterOrder ?? false ;
713
+
709
714
if (isset ($ filters ['before ' ])) {
710
- if (config (Feature::class)-> oldFilterOrder ) {
715
+ if ($ oldFilterOrder ) {
711
716
$ this ->filters ['before ' ] = array_merge ($ this ->filters ['before ' ], $ filters ['before ' ]);
712
717
} else {
713
718
$ this ->filters ['before ' ] = array_merge ($ filters ['before ' ], $ this ->filters ['before ' ]);
714
719
}
715
720
}
716
721
717
722
if (isset ($ filters ['after ' ])) {
718
- if (! config (Feature::class)-> oldFilterOrder ) {
723
+ if (! $ oldFilterOrder ) {
719
724
$ filters ['after ' ] = array_reverse ($ filters ['after ' ]);
720
725
}
721
726
0 commit comments