Updates for phpunit 10

FriendsOfCake · Jul 17, 2023 · 44e0c53 · 44e0c53
1 parent 44ed173
commit 44e0c53
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
         php-version: '8.1'
         extensions: mbstring, intl
         coverage: none
-        tools: vimeo/psalm:5, phpstan:1.9, cs2pr
+        tools: vimeo/psalm:5, phpstan:1.10, cs2pr
 
     - name: Composer Install
       run: composer require --dev cakephp/cakephp-codesniffer:^5.0

diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ vendor/
 composer.lock
 tmp
 .phpunit.result.cache
+.phpunit.cache
diff --git a/composer.json b/composer.json
@@ -36,7 +36,7 @@
     "require-dev": {
         "friendsofcake/cakephp-test-utilities": "dev-cake-5.x",
         "markstory/asset_compress": "5.x-dev",
-        "phpunit/phpunit": "^9.5.19"
+        "phpunit/phpunit": "^10.1"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,27 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-    colors="true"
-    processIsolation="false"
-    stopOnFailure="false"
-    bootstrap="./tests/bootstrap.php"
-    >
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" processIsolation="false" stopOnFailure="false" bootstrap="./tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.2/phpunit.xsd" cacheDirectory=".phpunit.cache">
     <testsuites>
         <testsuite name="CrudView Tests">
             <directory>./tests/TestCase</directory>
         </testsuite>
     </testsuites>
-
     <extensions>
-        <extension class="Cake\TestSuite\Fixture\PHPUnitExtension"/>
+        <bootstrap class="Cake\TestSuite\Fixture\Extension\PHPUnitExtension"/>
     </extensions>
-
-    <coverage>
-        <include>
-            <directory suffix=".php">src/</directory>
-        </include>
-    </coverage>
-
     <php>
         <!-- <env name="FIXTURE_SCHEMA_METADATA" value="./tests/schema.php"/> -->
     </php>
+    <source>
+        <include>
+            <directory suffix=".php">src/</directory>
+        </include>
+    </source>
 </phpunit>
diff --git a/src/Action/DashboardAction.php b/src/Action/DashboardAction.php
@@ -6,6 +6,7 @@
 use Crud\Action\BaseAction;
 use Crud\Traits\ViewTrait;
 use CrudView\Dashboard\Dashboard;
+use function Cake\I18n\__d;
 
 class DashboardAction extends BaseAction
 {

diff --git a/src/Dashboard/Dashboard.php b/src/Dashboard/Dashboard.php
@@ -6,6 +6,7 @@
 use Cake\Datasource\EntityTrait;
 use Cake\View\Cell;
 use InvalidArgumentException;
+use function Cake\I18n\__d;
 
 class Dashboard
 {

diff --git a/src/Listener/Traits/FormTypeTrait.php b/src/Listener/Traits/FormTypeTrait.php
@@ -6,6 +6,7 @@
 use Cake\Controller\Controller;
 use Crud\Action\BaseAction;
 use Crud\Action\EditAction;
+use function Cake\I18n\__d;
 
 trait FormTypeTrait
 {

diff --git a/src/Listener/ViewListener.php b/src/Listener/ViewListener.php
@@ -15,6 +15,7 @@
 use CrudView\Listener\Traits\SiteTitleTrait;
 use CrudView\Listener\Traits\UtilityNavigationTrait;
 use CrudView\Traits\CrudViewConfigTrait;
+use function Cake\I18n\__d;
 
 class ViewListener extends BaseListener
 {

diff --git a/src/View/Helper/CrudViewHelper.php b/src/View/Helper/CrudViewHelper.php
@@ -9,6 +9,7 @@
 use Cake\Utility\Text;
 use Cake\View\Helper;
 use Cake\View\Helper\FormHelper;
+use function Cake\I18n\__d;
 
 /**
  * @property \BootstrapUI\View\Helper\FormHelper $Form

diff --git a/tests/TestCase/Dashboard/DashboardTest.php b/tests/TestCase/Dashboard/DashboardTest.php
@@ -9,6 +9,7 @@
 use CrudView\Dashboard\Dashboard;
 use CrudView\View\Cell\DashboardTableCell;
 use InvalidArgumentException;
+use function Cake\I18n\__d;
 
 /**
  * DashboardTest class

diff --git a/tests/TestCase/View/Widget/DateTimeWidgetTest.php b/tests/TestCase/View/Widget/DateTimeWidgetTest.php
@@ -55,7 +55,7 @@ public function testRenderSimple($compareFileName, $data)
      *
      * @return array
      */
-    public function renderProvider()
+    public static function renderProvider()
     {
         return [
             [