Merge branch '4.next' into 4.x

cakephp · Oct 15, 2023 · d6d4627 · d6d4627
2 parents 1fe275f + ae21186
commit d6d4627
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -6,17 +6,17 @@
     "license": "MIT",
     "require": {
         "php": ">=7.4",
-        "cakephp/cakephp": "4.4.*",
-        "cakephp/migrations": "^3.2",
+        "cakephp/cakephp": "^4.5.0-RC1",
+        "cakephp/migrations": "^3.7",
         "cakephp/plugin-installer": "^1.3",
         "mobiledetect/mobiledetectlib": "^3.74"
     },
     "require-dev": {
-        "cakephp/bake": "^2.6",
+        "cakephp/bake": "^2.8",
         "cakephp/cakephp-codesniffer": "^4.5",
-        "cakephp/debug_kit": "^4.5",
+        "cakephp/debug_kit": "^4.9",
         "josegonzalez/dotenv": "^4.0",
-        "phpunit/phpunit": "~8.5.0 || ^9.3"
+        "phpunit/phpunit": "^9.6"
     },
     "suggest": {
         "markstory/asset_compress": "An asset compression plugin which provides file concatenation and a flexible filter system for preprocessing and minification.",
@@ -46,6 +46,7 @@
         "cs-fix": "phpcbf --colors -p",
         "test": "phpunit --colors=always"
     },
+    "minimum-stability": "dev",
     "prefer-stable": true,
     "config": {
         "sort-packages": true,

diff --git a/config/app_local.example.php b/config/app_local.example.php
@@ -70,7 +70,7 @@
             'password' => 'secret',
             'database' => 'test_myapp',
             //'schema' => 'myapp',
-            'url' => env('DATABASE_TEST_URL', 'sqlite://127.0.0.1/tests.sqlite'),
+            'url' => env('DATABASE_TEST_URL', 'sqlite://127.0.0.1/tmp/tests.sqlite'),
         ],
     ],
 

diff --git a/config/bootstrap.php b/config/bootstrap.php
@@ -221,3 +221,9 @@
 //Inflector::rules('plural', ['/^(inflect)or$/i' => '\1ables']);
 //Inflector::rules('irregular', ['red' => 'redlings']);
 //Inflector::rules('uninflected', ['dontinflectme']);
+
+// set a custom date and time format
+// see https://book.cakephp.org/4/en/core-libraries/time.html#setting-the-default-locale-and-format-string
+// and https://unicode-org.github.io/icu/userguide/format_parse/datetime/#datetime-format-syntax
+//\Cake\I18n\FrozenDate::setToStringFormat('dd.MM.yyyy');
+//\Cake\I18n\FrozenTime::setToStringFormat('dd.MM.yyyy HH:mm');
diff --git a/src/Application.php b/src/Application.php
@@ -77,7 +77,7 @@ public function middleware(MiddlewareQueue $middlewareQueue): MiddlewareQueue
         $middlewareQueue
             // Catch any exceptions in the lower layers,
             // and make an error page/response
-            ->add(new ErrorHandlerMiddleware(Configure::read('Error')))
+            ->add(new ErrorHandlerMiddleware(Configure::read('Error'), $this))
 
             // Handle plugin/theme assets like CakePHP normally does.
             ->add(new AssetMiddleware([

diff --git a/src/Controller/ErrorController.php b/src/Controller/ErrorController.php
@@ -38,7 +38,7 @@ public function initialize(): void
     /**
      * beforeFilter callback.
      *
-     * @param \Cake\Event\EventInterface $event Event.
+     * @param \Cake\Event\EventInterface<\App\Controller\ErrorController> $event Event.
      * @return \Cake\Http\Response|null|void
      */
     public function beforeFilter(EventInterface $event)
@@ -48,7 +48,7 @@ public function beforeFilter(EventInterface $event)
     /**
      * beforeRender callback.
      *
-     * @param \Cake\Event\EventInterface $event Event.
+     * @param \Cake\Event\EventInterface<\App\Controller\ErrorController> $event Event.
      * @return \Cake\Http\Response|null|void
      */
     public function beforeRender(EventInterface $event)
@@ -61,7 +61,7 @@ public function beforeRender(EventInterface $event)
     /**
      * afterFilter callback.
      *
-     * @param \Cake\Event\EventInterface $event Event.
+     * @param \Cake\Event\EventInterface<\App\Controller\ErrorController> $event Event.
      * @return \Cake\Http\Response|null|void
      */
     public function afterFilter(EventInterface $event)

diff --git a/webroot/css/cake.css b/webroot/css/cake.css
@@ -67,6 +67,9 @@ body {
     font-weight: bold;
     padding: 0 0.4rem;
 }
+.actions a:first-child {
+    padding-left: 0;
+}
 th {
     white-space: nowrap;
 }