Skip to content

Commit

Permalink
Merge branch '3.6'
Browse files Browse the repository at this point in the history
Signed-off-by: Mior Muhammad Zaki <[email protected]>
  • Loading branch information
crynobone committed Jun 25, 2018
2 parents 05ce20f + b8fd19a commit 2823dbb
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ before_script:
- if [[ $setup = 'basic' ]]; then travis_retry composer install --prefer-source --no-interaction; fi
- if [[ $setup = 'stable' ]]; then travis_retry composer update --prefer-source --no-interaction --prefer-stable; fi
- if [[ $setup = 'lowest' ]]; then travis_retry composer update --prefer-source --no-interaction --prefer-lowest --prefer-stable; fi
- if [[ $setup = 'coveralls' ]]; then travis_retry composer require "satooshi/php-coveralls=~1.0" --prefer-source --no-interaction --dev; fi
- if [[ $setup = 'coveralls' ]]; then travis_retry composer require "php-coveralls/php-coveralls=^2.1" --prefer-source --no-interaction --dev; fi

script:
- if [[ $coverage = 'yes' ]]; then ./vendor/bin/phpunit -c phpunit.xml --coverage-clover build/logs/clover.xml; fi
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
}
],
"require": {
"php": ">=7.0",
"php": ">=7.1",
"imagine/imagine": "~0.7",
"orchestra/support-core": "~3.7.0",
"orchestra/support-providers": "~3.7.0"
},
"require-dev": {
"illuminate/container": "~5.7.0",
"mockery/mockery": "~1.0",
"phpunit/phpunit": "~7.0"
"mockery/mockery": "^1.0",
"phpunit/phpunit": "^7.0"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
syntaxCheck="false"
verbose="true"
>

<testsuites>
Expand Down
2 changes: 1 addition & 1 deletion src/ImagineManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public function getConfig(): array
*
* @return $this
*/
public function setConfig(array $config): self
public function setConfig(array $config)
{
$this->config = $config;

Expand Down

0 comments on commit 2823dbb

Please sign in to comment.