Merge pull request #111 from TheDragonCode/3.x

Move `ext-xdiff` from required to suggestion block
TheDragonCode · Jun 2, 2023 · b23c59e · b23c59e
2 parents 2167dbe + 255a736
commit b23c59e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/code-style.yml b/.github/workflows/code-style.yml
@@ -30,7 +30,7 @@ jobs:
                 uses: actions/checkout@v3
 
             -   name: Checking PHP Syntax
-                uses: TheDragonCode/codestyler@v2
+                uses: TheDragonCode/codestyler@v3
 
     fix:
         if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
@@ -42,7 +42,7 @@ jobs:
                 uses: actions/checkout@v3
 
             -   name: Checking PHP Syntax
-                uses: TheDragonCode/codestyler@v2
+                uses: TheDragonCode/codestyler@v3
                 with:
                     github_token: ${{ secrets.COMPOSER_TOKEN }}
                     fix: true
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -27,7 +27,7 @@ jobs:
                     coverage: xdebug
 
             -   name: Install dependencies
-                run: composer update --prefer-stable --prefer-dist --no-progress --no-interaction --ignore-platform-req=ext-xdiff
+                run: composer update --prefer-stable --prefer-dist --no-progress --no-interaction
 
             -   name: Execute tests
                 run: sudo vendor/bin/phpunit --colors=always
diff --git a/Dockerfile b/Dockerfile
@@ -8,7 +8,7 @@ ARG INPUT_EDITORCONFIG
 ARG INPUT_DEPENDABOT
 ARG INPUT_NORMALIZE
 
-RUN composer global require dragon-code/codestyler:^3.0 --ignore-platform-req=ext-xdiff
+RUN composer global require dragon-code/codestyler:^3.0
 
 COPY shell /shell
 COPY entrypoint.sh /entrypoint.sh

diff --git a/composer.json b/composer.json
@@ -31,7 +31,6 @@
     "require": {
         "php": "^8.1",
         "ext-json": "*",
-        "ext-xdiff": "*",
         "dragon-code/pretty-array": "^4.1",
         "dragon-code/support": "^6.11.2",
         "laravel/pint": "^1.10",
@@ -42,6 +41,9 @@
     "require-dev": {
         "phpunit/phpunit": "^9.6.8"
     },
+    "suggest": {
+        "ext-xdiff": "Install PHP extension to show diff in JSON files"
+    },
     "minimum-stability": "stable",
     "autoload": {
         "psr-4": {