Merge pull request #13 from cakephp/5x-upgrade

5x upgrade

Author: markstory

composer.json

@@ -5,19 +5,20 @@
     "type": "project",
     "license": "MIT",
     "require": {
-        "php": ">=7.2",
-        "cakephp/cakephp": "^4.0",
-        "cakephp/migrations": "~3.0",
-        "cakephp/authorization": "~2.0",
-        "cakephp/authentication": "~2.0",
-        "cakephp/plugin-installer": "~1.0",
+        "php": ">=8.1",
+        "cakephp/cakephp": "^5.0",
+        "cakephp/migrations": "~4.0",
+        "cakephp/authorization": "~3.0",
+        "cakephp/authentication": "~3.0",
+        "cakephp/plugin-installer": "~2.0",
         "josegonzalez/dotenv": "2.*"
     },
     "require-dev": {
         "psy/psysh": "@stable",
-        "cakephp/debug_kit": "^4.0",
-        "cakephp/bake": "^2.0",
-        "cakephp/cakephp-codesniffer": "^4.0"
+        "cakephp/debug_kit": "^5.0",
+        "cakephp/bake": "^3.0",
+        "cakephp/repl": "^2.0",
+        "cakephp/cakephp-codesniffer": "^5.0"
     },
     "suggest": {
         "markstory/asset_compress": "An asset compression plugin which provides file concatenation and a flexible filter system for preprocessing and minification.",
@@ -39,7 +40,6 @@
     "scripts": {
         "post-install-cmd": "App\\Console\\Installer::postInstall",
         "post-create-project-cmd": "App\\Console\\Installer::postInstall",
-        "post-autoload-dump": "Cake\\Composer\\Installer\\PluginInstaller::postAutoloadDump",
         "check": [
             "@test",
             "@cs-check"
@@ -50,5 +50,11 @@
         "test": "phpunit --colors=always"
     },
     "minimum-stability": "dev",
-    "prefer-stable": true
+    "prefer-stable": true,
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "cakephp/plugin-installer": true
+        }
+    }
 }

composer.lock

@@ -1,11 +1,13 @@
 <?php
+declare(strict_types=1);
 
 use Cake\Cache\Engine\FileEngine;
 use Cake\Database\Connection;
 use Cake\Database\Driver\Mysql;
 use Cake\Error\ExceptionRenderer;
 use Cake\Log\Engine\FileLog;
 use Cake\Mailer\Transport\MailTransport;
+use function Cake\Core\env;
 
 return [
     /*
@@ -17,7 +19,7 @@
      * Development Mode:
      * true: Errors and warnings shown.
      */
-    'debug' => filter_var(env('DEBUG', false), FILTER_VALIDATE_BOOLEAN),
+    'debug' => true, //filter_var(env('DEBUG', false), FILTER_VALIDATE_BOOLEAN),
 
     /*
      * Configure basic information about the application.

config/app.php

@@ -44,6 +44,9 @@
 use Cake\Routing\Router;
 use Cake\Utility\Security;
 
+require_once CAKE . 'Core/functions_global.php';
+require_once CAKE . 'I18n/functions_global.php';
+
 /*
  * See https://github.com/josegonzalez/php-dotenv for API details.
  *

config/bootstrap.php

@@ -64,8 +64,6 @@ public function bootstrap(): void
         }
         $this->addPlugin('Authentication');
         $this->addPlugin('Authorization');
-
-        // Load more plugins here
     }
 
     /**
@@ -114,13 +112,7 @@ public function middleware($middlewareQueue): \Cake\Http\MiddlewareQueue
             ->add(new AuthorizationMiddleware($this));
 
         if (Configure::read('debug')) {
-            // Disable authz for debugkit
-            $middlewareQueue->add(function ($req, $res, $next) {
-                if ($req->getParam('plugin') === 'DebugKit') {
-                    $req->getAttribute('authorization')->skipAuthorization();
-                }
-                return $next($req, $res);
-            });
+            Configure::write('DebugKit.ignoreAuthorization', true);
         }
 
         return $middlewareQueue;

src/Application.php

@@ -40,7 +40,6 @@ class AppController extends Controller
     public function initialize(): void
     {
         parent::initialize();
-        $this->loadComponent('RequestHandler');
         $this->loadComponent('Flash');
         $this->loadComponent('Authentication.Authentication');
         $this->loadComponent('Authorization.Authorization');

src/Command/ConsoleCommand.php

@@ -85,18 +85,12 @@ public function delete($slug)
         }
     }
 
-    public function tags()
+    public function tags(array $tags = [])
     {
         $this->Authorization->skipAuthorization();
 
-        // The 'pass' key is provided by CakePHP and contains all
-        // the passed URL path segments in the request.
-        $tags = $this->request->getParam('pass');
-
         // Use the ArticlesTable to find tagged articles.
-        $articles = $this->Articles->find('tagged', [
-            'tags' => $tags
-        ]);
+        $articles = $this->Articles->find('tagged', tags: $tags);
 
         // Pass variables into the view template context.
         $this->set([

src/Controller/AppController.php

@@ -23,16 +23,6 @@
  */
 class ErrorController extends AppController
 {
-    /**
-     * Initialization hook method.
-     *
-     * @return void
-     */
-    public function initialize(): void
-    {
-        $this->loadComponent('RequestHandler');
-    }
-
     /**
      * beforeFilter callback.
      *

src/Controller/ArticlesController.php

@@ -15,8 +15,8 @@
 namespace App\Controller;
 
 use Cake\Core\Configure;
-use Cake\Network\Exception\ForbiddenException;
-use Cake\Network\Exception\NotFoundException;
+use Cake\Http\Exception\ForbiddenException;
+use Cake\Http\Exception\NotFoundException;
 use Cake\View\Exception\MissingTemplateException;
 
 /**