Add Namespaces

Author: pitbulk

README.md

@@ -5,8 +5,8 @@
 // http://php.net/manual/en/language.oop5.autoload.php
 
 // Load composer vendor folder if any
-if (file_exists('vendor/autoload.php')) {
-    require 'vendor/autoload.php';
+if (file_exists(__DIR__ . 'vendor/autoload.php')) {
+    require __DIR__ . '/vendor/autoload.php';
 }
 
 /*
@@ -21,7 +21,7 @@
 
 
 // Load php-saml
-$libDir = __DIR__ . '/lib/Saml2/';
+$libDir = __DIR__ . '/src/Saml2/';
 
 $folderInfo = scandir($libDir);
 
@@ -30,4 +30,3 @@
         include_once $libDir.$element;
     }
 }
-    

_toolkit_loader.php

@@ -6,9 +6,9 @@
     "homepage": "https://developers.onelogin.com/saml/php",
     "keywords": ["saml", "saml2", "onelogin"],
     "autoload": {
-        "classmap": [
-            "lib/Saml2"
-        ]
+        "psr-4": {
+            "OneLogin\\Saml2\\": "src/"
+        }
     },
     "support": {
         "email": "[email protected]",

composer.json

@@ -8,9 +8,12 @@
 
 require_once dirname(__DIR__).'/_toolkit_loader.php';
 
+use OneLogin\Saml2\Auth;
+use OneLogin\Saml2\Utils;
+
 require_once 'settings.php';
 
-$auth = new OneLogin_Saml2_Auth($settingsInfo);
+$auth = new Auth($settingsInfo);
 
 if (isset($_GET['sso'])) {
     $auth->login();
@@ -78,7 +81,7 @@
     $_SESSION['samlNameIdFormat'] = $auth->getNameIdFormat();
     $_SESSION['samlSessionIndex'] = $auth->getSessionIndex();
     unset($_SESSION['AuthNRequestID']);
-    if (isset($_POST['RelayState']) && OneLogin_Saml2_Utils::getSelfURL() != $_POST['RelayState']) {
+    if (isset($_POST['RelayState']) && Utils::getSelfURL() != $_POST['RelayState']) {
         $auth->redirectTo($_POST['RelayState']);
     }
 } else if (isset($_GET['sls'])) {

demo1/index.php

@@ -6,22 +6,25 @@
 
 require_once dirname(__DIR__).'/_toolkit_loader.php';
 
+use OneLogin\Saml2\Settings;
+use OneLogin\Saml2\Error;
+
 require_once 'settings.php' ;
 
 try {
-    #$auth = new OneLogin_Saml2_Auth($settingsInfo);
+    #$auth = new OneLogin\Saml2\Auth($settingsInfo);
     #$settings = $auth->getSettings();
     // Now we only validate SP settings
-    $settings = new OneLogin_Saml2_Settings($settingsInfo, true);
+    $settings = new Settings($settingsInfo, true);
     $metadata = $settings->getSPMetadata();
     $errors = $settings->validateMetadata($metadata);
     if (empty($errors)) {
         header('Content-Type: text/xml');
         echo $metadata;
     } else {
-        throw new OneLogin_Saml2_Error(
+        throw new Error(
             'Invalid SP metadata: '.implode(', ', $errors),
-            OneLogin_Saml2_Error::METADATA_SP_INVALID
+            Error::METADATA_SP_INVALID
         );
     }
 } catch (Exception $e) {

demo1/metadata.php

@@ -9,10 +9,13 @@
 
 require_once dirname(__DIR__).'/_toolkit_loader.php';
 
+use OneLogin\Saml2\Response;
+use OneLogin\Saml2\Settings;
+
 try {
     if (isset($_POST['SAMLResponse'])) {
-        $samlSettings = new OneLogin_Saml2_Settings();
-        $samlResponse = new OneLogin_Saml2_Response($samlSettings, $_POST['SAMLResponse']);
+        $samlSettings = new Settings();
+        $samlResponse = new Response($samlSettings, $_POST['SAMLResponse']);
         if ($samlResponse->isValid()) {
             echo 'You are: ' . $samlResponse->getNameId() . '<br>';
             $attributes = $samlResponse->getAttributes();

demo2/consume.php

@@ -12,17 +12,21 @@
 
 require_once dirname(__DIR__).'/_toolkit_loader.php';
 
+use OneLogin\Saml2\AuthnRequest;
+use OneLogin\Saml2\Settings;
+use OneLogin\Saml2\Utils;
+
 if (!isset($_SESSION['samlUserdata'])) {
-    $settings = new OneLogin_Saml2_Settings();
-    $authRequest = new OneLogin_Saml2_AuthnRequest($settings);
+    $settings = new Settings();
+    $authRequest = new AuthnRequest($settings);
     $samlRequest = $authRequest->getRequest();
 
     $parameters = array('SAMLRequest' => $samlRequest);
-    $parameters['RelayState'] = OneLogin_Saml2_Utils::getSelfURLNoQuery();
+    $parameters['RelayState'] = Utils::getSelfURLNoQuery();
 
     $idpData = $settings->getIdPData();
     $ssoUrl = $idpData['singleSignOnService']['url'];
-    $url = OneLogin_Saml2_Utils::redirect($ssoUrl, $parameters, true);
+    $url = Utils::redirect($ssoUrl, $parameters, true);
 
     header("Location: $url");
 } else {

demo2/index.php

@@ -8,10 +8,13 @@
 
 require_once dirname(__DIR__).'/_toolkit_loader.php';
 
+use OneLogin\Saml2\Metadata;
+use OneLogin\Saml2\Settings;
+
 header('Content-Type: text/xml');
 
-$samlSettings = new OneLogin_Saml2_Settings();
+$samlSettings = new Settings();
 $sp = $samlSettings->getSPData();
 
-$samlMetadata = OneLogin_Saml2_Metadata::builder($sp);
+$samlMetadata = Metadata::builder($sp);
 echo $samlMetadata;

demo2/metadata.php

@@ -10,7 +10,11 @@
 
 require_once dirname(__DIR__).'/_toolkit_loader.php';
 
-$samlSettings = new OneLogin_Saml2_Settings();
+use OneLogin\Saml2\LogoutRequest;
+use OneLogin\Saml2\Settings;
+use OneLogin\Saml2\Utils;
+
+$samlSettings = new Settings();
 
 $idpData = $samlSettings->getIdPData();
 if (isset($idpData['singleLogoutService']) && isset($idpData['singleLogoutService']['url'])) {
@@ -20,15 +24,15 @@
 }
 
 if (isset($_SESSION['IdPSessionIndex']) && !empty($_SESSION['IdPSessionIndex'])) {
-    $logoutRequest = new OneLogin_Saml2_LogoutRequest($samlSettings, null, $_SESSION['IdPSessionIndex']);
+    $logoutRequest = new LogoutRequest($samlSettings, null, $_SESSION['IdPSessionIndex']);
 } else {
-    $logoutRequest = new OneLogin_Saml2_LogoutRequest($samlSettings);
+    $logoutRequest = new LogoutRequest($samlSettings);
 }
 
 $samlRequest = $logoutRequest->getRequest();
 
 $parameters = array('SAMLRequest' => $samlRequest);
 
-$url = OneLogin_Saml2_Utils::redirect($sloUrl, $parameters, true);
+$url = Utils::redirect($sloUrl, $parameters, true);
 
 header("Location: $url");

demo2/slo.php

@@ -12,11 +12,14 @@
 
 require_once dirname(__DIR__).'/_toolkit_loader.php';
 
-$auth = new OneLogin_Saml2_Auth();
+use OneLogin\Saml2\Auth;
+use OneLogin\Saml2\Utils;
+
+$auth = new OneLogin\Saml2\Auth();
 
 if (!isset($_SESSION['samlUserdata'])) {
     $auth->login();
 } else {
-    $indexUrl = str_replace('/sso.php', '/index.php', OneLogin_Saml2_Utils::getSelfURLNoQuery());
-    OneLogin_Saml2_Utils::redirect($indexUrl);
+    $indexUrl = str_replace('/sso.php', '/index.php', Utils::getSelfURLNoQuery());
+    Utils::redirect($indexUrl);
 }