Skip to content

Commit

Permalink
REMOVED - removed support for php 7.0, 7.1
Browse files Browse the repository at this point in the history
UPDATE - dependencies
  • Loading branch information
bartko-s committed Jun 1, 2019
1 parent 895e426 commit 9528037
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 19 deletions.
5 changes: 2 additions & 3 deletions .coveralls.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
src_dir: src
coverage_clover: tests/clover.xml
json_path: tests/coveralls-upload.json
coverage_clover: tests/temp/clover.xml
json_path: tests/temp/coveralls-upload.json
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
/composer.lock
/tests/temp/
/example/
/tests/clover.xml
/tests/.phpunit.result.cache
8 changes: 3 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
language: php
php:
- 7.0
- 7.1
- 7.2
- 7.3
- nightly
- hhvm

before_script:
- composer self-update
- composer install --dev
- composer install

script: composer test

after_script:
- php vendor/bin/coveralls -v
- travis_retry php vendor/bin/php-coveralls
- wget https://scrutinizer-ci.com/ocular.phar
- php ocular.phar code-coverage:upload --format=php-clover tests/clover.xml
- php ocular.phar code-coverage:upload --format=php-clover tests/temp/clover.xml

matrix:
fast_finish: true
Expand Down
14 changes: 9 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
}
],
"require": {
"php": ">=7.0.0"
"php": ">=7.1.0"
},
"require-dev": {
"phpunit/PHPUnit": "^6.0.0",
"mockery/mockery": "^1.0.0",
"satooshi/php-coveralls": "^2.0"
"mockery/mockery": "^1.2.0",
"php-coveralls/php-coveralls": "^2.1",
"phpunit/phpunit": "^8.1"
},
"autoload": {
"psr-0": {
Expand All @@ -41,7 +41,11 @@
"StefanoImageTest\\": "tests/"
}
},
"minimum-stability": "stable",
"config": {
"sort-packages": true
},
"scripts": {
"test": "vendor/bin/phpunit --configuration tests/phpunit.xml --coverage-clover tests/clover.xml"
"test": "vendor/bin/phpunit --configuration tests/phpunit.xml --coverage-clover tests/temp/clover.xml"
}
}
4 changes: 2 additions & 2 deletions tests/StefanoImageTest/Adapter/GdTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
class GdTest
extends TestCase
{
protected function setUp() {
protected function setUp(): void {
if(!file_exists($this->getBasePath())) {
mkdir($this->getBasePath(), 0777, true);
}
}

protected function tearDown() {
protected function tearDown(): void {
$basePath = $this->getBasePath();
if(file_exists($basePath)) {
$iterator = new \DirectoryIterator($basePath);
Expand Down
2 changes: 1 addition & 1 deletion tests/StefanoImageTest/ImageTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class ImageTest
extends TestCase
{
protected function tearDown() {
protected function tearDown(): void {
\Mockery::close();
}

Expand Down
4 changes: 2 additions & 2 deletions tests/phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</whitelist>
</filter>
<logging>
<log type="coverage-html" target="./temp/codeCoverage" charset="UTF-8"
highlight="true" lowUpperBound="50" highLowerBound="90"/>
<log type="coverage-html" target="./temp/codeCoverage" lowUpperBound="50" highLowerBound="90"/>
<log type="coverage-clover" target="./temp/clover.xml"/>
</logging>
</phpunit>

0 comments on commit 9528037

Please sign in to comment.