Skip to content

Commit 7ba77f2

Browse files
authored
Merge branch 'master' into patch-1
2 parents 2aecd52 + fde36f6 commit 7ba77f2

File tree

5 files changed

+287
-155
lines changed

5 files changed

+287
-155
lines changed

.github/workflows/php.yml

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,19 @@ jobs:
1414
matrix:
1515
os: [ubuntu-latest]
1616
php:
17-
- "7.1"
18-
- "7.2"
19-
- "7.3"
17+
#- "7.1"
18+
#- "7.2"
19+
#- "7.3"
2020
- "7.4"
2121
- "8.0"
2222
- "8.1"
23+
- "8.2"
24+
- "8.3"
2325
dependencies:
2426
- "lowest"
2527
- "highest"
26-
symfony-yaml: ['^3.4', '^4', '^5', '^6']
28+
#symfony-yaml: ['^3.4', '^4', '^5', '^6', '^7']
29+
symfony-yaml: ['^5', '^6', '^7']
2730
include:
2831
- os: "windows-latest"
2932
php: "8.0"
@@ -35,22 +38,29 @@ jobs:
3538
symfony-yaml: '^5'
3639
exclude:
3740
# symfony/yaml v5 does not run on PHP 7.1
38-
- php: '7.1'
39-
symfony-yaml: '^5'
41+
#- php: '7.1'
42+
# symfony-yaml: '^5'
4043
# symfony/yaml v6 does not run on PHP 7.*
41-
- php: '7.1'
42-
symfony-yaml: '^6'
43-
- php: '7.2'
44-
symfony-yaml: '^6'
45-
- php: '7.3'
46-
symfony-yaml: '^6'
44+
#- php: '7.1'
45+
# symfony-yaml: '^6'
46+
#- php: '7.2'
47+
# symfony-yaml: '^6'
48+
#- php: '7.3'
49+
# symfony-yaml: '^6'
4750
- php: '7.4'
4851
symfony-yaml: '^6'
49-
# symfony/yaml v3.4 is not compatible with PHP 8.0 but has no upper-bound, so it installs on it
52+
# symfony/yaml v7 does not run on PHP <8.2
53+
- php: '7.4'
54+
symfony-yaml: '^7'
5055
- php: '8.0'
51-
symfony-yaml: '^3.4'
56+
symfony-yaml: '^7'
5257
- php: '8.1'
53-
symfony-yaml: '^3.4'
58+
symfony-yaml: '^7'
59+
# symfony/yaml v3.4 is not compatible with PHP 8.0 but has no upper-bound, so it installs on it
60+
#- php: '8.0'
61+
# symfony-yaml: '^3.4'
62+
#- php: '8.1'
63+
# symfony-yaml: '^3.4'
5464

5565
runs-on: ${{ matrix.os }}
5666

@@ -69,7 +79,7 @@ jobs:
6979

7080
- name: Require newer phpunit/phpunit version
7181
run: "composer require phpunit/phpunit '^9.5' --dev --no-interaction --ansi --no-install"
72-
if: matrix.php == '8.1'
82+
if: matrix.php == '8.1' || matrix.php == '8.2' || matrix.php == '8.3'
7383

7484
- name: "Install dependencies with Composer"
7585
uses: "ramsey/composer-install@v2"

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ fix-style: php-cs-fixer.phar
3737
$(DOCKER_PHP) vendor/bin/indent --spaces .php_cs.dist
3838
$(DOCKER_PHP) ./php-cs-fixer.phar fix src/ --diff
3939

40-
install: composer.lock yarn.lock
40+
install:
4141
$(DOCKER_PHP) composer install --prefer-dist --no-interaction --no-progress --ansi
4242
$(DOCKER_NODE) yarn install
4343

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ do awesome work:
2626
- [cebe/yii2-app-api](https://github.com/cebe/yii2-app-api) Yii framework application template for developing API-first applications.
2727
- [league/openapi-psr7-validator](https://github.com/thephpleague/openapi-psr7-validator) validates PSR-7 messages (HTTP request/response) against OpenAPI descriptions.
2828
- [dsuurlant/response2schema](https://github.com/dsuurlant/response2schema) a quick and easy tool for generating OpenAPI schemas based on example data.
29+
- [hotmeteor/spectator](https://github.com/hotmeteor/spectator) a light-weight OpenAPI testing tool for existing Laravel test suite.
2930
- [googoogajoob/openapi-slim4](https://github.com/googoogajoob/openapi-slim4) Configure the paths of a slim4 application from an openapi definition.
3031
- ... ([add yours](https://github.com/cebe/php-openapi/edit/master/README.md#L24))
3132

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"require": {
2121
"php": ">=7.1.0",
2222
"ext-json": "*",
23-
"symfony/yaml": "^3.4 || ^4 || ^5 || ^6",
23+
"symfony/yaml": "^3.4 || ^4 || ^5 || ^6 || ^7.0",
2424
"justinrainbow/json-schema": "^5.2"
2525
},
2626
"require-dev": {
@@ -81,7 +81,7 @@
8181
"source": {
8282
"url": "https://github.com/APIs-guru/openapi-directory",
8383
"type": "git",
84-
"reference": "openapi3.0.0"
84+
"reference": "9d2e0b6696a230a182d740a8e97ba27fb41b13bd"
8585
}
8686
}
8787
},
@@ -91,9 +91,9 @@
9191
"name": "nexmo/api-specification",
9292
"version": "1.0.0",
9393
"source": {
94-
"url": "https://github.com/Nexmo/api-specification",
94+
"url": "https://github.com/cebe/nexmo-api-specification",
9595
"type": "git",
96-
"reference": "voice-2.0.0"
96+
"reference": "590fadf21f528ed8e05f6ff47c2e49d81f50a181"
9797
}
9898
}
9999
}

0 commit comments

Comments
 (0)