Skip to content

Commit 6eed614

Browse files
tvdijentvdijen
authored
Fix build (simplesamlphp#1085)
* Update Psalm * Ignore DocblockTypeContradiction and RedundantConditionGivenDocblockType * Fix Psalm-errors * Raise minimum PHP-version to 5.6 * Update lock-file accordingly * Fix phpunit * Suppress Psalm-issue
1 parent 00a6fca commit 6eed614

13 files changed

Lines changed: 1027 additions & 260 deletions

File tree

‎.travis.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
language: php
22
php:
3-
- 5.5
43
- 5.6
54
- 7.0
65
- 7.1
@@ -13,7 +12,7 @@ env:
1312

1413
before_script:
1514
- composer ${COMMAND}
16-
- if [[ "$TRAVIS_PHP_VERSION" == "7.3" ]]; then composer require --dev vimeo/psalm:0.3.92; fi
15+
- if [[ "$TRAVIS_PHP_VERSION" == "7.3" ]]; then composer require --dev vimeo/psalm:1.1.9; fi
1716
- if [[ "$TRAVIS_PHP_VERSION" == "5.6" ]]; then composer require --dev php-coveralls/php-coveralls; fi
1817

1918
script:

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"files": ["lib/_autoload_modules.php"]
2727
},
2828
"require": {
29-
"php": ">=5.5",
29+
"php": ">=5.6",
3030
"ext-SPL": "*",
3131
"ext-zlib": "*",
3232
"ext-pcre": "*",
@@ -62,7 +62,7 @@
6262
"require-dev": {
6363
"ext-curl": "*",
6464
"mikey179/vfsstream": "~1.6",
65-
"phpunit/phpunit": "~4.8"
65+
"phpunit/phpunit": "~5.7"
6666
},
6767
"suggest": {
6868
"predis/predis": "Needed if a Redis server is used to store session information",

0 commit comments

Comments
 (0)