Merge pull request #16 from juliardi/master

update php-saml to version 3.x
asasmoyo · Oct 18, 2018 · 5d58b6f · 5d58b6f
2 parents 4d4150c + b27ec58
commit 5d58b6f
Show file tree

Hide file tree

Showing 4 changed files with 174 additions and 66 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,8 @@ language: php
 php:
     - '5.6'
     - '7.0'
+    - '7.1'
+    - '7.2'
 
 install:
     - composer update

diff --git a/composer.json b/composer.json
@@ -23,11 +23,14 @@
     "prefer-stable": true,
     "require": {
         "yiisoft/yii2": ">=2.0.13",
-        "onelogin/php-saml": "~2.13.0"
+        "onelogin/php-saml": "~3.0.0"
     },
     "require-dev": {
         "phpunit/phpunit": "5.0.*"
     },
+    "conflict": {
+        "phpunit/php-timer": ">=2"
+    },
     "autoload": {
         "psr-4": {
             "asasmoyo\\yii2saml\\": "src/"
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,8 @@ language: php @@
     php:
         - '5.6'
         - '7.0'
+        - '7.1'
+        - '7.2'
     install:
         - composer update
@@ Expand Down @@