Enhancement: Require ergebnis/php-cs-fixer-config

ergebnis · Feb 9, 2023 · db5074a · db5074a
1 parent 7847575
commit db5074a
Show file tree

Hide file tree

Showing 7 changed files with 1,004 additions and 1,183 deletions.
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -95,7 +95,6 @@ jobs:
           coverage: "none"
           extensions: "none, ctype, dom, json, mbstring, phar, simplexml, tokenizer, xml, xmlwriter"
           php-version: "${{ matrix.php-version }}"
-          tools: "phive"
 
       - name: "Set up problem matchers for PHP"
         run: "echo \"::add-matcher::${{ runner.tool_cache }}/php.json\""
@@ -133,13 +132,8 @@ jobs:
             php-${{ matrix.php-version }}-php-cs-fixer-main
             php-${{ matrix.php-version }}-php-cs-fixer-
 
-      - name: "Install dependencies with phive"
-        uses: "ergebnis/.github/actions/phive/install@1.8.0"
-        with:
-          trust-gpg-keys: "0x033E5F8D801A2F8D,0xE82B2FB314E9906E"
-
       - name: "Run friendsofphp/php-cs-fixer"
-        run: ".phive/php-cs-fixer fix --ansi --config=.php-cs-fixer.php --diff --dry-run --verbose"
+        run: "vendor/bin/php-cs-fixer fix --ansi --config=.php-cs-fixer.php --diff --dry-run --verbose"
 
   dependency-analysis:
     name: "Dependency Analysis"
@@ -187,7 +181,7 @@ jobs:
       - name: "Install dependencies with phive"
         uses: "ergebnis/.github/actions/phive/install@1.8.0"
         with:
-          trust-gpg-keys: "0x033E5F8D801A2F8D,0xE82B2FB314E9906E"
+          trust-gpg-keys: "0x033E5F8D801A2F8D"
 
       - name: "Run maglnet/composer-require-checker"
         run: ".phive/composer-require-checker check --config-file=$(pwd)/composer-require-checker.json"

diff --git a/.github/workflows/renew.yaml b/.github/workflows/renew.yaml
@@ -32,7 +32,6 @@ jobs:
           coverage: "none"
           extensions: "none, ctype, dom, json, mbstring, phar, simplexml, tokenizer, xml, xmlwriter"
           php-version: "${{ matrix.php-version }}"
-          tools: "phive"
 
       - name: "Set up problem matchers for PHP"
         run: "echo \"::add-matcher::${{ runner.tool_cache }}/php.json\""
@@ -67,13 +66,8 @@ jobs:
             php-${{ matrix.php-version }}-php-cs-fixer-main
             php-${{ matrix.php-version }}-php-cs-fixer-
 
-      - name: "Install dependencies with phive"
-        uses: "ergebnis/.github/actions/phive/install@1.8.0"
-        with:
-          trust-gpg-keys: "0x033E5F8D801A2F8D,0xE82B2FB314E9906E"
-
       - name: "Run friendsofphp/php-cs-fixer"
-        run: ".phive/php-cs-fixer fix --ansi --config=.php-cs-fixer.php --diff --verbose"
+        run: "vendor/bin/php-cs-fixer fix --ansi --config=.php-cs-fixer.php --diff --verbose"
 
       - name: "Commit modified files"
         uses: "stefanzweifel/git-auto-commit-action@v4.16.0"

diff --git a/.phive/phars.xml b/.phive/phars.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
   <phar name="composer-require-checker" version="^4.5.0" installed="4.5.0" location="./.phive/composer-require-checker" copy="false"/>
-  <phar name="php-cs-fixer" version="^3.14.3" installed="3.14.3" location="./.phive/php-cs-fixer" copy="false"/>
 </phive>