Mise en conformité de config/app.default.php avec norme CAKEPHP 3.10

=> (A) *** CHAQUE LABO doit mettre à jour son config/app.php en fonction du nouveau config/app.default.php *** v5.5.1-3.10.1

Mise en conformité de config/app.default.php avec norme CAKEPHP 3.10
=> (A) *** CHAQUE LABO doit mettre à jour son config/app.php en fonction du nouveau config/app.default.php *** v5.5.1-3.10.1
Etienne Pallier
1 parent 3219dd51
Showing 6 changed files with 123 additions and 48 deletions Show diff stats
.gitignore
CHANGELOG
README.md
config/app.default.php
src/View/AjaxView.php
src/View/AppView.php
@@ -38,7 +38,7 @@
 .mysql_history
-src/Application.php.OLD
+/src/Application.php.OLD
 # OS generated files #
 ######################
@@ -93,25 +93,25 @@ nbproject/*
 # Fichiers lies a Composer
 # On ne versionne QUE composer.json
-composer.json.*
-!composer.json.commented
+/composer.json.*
+!/composer.json.commented
 # On ne versionne NI composer.lock NI aucune copie de ce fichier 
-composer.lock
-#composer.lock.*
-composer.lock*
+/composer.lock
+#/composer.lock.*
+/composer.lock*
 #old/
 # webroot/
 # - liens (ou dossiers) auto-installed par cakephp avec "bin/cake plugin assets symlink"
-webroot/debug_kit
-webroot/dompdf
-webroot/bootstrap_u_i
+/webroot/debug_kit
+/webroot/dompdf
+/webroot/bootstrap_u_i
 # - Autres sous-dossiers a ignorer
 #webroot.*
-webroot/test
+/webroot/test
 # Autres dossiers
-MODIFS_DE_VENDOR/*
+/MODIFS_DE_VENDOR/*
 # Ne pas ignorer les fichier "empty"
@@ -484,6 +484,11 @@ rien ?
 ======= CHANGES =======
 -------
+03/12/2021	v5.5.1-3.10.1
+	- (i) Mise en conformité de config/app.default.php avec la nouvelle norme CAKEPHP 3.10
+	=> (A) *** CHAQUE LABO doit mettre à jour son config/app.php en fonction du nouveau config/app.default.php *** 
+
+-------
 02/12/2021	v5.5.0-3.10.1
 	- (e) Evolution du framework CakePhp de v3.7 (mal configuré) à v3.10 (proprement configuré) !!!
 	- (i) Beaucoup de modifs pour adapter le logiciel à la nouvelle version du framework
@@ -52,8 +52,8 @@ Logiciel testé et validé sur les configurations suivantes :
 --------------------------------------------------------------------------------------------
-Date: 02/12/2021	
-Version: v5.5.0-3.10.1
+Date: 03/12/2021	
+Version: v5.5.1-3.10.1
 HISTORIQUE DES CHANGEMENTS DE VERSION : voir le fichier CHANGES.txt (ou la page web /pages/changes)
 <?php
-// (EP202102) Mis à la norme CAKEPHP3.7
+// (EP2021-12) Mis à la norme CAKEPHP3.10
+
+
+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;
+
 return [
     /**
      * Debug Level:
      *
-     * - Production Mode:
+     * Production Mode:
      * false: No error messages, errors, or warnings shown.
      *
-     * - Development Mode:
+     * Development Mode:
      * true: Errors and warnings shown.
      */
     // (EP) Permet aussi que DebugKit soit activé
