Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move ext-xdiff from required to suggestion block #111

Merged
merged 1 commit into from
Jun 2, 2023
Merged

Move ext-xdiff from required to suggestion block #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/code-style.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
Expand All @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/phpunit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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": {
Expand Down