Skip to content

Commit b1898f9

Browse files
committed
Move ext-json to require section in composer.json
1 parent 298632e commit b1898f9

File tree

4 files changed

+17
-18
lines changed

4 files changed

+17
-18
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,15 @@ jobs:
2222
uses: shivammathur/setup-php@v2
2323
with:
2424
coverage: none
25-
extensions: mbstring
2625
php-version: 7.4
2726

2827
- name: "Validate composer.json and composer.lock"
2928
run: composer validate --strict
3029

31-
- name: "Install locked dependencies with composer"
30+
- name: "Install dependencies with composer"
3231
run: composer install --no-interaction --no-progress
3332

34-
- name: "Run localheinz/composer-normalize"
33+
- name: "Normalize composer.json"
3534
run: composer normalize --dry-run
3635

3736
static-code-analysis:
@@ -47,14 +46,13 @@ jobs:
4746
uses: shivammathur/setup-php@v2
4847
with:
4948
coverage: none
50-
extensions: mbstring
5149
php-version: 7.4
5250

53-
- name: "Install locked dependencies with composer"
51+
- name: "Install dependencies with composer"
5452
run: composer install --no-interaction --no-progress
5553

56-
- name: "Run phpstan"
57-
run: vendor/bin/phpstan analyse --configuration=phpstan.neon
54+
- name: "Run static analysis with phpstan"
55+
run: vendor/bin/phpstan
5856

5957
tests:
6058
name: Test for PHP ${{ matrix.php-version }} (${{ matrix.dependencies }})
@@ -81,13 +79,12 @@ jobs:
8179
uses: shivammathur/setup-php@v2
8280
with:
8381
coverage: none
84-
extensions: mbstring
8582
php-version: ${{ matrix.php-version }}
8683

8784
- name: "Install dependencies with composer"
8885
run: composer update --${{ matrix.dependencies }} --no-interaction --no-progress
8986

90-
- name: "Run unit tests with phpunit/phpunit"
87+
- name: "Run unit tests with phpunit"
9188
run: vendor/bin/phpunit
9289

9390
code-coverage:
@@ -103,17 +100,13 @@ jobs:
103100
uses: shivammathur/setup-php@v2
104101
with:
105102
coverage: pcov
106-
extensions: mbstring
107103
php-version: 7.4
108104

109-
- name: "Install locked dependencies with composer"
105+
- name: "Install dependencies with composer"
110106
run: composer install --no-interaction --no-progress
111107

112-
- name: "Dump Xdebug filter with phpunit/phpunit"
113-
run: vendor/bin/phpunit --dump-xdebug-filter=.build/phpunit/xdebug-filter.php
114-
115-
- name: "Collect code coverage with Xdebug and phpunit/phpunit"
116-
run: vendor/bin/phpunit --coverage-clover=.build/logs/clover.xml --prepend=.build/phpunit/xdebug-filter.php
108+
- name: "Collect code coverage"
109+
run: vendor/bin/phpunit --coverage-clover=coverage.xml
117110

118111
- name: "Send code coverage report to codecov.io"
119112
env:

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## Unreleased
99

10+
## 4.1.1
11+
12+
### Fixed
13+
14+
- Move `ext-json` to `require` section in `composer.json`
15+
1016
## 4.1.0
1117

1218
### Changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ it: stan test normalize
33

44
.PHONY: help
55
help: ## Displays this list of targets with descriptions
6-
@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[32m%-30s\033[0m %s\n", $$1, $$2}'
6+
@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(firstword $(MAKEFILE_LIST)) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[32m%-30s\033[0m %s\n", $$1, $$2}'
77

88
.PHONY: setup
99
setup: vendor ## Set up the project

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
],
1616
"require": {
1717
"php": "^7.2 || ^8.0",
18+
"ext-json": "*",
1819
"egulias/email-validator": "^2.1.17",
1920
"spatie/regex": "^1.4.1",
2021
"thecodingmachine/safe": "^1.0.3",
2122
"webonyx/graphql-php": "^0.13.8 || ^14"
2223
},
2324
"require-dev": {
24-
"ext-json": "*",
2525
"ergebnis/composer-normalize": "^2.13",
2626
"phpstan/phpstan": "~0.12.31",
2727
"phpunit/phpunit": "^8.5",

0 commit comments

Comments
 (0)