Skip to content

Commit

Permalink
enhancement minor compatibility to php 7.3
Browse files Browse the repository at this point in the history
  • Loading branch information
JellyBellyDev committed Jan 4, 2021
1 parent 16a69b8 commit aa6fcea
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 18 deletions.
16 changes: 7 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,25 @@
language: php

php:
- 5.6
- 7.0
- 7.1
- 7.2
- 7.3
- 7.4
- 8.0

env:
- COMPOSER_OPTIONS='install --prefer-source'
matrix:
- PREFER_LOWEST="--prefer-lowest"
- PREFER_LOWEST=""

before_install:
- composer self-update

before_script:
- COMPOSER_ROOT_VERSION=dev-master composer $COMPOSER_OPTIONS
- COMPOSER_ROOT_VERSION=dev-master composer update --prefer-source $PREFER_LOWEST

script:
- ./bin/phpspec run --format=dot
- ./bin/behat

matrix:
allow_failures:
- php: 7.1
#matrix:
# allow_failures:
# - php: 7.1
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
}
],
"require": {
"php": "^7.0 | ^8.0",
"phpspec/phpspec": "6.* | 7.*"
"php": "^7.3|^8.0",
"phpspec/phpspec": "^6.0|^7.0"
},
"require-dev": {
"behat/behat": "^3.1",
"symfony/filesystem": "^3.1",
"symfony/process": "^3.1",
"symfony/console": "^3.1",
"behat/behat": "^3.8",
"symfony/filesystem": "^4.0|^5.0",
"symfony/process": "^4.0|^5.0",
"symfony/console": "^4.0|^5.0",
"bossa/phpspec2-expect": "^3.0"
},
"autoload": {
Expand Down
4 changes: 1 addition & 3 deletions features/bootstrap/Console/ApplicationTester.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,7 @@ public function run($input)

$inputStream = $this->getInputStream();
rewind($inputStream);
$this->application->getHelperSet()
->get('question')
->setInputStream($inputStream);
$this->input->setStream($inputStream);

$this->result = $this->application->run($this->input, $this->output);
}
Expand Down
1 change: 1 addition & 0 deletions features/bootstrap/PHPSpecContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

use Behat\Behat\Context\SnippetAcceptingContext;
use Behat\Gherkin\Node\PyStringNode;
use Console\ApplicationTester;
use Symfony\Component\Filesystem\Filesystem;
use PhpSpec\Console\Application;

Expand Down

0 comments on commit aa6fcea

Please sign in to comment.