Merge branch '4.next' into 5.x

cakephp · Apr 8, 2023 · 13d39ed · 13d39ed
2 parents c5f8a27 + b75cc96
commit 13d39ed
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -50,6 +50,27 @@ jobs:
       env:
         DATABASE_TEST_URL: sqlite://./testdb.sqlite
 
-  cs-stan:
-    uses: cakephp/.github/.github/workflows/[email protected]
-    secrets: inherit
+  coding-standard:
+    name: Coding Standard & Static Analysis
+    runs-on: ubuntu-22.04
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: '8.1'
+        extensions: mbstring, intl
+        coverage: none
+        tools: cs2pr, phpstan:1.10
+
+    - name: Composer install
+      uses: ramsey/composer-install@v2
+
+    - name: Run PHP CodeSniffer
+      run: vendor/bin/phpcs --report=checkstyle src/ tests/ | cs2pr
+
+    - name: Run phpstan
+      if: always()
+      run: phpstan
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/stale@v6
+    - uses: actions/stale@v7
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'This issue is stale because it has been open for 120 days with no activity. Remove the `stale` label or comment or this will be closed in 15 days'

diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         "cakephp/cakephp-codesniffer": "^5.0",
         "cakephp/debug_kit": "5.x-dev",
         "josegonzalez/dotenv": "^3.2",
-        "phpunit/phpunit": "^9.5.19"
+        "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.",

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/src/Application.php b/src/Application.php
@@ -79,7 +79,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([
@@ -126,7 +126,6 @@ public function services(ContainerInterface $container): void
      */
     protected function bootstrapCli(): void
     {
-        $this->addOptionalPlugin('Cake/Repl');
         $this->addOptionalPlugin('Bake');
 
         $this->addPlugin('Migrations');

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<\Cake\Controller\Controller> $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/templates/Pages/home.php b/templates/Pages/home.php
@@ -206,7 +206,7 @@
                 <div class="row">
                     <div class="column links">
                         <h3>Help and Bug Reports</h3>
-                        <a target="_blank" rel="noopener" href="https://cakesf.herokuapp.com/">Slack</a>
+                        <a target="_blank" rel="noopener" href="https://slack-invite.cakephp.org/">Slack</a>
                         <a target="_blank" rel="noopener" href="https://github.com/cakephp/cakephp/issues">CakePHP Issues</a>
                         <a target="_blank" rel="noopener" href="https://discourse.cakephp.org/">CakePHP Forum</a>
                     </div>

diff --git a/templates/email/html/default.php b/templates/email/html/default.php
@@ -11,7 +11,7 @@
  * @link          https://cakephp.org CakePHP(tm) Project
  * @since         0.10.0
  * @license       https://opensource.org/licenses/mit-license.php MIT License
- * @var \App\View\AppView $this
+ * @var \Cake\View\View $this
  * @var string $content
  */
 

diff --git a/templates/email/text/default.php b/templates/email/text/default.php
@@ -11,7 +11,7 @@
  * @link          https://cakephp.org CakePHP(tm) Project
  * @since         0.10.0
  * @license       https://opensource.org/licenses/mit-license.php MIT License
- * @var \App\View\AppView $this
+ * @var \Cake\View\View $this
  * @var string $content
  */