Merge pull request #10 from codenamephp/update/phpunit10

PHPUnit10

Author: bastianschwarz

.idea/deployer.command.iml

@@ -35,12 +35,14 @@
     "sort-packages": true
   },
   "scripts": {
+    "phive-update": "XDEBUG_MODE=off phive update && git add tools/* phive.xml && git commit -m 'Updated phive dependencies'",
     "phpunit": "XDEBUG_MODE=coverage tools/phpunit.phar -c test/phpunit.dist.xml test/",
     "psalm": "XDEBUG_MODE=off tools/psalm --threads=10 --long-progress",
     "composer-unused": "XDEBUG_MODE=off tools/composer-unused --no-progress --no-interaction",
     "composer-require-checker": "XDEBUG_MODE=off tools/composer-require-checker --no-interaction",
     "infection": "XDEBUG_MODE=coverage tools/infection --min-msi=100 --min-covered-msi=100 --threads=4 --no-progress --show-mutations",
     "ci-all": [
+      "composer validate",
       "@phpunit",
       "@psalm",
       "@composer-unused",
@@ -49,6 +51,7 @@
     ]
   },
   "scripts-descriptions": {
+    "phive-update": "Runs a phive update and commits all tools and the phive.xml so PHPStorm won't run code formatting on the phars",
     "phpunit": "Runs phpunit tests",
     "psalm": "Runs psalm static analysis",
     "composer-unused": "Checks for unused composer packages",

.idea/php.xml

@@ -2,7 +2,7 @@ version: '3.6'
 
 services:
   application:
-    user: "${UID}:${GID}" #don't run as root by default to prevent permission conflicts
+    user: "${UID:-1000}:${GID:-1000}" #don't run as root by default to prevent permission conflicts
     build:
       context: docker/application
       args:
@@ -12,6 +12,7 @@ services:
       - ./:/app
       - $HOME/.phive:/home/application/.phive
       - $HOME/.ssh:/home/application/.ssh
+      - $HOME/.gitconfig:/home/application/.gitconfig
       - ${SSH_AUTH_SOCK:-/ssh-agent}:/ssh-agent # Forward local machine SSH key to docker
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro

composer.json

@@ -15,9 +15,9 @@
   ~   limitations under the License.
   -->
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpunit" version="^9.0.1" installed="9.5.21" location="./tools/phpunit.phar" copy="true"/>
-  <phar name="psalm" version="^4.0" installed="4.25.0" location="./tools/psalm" copy="true"/>
-  <phar name="composer-unused" version="^0.8" installed="0.8.2" location="./tools/composer-unused" copy="true"/>
-  <phar name="composer-require-checker" version="^4.0" installed="4.1.0" location="./tools/composer-require-checker" copy="true"/>
-  <phar name="infection" version="^0.26" installed="0.26.13" location="./tools/infection" copy="true"/>
+  <phar name="phpunit" version="^10.0" installed="10.0.15" location="./tools/phpunit.phar" copy="true"/>
+  <phar name="psalm" version="^5.8" installed="5.8.0" location="./tools/psalm" copy="true"/>
+  <phar name="composer-unused" version="^0.8" installed="0.8.6" location="./tools/composer-unused" copy="true"/>
+  <phar name="composer-require-checker" version="^4.0" installed="4.5.0" location="./tools/composer-require-checker" copy="true"/>
+  <phar name="infection" version="^0.26" installed="0.26.19" location="./tools/infection" copy="true"/>
 </phive>

deployer.phar

@@ -15,8 +15,12 @@
   ~ limitations under the License.
   ~
   -->
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" bootstrap="./../vendor/autoload.php"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
+         colors="true"
+         bootstrap="./../vendor/autoload.php"
+         cacheDirectory="../.cache/phpunit"
+>
   <coverage>
     <include>
       <directory suffix=".php">./../src</directory>