Merge pull request #6 from ikhsan3adi/upgrade-4.5.1

deps: Upgrade codeigniter
ikhsan3adi · Apr 29, 2024 · 8f66bc3 · 8f66bc3
2 parents eeae7dd + d7c67bd
commit 8f66bc3
Show file tree

Hide file tree

Showing 5 changed files with 186 additions and 239 deletions.
diff --git a/app/Config/Feature.php b/app/Config/Feature.php
@@ -9,20 +9,6 @@
  */
 class Feature extends BaseConfig
 {
-    /**
-     * Enable multiple filters for a route or not.
-     *
-     * If you enable this:
-     *   - CodeIgniter\CodeIgniter::handleRequest() uses:
-     *     - CodeIgniter\Filters\Filters::enableFilters(), instead of enableFilter()
-     *   - CodeIgniter\CodeIgniter::tryToRouteIt() uses:
-     *     - CodeIgniter\Router\Router::getFilters(), instead of getFilter()
-     *   - CodeIgniter\Router\Router::handle() uses:
-     *     - property $filtersInfo, instead of $filterInfo
-     *     - CodeIgniter\Router\RouteCollection::getFiltersForRoute(), instead of getFilterForRoute()
-     */
-    public bool $multipleFilters = false;
-
     /**
      * Use improved new auto routing instead of the default legacy version.
      */

diff --git a/app/Config/Filters.php b/app/Config/Filters.php
@@ -2,14 +2,16 @@
 
 namespace Config;
 
-use CodeIgniter\Config\BaseConfig;
 use CodeIgniter\Filters\CSRF;
 use CodeIgniter\Filters\DebugToolbar;
 use CodeIgniter\Filters\Honeypot;
 use CodeIgniter\Filters\InvalidChars;
 use CodeIgniter\Filters\SecureHeaders;
+use CodeIgniter\Filters\ForceHTTPS;
+use CodeIgniter\Filters\PageCache;
+use CodeIgniter\Filters\PerformanceMetrics;
 
-class Filters extends BaseConfig
+class Filters extends \CodeIgniter\Config\Filters
 {
     /**
      * Configures aliases for Filter classes to
@@ -21,6 +23,9 @@ class Filters extends BaseConfig
         'honeypot'      => Honeypot::class,
         'invalidchars'  => InvalidChars::class,
         'secureheaders' => SecureHeaders::class,
+        'forcehttps'    => ForceHTTPS::class,
+        'pagecache'     => PageCache::class,
+        'performance'   => PerformanceMetrics::class,
     ];
 
     /**
@@ -32,11 +37,15 @@ class Filters extends BaseConfig
             // 'honeypot',
             // 'csrf',
             // 'invalidchars',
+            'forcehttps', // Force Global Secure Requests
+            'pagecache',  // Web Page Caching
         ],
         'after' => [
-            'toolbar',
             // 'honeypot',
             // 'secureheaders',
+            'pagecache',   // Web Page Caching
+            'performance', // Performance Metrics
+            'toolbar',     // Debug Toolbar
         ],
     ];