@@ -77,7 +86,7 @@ return [
      *   You should treat it as extremely sensitive data.
      */
     'Security' => [
-        //'salt' => env('SECURITY_SALT', '__SALT__'),        
+        //'salt' => env('SECURITY_SALT', '96de0165eccc596056b9dcd608f7f45888ab9154abf32bdd1a8087e640478028'),        
         'salt' => env('SECURITY_SALT', '597495ab489fda98efb7fc70db7606b2a9b556dbce9ea96c1f0833b091e71afe'),
     ],
@@ -102,7 +111,9 @@ return [
             // AVANT
             //'className' => 'File',
             // CAKEPHP 3.7
-            'className' => 'Cake\Cache\Engine\FileEngine',
+            //'className' => 'Cake\Cache\Engine\FileEngine',
+            // CAKEPHP 3.10
+            'className' => FileEngine::class,
             'path' => CACHE,
             'url' => env('CACHE_DEFAULT_URL', null),
         ],
@@ -117,7 +128,9 @@ return [
             // AVANT
             //'className' => 'File',
             // CAKE3.7
-            'className' => 'Cake\Cache\Engine\FileEngine',
+            //'className' => 'Cake\Cache\Engine\FileEngine',
+            // CAKE3.7
+            'className' => FileEngine::class,
             'prefix' => 'myapp_cake_core_',
             'path' => CACHE . 'persistent/',
             'serialize' => true,
@@ -135,7 +148,10 @@ return [
          * Duration will be set to '+2 minutes' in bootstrap.php when debug = true
          */
         '_cake_model_' => [
-            'className' => 'Cake\Cache\Engine\FileEngine',
+            // 3.7
+            //'className' => 'Cake\Cache\Engine\FileEngine',
+            // 3.10
+            'className' => FileEngine::class,
             //'className' => 'File',
             'prefix' => 'myapp_cake_model_',
             'path' => CACHE . 'models/',
@@ -152,7 +168,10 @@ return [
          * Duration will be set to '+2 seconds' in bootstrap.php when debug = true
          */
         '_cake_routes_' => [
-            'className' => 'Cake\Cache\Engine\FileEngine',
+            // 3.7
+            //'className' => 'Cake\Cache\Engine\FileEngine',
+            // 3.10
+            'className' => FileEngine::class,
             'prefix' => 'myapp_cake_routes_',
             'path' => CACHE,
             'serialize' => true,
@@ -201,8 +220,11 @@ return [
         // - Pour branche master : Sans les deprecated ni les Warnings
         'errorLevel' => E_ALL & ~E_USER_DEPRECATED & ~E_DEPRECATED & ~E_WARNING,
-        
-        'exceptionRenderer' => 'Cake\Error\ExceptionRenderer',
+		
+        // 3.7
+        //'exceptionRenderer' => 'Cake\Error\ExceptionRenderer',
+        // 3.10
+        'exceptionRenderer' => ExceptionRenderer::class,
         'skipLog' => [],
         'log' => true,
         'trace' => true,
@@ -230,24 +252,37 @@ return [
     'EmailTransport' => [
         'default' => [
             // CAKE3.7
-            'className' => 'Cake\Mailer\Transport\MailTransport',
+            //'className' => 'Cake\Mailer\Transport\MailTransport',
+            // 3.10
+            'className' => MailTransport::class,
             // AVANT
             //'className' => 'Mail',
             /*
-             * The following keys are used in SMTP transports:
+             * The keys host, port, timeout, username, password, client and tls
+             * are used in SMTP transports
              */
             'host' => 'localhost',
             'port' => 25,
             'timeout' => 30,
+            
+            /*
+             * It is recommended to set these options through your environment or app_local.php
+             */
             // CAKE3.7
             //'username' => null,
             //'password' => null,
             'username' => 'user',
             'password' => 'secret',
+            
             'client' => null,
-            'tls' => null,
+            // 3.7
+            //'tls' => null,
+            // 3.10
+            'tls' => false,
             'url' => env('EMAIL_TRANSPORT_DEFAULT_URL', null),
         ],
+        
+        // (EP) ajouté pour dev send mail
     	'dev' => [
     			'className' => 'Smtp',
     			'host' => 'ssl://smtp.gmail.com',
@@ -278,6 +313,9 @@ return [
         'default' => [
             'transport' => 'default',
             'from' => 'you@localhost',
+            /*
+             * Will by default be set to config value of App.encoding, if that exists otherwise to UTF-8.
+             */
             //'charset' => 'utf-8',
             //'headerCharset' => 'utf-8',
         ],
@@ -298,8 +336,14 @@ return [
      */
     'Datasources' => [
         'default' => [
-            'className' => 'Cake\Database\Connection',
-            'driver' => 'Cake\Database\Driver\Mysql',
+            // 3.7
+            //'className' => 'Cake\Database\Connection',
+            // 3.10
+            'className' => Connection::class,
+            // 3.7
+            //'driver' => 'Cake\Database\Driver\Mysql',
+            // 3.10
+            'driver' => Mysql::class,
             'persistent' => false,
             /*d*/'host' => 'localhost',
             /*
@@ -308,7 +352,10 @@ return [
              * the following line and set the port accordingly
              */
             //'port' => 'non_standard_port_number',
-           	/*d*/'username' => 'db_username',
+            /*
+             * It is recommended to set these options through your environment or app_local.php
+             */
+            /*d*/'username' => 'db_username',
             /*d*/'password' => 'db_password',
             /*d*/'database' => 'database',
             /*
@@ -348,8 +395,14 @@ return [
          * The test connection is used during the test suite.
          */
         'test' => [
-            'className' => 'Cake\Database\Connection',
-            'driver' => 'Cake\Database\Driver\Mysql',
+            
+            // 3.7
+            //'className' => 'Cake\Database\Connection',
+            //'driver' => 'Cake\Database\Driver\Mysql',
+            // 3.10
+            'className' => Connection::class,
+            'driver' => Mysql::class,
+            
             'persistent' => false,
             /*t*/'host' => 'localhost',
             //'port' => 'non_standard_port_number',
@@ -364,7 +417,7 @@ return [
             'quoteIdentifiers' => false,
             'log' => false,
             //'init' => ['SET GLOBAL innodb_stats_on_metadata = 0'],
-            'url' => env('DATABASE_TEST_URL', null),
+            //'url' => env('DATABASE_TEST_URL', null),
         ],
     ],
@@ -373,7 +426,10 @@ return [
      */
     'Log' => [
         'debug' => [
-            'className' => 'Cake\Log\Engine\FileLog',
+            // 3.7
+            //'className' => 'Cake\Log\Engine\FileLog',
+            // 3.10
+            'className' => FileLog::class,
             'path' => LOGS,
             'file' => 'debug',
             'url' => env('LOG_DEBUG_URL', null),
@@ -382,7 +438,10 @@ return [
             'scopes' => false,
         ],
         'error' => [
-            'className' => 'Cake\Log\Engine\FileLog',
+            // 3.7
+            //'className' => 'Cake\Log\Engine\FileLog',
+            // 3.10
+            'className' => FileLog::class,
             'path' => LOGS,
             'file' => 'error',
             'url' => env('LOG_ERROR_URL', null),
@@ -393,7 +452,10 @@ return [
         // NEW IN CAKE3.7
         // To enable this dedicated query log, you need set your datasource's log flag to true
         'queries' => [
-            'className' => 'Cake\Log\Engine\FileLog',
+            // 3.7
+            //'className' => 'Cake\Log\Engine\FileLog',
+            // 3.10
+            'className' => FileLog::class,
             'path' => LOGS,
             'file' => 'queries',
             'url' => env('LOG_QUERIES_URL', null),
@@ -447,7 +509,7 @@ return [
         // Pour changer le timeout de session (en minutes)
         // Voir un bon exemple de comment gérer l'event timeout ici :
         // https://stackoverflow.com/questions/32298817/how-to-prevent-cakephp-3-0-from-extending-session-timeout-with-ajax-requests
-        'timeout' => 5, // mn
+        'timeout' => 15, // mn
         /* Pour changer le timeout de cookie (en secondes)
          *
 <?php
 /**
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @since         3.0.4
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 namespace App\View;
+// NEW in CAKEPHP3.10
+use Cake\Event\EventManager;
+use Cake\Http\Response;
+use Cake\Http\ServerRequest;
+
 /**
  * A view class that is used for AJAX responses.
  * Currently only switches the default layout and sets the response type -
@@ -24,9 +29,8 @@ class AjaxView extends AppView
     /**
      * The name of the layout file to render the view inside of.
-     * The name
-     * specified is the filename of the layout in /src/Template/Layout without
-     * the .ctp extension.
+     * The name specified is the filename of the layout in /src/Template/Layout 
+	 * without the .ctp extension.
      *
      * @var string
      */
@@ -42,6 +46,10 @@ class AjaxView extends AppView
         parent::initialize();
         //$this->response->type('ajax');
-        $this->response->withType('ajax');
+        // 3.7
+        //$this->response->withType('ajax');
+        // 3.10
+        $this->response = $this->response->withType('ajax');
+        
     }
 }
@@ -7,9 +7,9 @@
  * Redistributions of files must retain the above copyright notice.
  *
  * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link      http://cakephp.org CakePHP(tm) Project
+ * @link      https://cakephp.org CakePHP(tm) Project
  * @since     3.0.0
- * @license   http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license   http://opensource.org/licenses/mit-license.php MIT License
  */
 namespace App\View;
@@ -30,7 +30,7 @@ use BootstrapUI\View\UIView;
  *
  * Your application’s default view class
  *
- * @link http://book.cakephp.org/3.0/en/views.html#the-app-view
+ * @link https://book.cakephp.org/3/en/views.html#the-app-view
  */
 // Modified for bootstrap-ui (EP 28/1/20)
 //class AppView extends UIView