Merge branch 'Hikariii-version3Cleanup' into 3.0.0

Author: pitbulk

.travis.yml

@@ -2,10 +2,8 @@ language: php
 
 php:
   - 5.6
-  - 5.5
-  - 5.4
-#  - 5.3
   - 7.0
+  - 7.1
 
 env:
  - TRAVIS=true
@@ -27,7 +25,7 @@ script:
   - php vendor/bin/phploc lib/.
   - mkdir -p tests/build/dependences
   - php vendor/bin/pdepend --summary-xml=tests/build/logs/dependence-summary.xml --jdepend-chart=tests/build/dependences/jdepend.svg --overview-pyramid=tests/build/dependences/pyramid.svg  lib/.
-  - php vendor/bin/phpcs --standard=tests/ZendModStandard lib/Saml2 demo1 demo2 demo-old endpoints tests/src
+  - php vendor/bin/phpcs --standard=tests/ZendModStandard lib/Saml2 demo1 demo2 endpoints tests/src
 
 after_script:
   - export TRAVIS=https://travis-ci.org/onelogin/php-saml

_toolkit_loader.php

@@ -5,16 +5,12 @@
 // http://php.net/manual/en/language.oop5.autoload.php
 
 $libDir = dirname(__FILE__) . '/lib/Saml2/';
-$extlibDir = dirname(__FILE__) . '/extlib/';
 
 // Load composer
 if (file_exists('vendor/autoload.php')) {
     require 'vendor/autoload.php';
 }
 
-// Load now external libs
-require_once $extlibDir . 'xmlseclibs/xmlseclibs.php';
-
 $folderInfo = scandir($libDir);
 
 foreach ($folderInfo as $element) {

composer.json

@@ -7,8 +7,6 @@
     "keywords": ["saml", "saml2", "onelogin"],
     "autoload": {
         "classmap": [
-            "extlib/xmlseclibs",
-            "lib/Saml",
             "lib/Saml2"
         ]
     },
@@ -18,22 +16,21 @@
         "source": "https://github.com/onelogin/php-saml/"
     },
     "require": {
-        "php": ">=5.3.2",
+        "php": ">=5.6",
+        "robrichards/xmlseclibs": "^3.0.0",
         "ext-openssl": "*",
-        "ext-dom": "*",
-        "ext-mcrypt": "*"
+        "ext-dom": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.8",
+        "phpunit/phpunit": "^5.7",
         "satooshi/php-coveralls": "1.0.1",
         "sebastian/phpcpd": "*",
         "phploc/phploc": "*",
         "pdepend/pdepend" : "1.1.0",
-        "squizlabs/php_codesniffer": "*"
+        "squizlabs/php_codesniffer": "2.*"
     },
     "suggest": {
         "lib-openssl": "Install openssl lib in order to handle with x509 certs (require to support sign and encryption)",
-        "ext-mcrypt": "Install mcrypt and php5-mcrypt libs in order to support encryption",
         "ext-gettext": "Install gettext and php5-gettext libs to handle translations"
     }
 }