Skip to content

Commit 5478cbb

Browse files
authored
Merge pull request #85 from ubirak/tyx-patch-1
Allow to use sf4
2 parents 6ba4943 + 2e83c33 commit 5478cbb

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ php:
1010
- nightly
1111
env:
1212
matrix:
13+
- COMPOSER_PREFER=""
1314
- COMPOSER_PREFER="--prefer-stable"
14-
- COMPOSER_PREFER="--prefer-lowest"
15+
- COMPOSER_PREFER="--prefer-lowest --prefer-stable"
1516
matrix:
1617
allow_failures:
1718
-

behat.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ default:
55
- FeatureContext
66
- Rezzza\RestApiBehatExtension\RestApiContext
77
- Rezzza\RestApiBehatExtension\Json\JsonContext:
8-
jsonSchemaBaseUrl: %paths.base%/features/bootstrap
8+
jsonSchemaBaseUrl: '%paths.base%/features/bootstrap'
99

1010
extensions:
1111
Rezzza\RestApiBehatExtension\Extension:

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@
1515
"autoload": {
1616
"psr-4": { "Rezzza\\RestApiBehatExtension\\": "src/" }
1717
},
18+
"minimum-stability": "dev",
1819
"require": {
1920
"php": ">=5.6.0",
2021
"behat/behat": "~3.0",
2122
"atoum/atoum": "~1.0|~2.0|~3.0|3.0.x-dev",
22-
"symfony/property-access": "~2.5|~3.0",
23+
"symfony/property-access": "~2.5|~3.0|~4.0",
2324
"justinrainbow/json-schema": ">=3.0 <6.0",
2425
"psr/http-message": "^1.0",
2526
"php-http/discovery": "^1.0",

features/json_inspection_edge_case.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Feature: Test json inspection edge cases
1212
contexts:
1313
- Rezzza\RestApiBehatExtension\RestApiContext
1414
- Rezzza\RestApiBehatExtension\Json\JsonContext:
15-
jsonSchemaBaseUrl: %paths.base%/features/bootstrap
15+
jsonSchemaBaseUrl: '%paths.base%/features/bootstrap'
1616
1717
extensions:
1818
Rezzza\RestApiBehatExtension\Extension:

0 commit comments

Comments
 (0)