use __DIR__ available since php 5.3

Author: glensc

README.md

@@ -1009,7 +1009,7 @@ if (isset($_SESSION['samlNameIdFormat'])) {
     $nameIdFormat = $_SESSION['samlNameIdFormat'];
 }
 $auth->logout($returnTo, $paramters, $nameId, $sessionIndex, false, $nameIdFormat);
-``` 
+```
 
 If a match on the future LogoutResponse ID and the LogoutRequest ID to be sent is required, that LogoutRequest ID must to be extracted and stored.
 
@@ -1037,8 +1037,7 @@ session_start();    // Initialize the session, we do that because
                     // Note that processResponse and processSLO
                     // methods could manipulate/close that session
 
-require_once dirname(dirname(__FILE__)).'/_toolkit_loader.php'; // Load Saml2 and
-                                                                // external libs
+require_once dirname(__DIR__).'/_toolkit_loader.php'; // Load Saml2 and external libs
 require_once 'settings.php';    // Load the setting info as an Array
 
 $auth = new OneLogin_Saml2_Auth($settingsInfo);  // Initialize the SP SAML instance

_toolkit_loader.php

@@ -1,11 +1,11 @@
 <?php
 
-// Create an __autoload function 
+// Create an __autoload function
 // (can conflicts other autoloaders)
 // http://php.net/manual/en/language.oop5.autoload.php
 
-$libDir = dirname(__FILE__) . '/lib/Saml2/';
-$extlibDir = dirname(__FILE__) . '/extlib/';
+$libDir = __DIR__ . '/lib/Saml2/';
+$extlibDir = __DIR__ . '/extlib/';
 
 // Load composer
 if (file_exists('vendor/autoload.php')) {

demo1/index.php

@@ -6,7 +6,7 @@
 
 session_start();
 
-require_once dirname(dirname(__FILE__)).'/_toolkit_loader.php';
+require_once dirname(__DIR__).'/_toolkit_loader.php';
 
 require_once 'settings.php';
 

demo1/metadata.php

@@ -4,7 +4,7 @@
  *  SAML Metadata view
  */
 
-require_once dirname(dirname(__FILE__)).'/_toolkit_loader.php';
+require_once dirname(__DIR__).'/_toolkit_loader.php';
 
 require_once 'settings.php' ;
 

endpoints/acs.php

@@ -6,7 +6,7 @@
 
 session_start();
 
-require_once dirname(dirname(__FILE__)).'/_toolkit_loader.php';
+require_once dirname(__DIR__).'/_toolkit_loader.php';
 
 $auth = new OneLogin_Saml2_Auth();
 

endpoints/metadata.php

@@ -4,7 +4,7 @@
  *  SP Metadata Endpoint
  */
 
-require_once dirname(dirname(__FILE__)).'/_toolkit_loader.php';
+require_once dirname(__DIR__).'/_toolkit_loader.php';
 
 try {
     $auth = new OneLogin_Saml2_Auth();

endpoints/sls.php

@@ -6,7 +6,7 @@
 
 session_start();
 
-require_once dirname(dirname(__FILE__)).'/_toolkit_loader.php';
+require_once dirname(__DIR__).'/_toolkit_loader.php';
 
 $auth = new OneLogin_Saml2_Auth();
 

lib/Saml2/Settings.php

@@ -152,7 +152,7 @@ public function __construct($settings = null, $spValidationOnly = false)
      */
     private function _loadPaths()
     {
-        $basePath = dirname(dirname(dirname(__FILE__))).'/';
+        $basePath = dirname(dirname(__DIR__)).'/';
         $this->_paths = array (
             'base' => $basePath,
             'config' => $basePath,

lib/Saml2/Utils.php

@@ -50,7 +50,7 @@ public static function t($msg, $args = array())
     {
         assert('is_string($msg)');
         if (extension_loaded('gettext')) {
-            bindtextdomain("phptoolkit", dirname(dirname(dirname(__FILE__))).'/locale');
+            bindtextdomain("phptoolkit", dirname(dirname(__DIR__)).'/locale');
             textdomain('phptoolkit');
 
             $translatedMsg = gettext($msg);
@@ -124,7 +124,7 @@ public static function validateXML($xml, $schema, $debug = false)
             }
         }
 
-        $schemaFile = dirname(__FILE__).'/schemas/' . $schema;
+        $schemaFile = __DIR__.'/schemas/' . $schema;
         $oldEntityLoader = libxml_disable_entity_loader(false);
         $res = $dom->schemaValidate($schemaFile);
         libxml_disable_entity_loader($oldEntityLoader);

tests/bootstrap.php

@@ -2,11 +2,11 @@
 
 ob_start();
 
-$basePath = dirname(dirname(__FILE__));
+$basePath = dirname(__DIR__);
 
 require_once $basePath.'/_toolkit_loader.php';
 
-if (!defined('TEST_ROOT')) define('TEST_ROOT', dirname(__FILE__));
+if (!defined('TEST_ROOT')) define('TEST_ROOT', __DIR__);
 
 if (!defined('XMLSECLIBS_DIR')) define('XMLSECLIBS_DIR', $basePath.'/extlib/xmlseclibs/');
 require_once XMLSECLIBS_DIR . 'xmlseclibs.php';
@@ -19,7 +19,7 @@
 require_once ONELOGIN_SAML_DIR . 'XmlSec.php';
 
 if (!defined('ONELOGIN_CUSTOMPATH')) {
-    define('ONELOGIN_CUSTOMPATH', dirname(__FILE__).'/data/customPath/');
+    define('ONELOGIN_CUSTOMPATH', __DIR__.'/data/customPath/');
 }
 
 date_default_timezone_set('America/Los_Angeles');