Removed tools from repository, updated phpunit

aeon-php · Aug 12, 2020 · ba41937 · ba41937
1 parent 10ffe48
commit ba41937
Show file tree

Hide file tree

Showing 11 changed files with 105 additions and 25 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -7,8 +7,6 @@
 /.gitattributes export-ignore
 /.gitignore export-ignore
 /.php_cs export-ignore
-/tools export-ignore
-/tools/* binary
 /.phive export-ignore
 /psalm.xml export-ignore
 /phpstan.neon export-ignore

diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml
@@ -30,7 +30,8 @@ jobs:
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          coverage: "pcov"
+          coverage: pcov
+          tools: phive, composer:v2
           php-version: "${{ matrix.php-version }}"
           ini-values: memory_limit=-1
 
@@ -55,6 +56,9 @@ jobs:
         if: ${{ matrix.dependencies == 'locked' }}
         run: "composer install --no-interaction --no-progress --no-suggest"
 
+      - name: "Install tools"
+        run: "phive install --trust-gpg-keys E82B2FB314E9906E,C5095986493B4AA0,CF1A108D0E7AE720,8A03EA3B385DBAA1"
+
       - name: "Mutation Tests"
         run: "composer test:mutation"
         env:

diff --git a/.github/workflows/static-analyze.yml b/.github/workflows/static-analyze.yml
@@ -30,7 +30,8 @@ jobs:
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          coverage: "pcov"
+          coverage: pcov
+          tools: phive, composer:v2
           php-version: "${{ matrix.php-version }}"
           ini-values: memory_limit=-1
 
@@ -55,5 +56,8 @@ jobs:
         if: ${{ matrix.dependencies == 'locked' }}
         run: "composer install --no-interaction --no-progress --no-suggest"
 
+      - name: "Install tools"
+        run: "phive install --trust-gpg-keys E82B2FB314E9906E,C5095986493B4AA0,CF1A108D0E7AE720,8A03EA3B385DBAA1"
+
       - name: "Static Analyze"
         run: "composer static:analyze"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -33,7 +33,8 @@ jobs:
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          coverage: "pcov"
+          coverage: pcov
+          tools: composer:v2
           php-version: "${{ matrix.php-version }}"
           ini-values: memory_limit=-1
 

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 vendor
+tools
 *.cache
 var
diff --git a/composer.lock b/composer.lock
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/schema/9.3.xsd"
+         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/schema/9.2.xsd"
          colors="true"
          bootstrap="vendor/autoload.php"
          cacheResultFile="var/phpunit/.result.cache"
 >
-    <coverage>
-        <report>
-            <html outputDirectory="var/phpunit/coverage/html" lowUpperBound="95" highLowerBound="100" />
-        </report>
-        <include>
+    <logging>
+        <log type="coverage-html" target="var/phpunit/coverage/html" lowUpperBound="95" highLowerBound="100"/>
+    </logging>
+    <filter>
+        <whitelist>
             <directory suffix=".php">src</directory>
-        </include>
-    </coverage>
+        </whitelist>
+    </filter>
 
     <testsuites>
         <testsuite name="unit">

diff --git a/tools/infection b/tools/infection
diff --git a/tools/php-cs-fixer b/tools/php-cs-fixer
diff --git a/tools/phpstan b/tools/phpstan
diff --git a/tools/psalm b/tools/psalm
-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
     vendor
+    tools
     *.cache
     var