Merge pull request #1 from pabloelcolombiano/master

PB-14812 Upgrade the app to CakePHP 4.3

Author: cedricalfonsi

composer.json

@@ -22,7 +22,7 @@
     "source": "https://github.com/passbolt/passbolt"
   },
   "require": {
-    "cakephp/cakephp": "^4.0"
+    "cakephp/cakephp": "^4.3"
   },
   "require-dev": {
     "phpunit/phpunit": "^8.5 || ^9.3"

config/routes.php

@@ -12,15 +12,16 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         2.0.0
  */
-use Cake\Routing\Router;
+
+/** @var \Cake\Routing\RouteBuilder $routes */
 
 /**
  * Selenium tests routes
  */
-Router::plugin('PassboltSeleniumApi', ['path' => '/seleniumtests'], function ($routes) {
+$routes->plugin('PassboltSeleniumApi', ['path' => '/seleniumtests'], function ($routes) {
     $routes->setExtensions(['json']);
 
-    $routes->connect('/resetInstance/:dataset', ['controller' => 'ResetInstance', 'action' => 'resetInstance'])
+    $routes->connect('/resetInstance/{dataset}', ['controller' => 'ResetInstance', 'action' => 'resetInstance'])
         ->setPass(['dataset'])
         ->setMethods(['GET']);
 
@@ -45,12 +46,12 @@
     $routes->connect('/error500', ['controller' => 'SimulateError', 'action' => 'error500'])
         ->setMethods(['GET']);
 
-    $routes->connect('/showlastemail/:username', ['controller' => 'Email', 'action' => 'showLastEmail'])
+    $routes->connect('/showlastemail/{username}', ['controller' => 'Email', 'action' => 'showLastEmail'])
         ->setPass(['username'])
         ->setMethods(['GET']);
 
     // Legacy v1 backward compatibility routes
-    $routes->connect('/showLastEmail/:username', ['controller' => 'Email', 'action' => 'showLastEmail'])
+    $routes->connect('/showLastEmail/{username}', ['controller' => 'Email', 'action' => 'showLastEmail'])
         ->setPass(['username'])
         ->setMethods(['GET']);
 });

src/Controller/ConfigController.php

@@ -30,10 +30,7 @@ class ConfigController extends AppController
     const EXTRA_CONFIG_FILE = self::EXTRA_CONFIG_PATH . self::EXTRA_CONFIG_FILENAME;
 
     /**
-     * Before filter
-     *
-     * @param \Cake\Event\EventInterface $event An Event instance
-     * @return \Cake\Http\Response|null
+     * @inheritDoc
      */
     public function beforeFilter(EventInterface $event)
     {

src/Controller/EmailController.php

@@ -25,10 +25,7 @@
 class EmailController extends AppController
 {
     /**
-     * Before filter
-     *
-     * @param \Cake\Event\EventInterface $event An Event instance
-     * @return \Cake\Http\Response|null
+     * @inheritDoc
      */
     public function beforeFilter(EventInterface $event)
     {

src/Controller/ResetInstanceController.php

@@ -25,10 +25,7 @@ class ResetInstanceController extends AppController
     use ConsoleIntegrationTestTrait;
 
     /**
-     * Before filter
-     *
-     * @param \Cake\Event\EventInterface $event An Event instance
-     * @return \Cake\Http\Response|null
+     * @inheritDoc
      */
     public function beforeFilter(EventInterface $event)
     {

src/Controller/SimulateErrorController.php

@@ -24,10 +24,7 @@
 class SimulateErrorController extends AppController
 {
     /**
-     * Before filter
-     *
-     * @param \Cake\Event\EventInterface $event An Event instance
-     * @return \Cake\Http\Response|null
+     * @inheritDoc
      */
     public function beforeFilter(EventInterface $event)
     {

tests/TestCase/Controller/ConfigControllerTest.php

@@ -12,7 +12,7 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         2.0.0
  */
-namespace PassboltSeleniumApi\Test\TestCase\Controller\SeleniumTests;
+namespace PassboltSeleniumApi\Test\TestCase\Controller;
 
 use App\Test\Lib\AppIntegrationTestCase;
 use PassboltSeleniumApi\Controller\ConfigController;

tests/TestCase/Controller/SimulateErrorsControllerTest.php

@@ -12,7 +12,7 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         2.0.0
  */
-namespace PassboltSeleniumApi\Test\TestCase\Controller\SeleniumTests;
+namespace PassboltSeleniumApi\Test\TestCase\Controller;
 
 use App\Test\Lib\AppIntegrationTestCase;
 use Cake\Core\Configure;