Skip to content

Commit

Permalink
Merge branch 'master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
cebe authored Nov 14, 2024
2 parents 2aecd52 + fde36f6 commit 7ba77f2
Show file tree
Hide file tree
Showing 5 changed files with 287 additions and 155 deletions.
42 changes: 26 additions & 16 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,19 @@ jobs:
matrix:
os: [ubuntu-latest]
php:
- "7.1"
- "7.2"
- "7.3"
#- "7.1"
#- "7.2"
#- "7.3"
- "7.4"
- "8.0"
- "8.1"
- "8.2"
- "8.3"
dependencies:
- "lowest"
- "highest"
symfony-yaml: ['^3.4', '^4', '^5', '^6']
#symfony-yaml: ['^3.4', '^4', '^5', '^6', '^7']
symfony-yaml: ['^5', '^6', '^7']
include:
- os: "windows-latest"
php: "8.0"
Expand All @@ -35,22 +38,29 @@ jobs:
symfony-yaml: '^5'
exclude:
# symfony/yaml v5 does not run on PHP 7.1
- php: '7.1'
symfony-yaml: '^5'
#- php: '7.1'
# symfony-yaml: '^5'
# symfony/yaml v6 does not run on PHP 7.*
- php: '7.1'
symfony-yaml: '^6'
- php: '7.2'
symfony-yaml: '^6'
- php: '7.3'
symfony-yaml: '^6'
#- php: '7.1'
# symfony-yaml: '^6'
#- php: '7.2'
# symfony-yaml: '^6'
#- php: '7.3'
# symfony-yaml: '^6'
- php: '7.4'
symfony-yaml: '^6'
# symfony/yaml v3.4 is not compatible with PHP 8.0 but has no upper-bound, so it installs on it
# symfony/yaml v7 does not run on PHP <8.2
- php: '7.4'
symfony-yaml: '^7'
- php: '8.0'
symfony-yaml: '^3.4'
symfony-yaml: '^7'
- php: '8.1'
symfony-yaml: '^3.4'
symfony-yaml: '^7'
# symfony/yaml v3.4 is not compatible with PHP 8.0 but has no upper-bound, so it installs on it
#- php: '8.0'
# symfony-yaml: '^3.4'
#- php: '8.1'
# symfony-yaml: '^3.4'

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

Expand All @@ -69,7 +79,7 @@ jobs:

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

- name: "Install dependencies with Composer"
uses: "ramsey/composer-install@v2"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ fix-style: php-cs-fixer.phar
$(DOCKER_PHP) vendor/bin/indent --spaces .php_cs.dist
$(DOCKER_PHP) ./php-cs-fixer.phar fix src/ --diff

install: composer.lock yarn.lock
install:
$(DOCKER_PHP) composer install --prefer-dist --no-interaction --no-progress --ansi
$(DOCKER_NODE) yarn install

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

Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"require": {
"php": ">=7.1.0",
"ext-json": "*",
"symfony/yaml": "^3.4 || ^4 || ^5 || ^6",
"symfony/yaml": "^3.4 || ^4 || ^5 || ^6 || ^7.0",
"justinrainbow/json-schema": "^5.2"
},
"require-dev": {
Expand Down Expand Up @@ -81,7 +81,7 @@
"source": {
"url": "https://github.com/APIs-guru/openapi-directory",
"type": "git",
"reference": "openapi3.0.0"
"reference": "9d2e0b6696a230a182d740a8e97ba27fb41b13bd"
}
}
},
Expand All @@ -91,9 +91,9 @@
"name": "nexmo/api-specification",
"version": "1.0.0",
"source": {
"url": "https://github.com/Nexmo/api-specification",
"url": "https://github.com/cebe/nexmo-api-specification",
"type": "git",
"reference": "voice-2.0.0"
"reference": "590fadf21f528ed8e05f6ff47c2e49d81f50a181"
}
}
}
Expand Down
Loading

0 comments on commit 7ba77f2

Please sign in to comment.