From e135bb4f7a0d510991937ab1347821b36a27c345 Mon Sep 17 00:00:00 2001
From: Jaime Perez Crespo <jaime.perez@uninett.no>
Date: Wed, 5 Aug 2015 14:32:41 +0200
Subject: [PATCH] Simple reformatting for auto loaders.
---
lib/_autoload.php | 21 ++++++++++-----------
lib/_autoload_modules.php | 6 +++---
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/lib/_autoload.php b/lib/_autoload.php
index bbe3681cc..03b5ec180 100644
--- a/lib/_autoload.php
+++ b/lib/_autoload.php
@@ -1,21 +1,20 @@
<?php
/**
- * This file is a backwards compatible autoloader for simpleSAMLphp.
+ * This file is a backwards compatible autoloader for SimpleSAMLphp.
* Loads the Composer autoloader.
*
* @author Olav Morken, UNINETT AS.
- * @package simpleSAMLphp
+ * @package SimpleSAMLphp
*/
// SSP is loaded as a separate project
-if (file_exists(dirname(dirname(__FILE__)) . '/vendor/autoload.php')) {
- require_once dirname(dirname(__FILE__)) . '/vendor/autoload.php';
-}
-// SSP is loaded as a library.
-else if (file_exists(dirname(dirname(__FILE__)) . '/../../autoload.php')) {
- require_once dirname(dirname(__FILE__)) . '/../../autoload.php';
-}
-else {
- throw new Exception('Unable to load Composer autoloader');
+if (file_exists(dirname(dirname(__FILE__)).'/vendor/autoload.php')) {
+ require_once dirname(dirname(__FILE__)).'/vendor/autoload.php';
+} else { // SSP is loaded as a library.
+ if (file_exists(dirname(dirname(__FILE__)).'/../../autoload.php')) {
+ require_once dirname(dirname(__FILE__)).'/../../autoload.php';
+ } else {
+ throw new Exception('Unable to load Composer autoloader');
+ }
}
diff --git a/lib/_autoload_modules.php b/lib/_autoload_modules.php
index fcbc110f0..c4c85e4e4 100644
--- a/lib/_autoload_modules.php
+++ b/lib/_autoload_modules.php
@@ -1,14 +1,14 @@
<?php
/**
- * This file implements a autoloader for simpleSAMLphp modules.
+ * This file implements a autoloader for SimpleSAMLphp modules.
*
* @author Boy Baukema, SURFnet
- * @package simpleSAMLphp
+ * @package SimpleSAMLphp
*/
/**
- * Autoload function for simpleSAMLphp modules.
+ * Autoload function for SimpleSAMLphp modules.
*
* @param string $className Name of the class.
*/
--
GitLab