Merge pull request #41 from fr3nch13/2.x-dev

Cakephp 4.4 and Phpstan Level 7 updates
fr3nch13 · Nov 2, 2022 · e23edbd · e23edbd
2 parents 2b45c02 + 601c6c6
commit e23edbd
Show file tree

Hide file tree

Showing 37 changed files with 421 additions and 423 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@ docs/**/*.php
 /tests/test_app/tmp/*
 !/tests/test_app/tmp/*.gitkeep
 .phpunit.result.cache
+tests/test_app/config/.env
diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
         "mobiledetect/mobiledetectlib": "^2.8",
         "mockery/mockery": "^1.2",
         "phpcompatibility/php-compatibility": "^9.3",
-        "phpstan/phpstan": "^0.12.3",
+        "phpstan/phpstan": "^1.8",
         "phpunit/phpunit": "~8.5.0 || ^9.3",
         "psy/psysh": "@stable"
     },
@@ -63,12 +63,13 @@
             "@cs-fix",
             "@cs-check"
         ],
-        "cs-check": "vendor/bin/phpcs --colors -p -s --extensions=php ./src ./tests ./config",
-        "cs-fix": "vendor/bin/phpcbf --colors --extensions=php ./src ./tests ./config",
-        "phpstan": "phpstan analyse ./src -c phpstan.neon --level=5 --no-progress -vvv",
-        "test": "vendor/bin/phpunit --colors=always",
-        "coverage-clover": "vendor/bin/phpunit --coverage-clover=tmp/coverage.xml",
-        "coverage-text": "vendor/bin/phpunit --coverage-text --colors=never"
+        "cs-check": "php -d memory_limit=-1 ./vendor/bin/phpcs --colors -p -s --extensions=php ./src ./tests ./config",
+        "cs-fix": "php -d memory_limit=-1 ./vendor/bin/phpcbf --colors --extensions=php ./src ./tests ./config",
+        "phpstan": "php -d memory_limit=-1 ./vendor/bin/phpstan --no-progress -vvv",
+        "test": "php -d memory_limit=-1 ./vendor/bin/phpunit --colors=always",
+        "coverage": "php -d memory_limit=-1 -d xdebug.mode=coverage ./vendor/bin/phpunit --log-junit tmp/coverage/unitreport.xml --coverage-html tmp/coverage",
+        "coverage-clover": "php -d memory_limit=-1 -d xdebug.mode=coverage ./vendor/bin/phpunit --coverage-clover=tmp/coverage.xml",
+        "coverage-text": "php -d memory_limit=-1 -d xdebug.mode=coverage ./vendor/bin/phpunit --coverage-text --colors=never"
     },
     "config": {
         "sort-packages": true,