Skip to content

Prefer composer autoload over Autoload.php #331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Prefer composer autoload over Autoload.php #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CAS.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,6 @@
* @link https://wiki.jasig.org/display/CASC/phpCAS
*/

require_once __DIR__.'/source/CAS.php';
require_once __DIR__.'/source/CAS.php';

trigger_error('Including CAS.php is deprecated. Install phpCAS using composer instead.', E_USER_DEPRECATED);
5 changes: 5 additions & 0 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@
"source/"
]
},
"autoload-dev": {
"classmap": [
"test/"
]
},
"extra": {
"branch-alias": {
"dev-master": "1.3.x-dev"
Expand Down
10 changes: 5 additions & 5 deletions source/CAS/Autoload.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function CAS_autoload($class)
}
// Setup the include path if it's not already set from a previous call
if (empty($include_path)) {
$include_path = array(dirname(__DIR__), dirname(__DIR__) . '/../test/' );
$include_path = array(dirname(__DIR__));
}

// Declare local variable to store the expected full path to the file
Expand Down Expand Up @@ -73,10 +73,10 @@ function CAS_autoload($class)
die ((string) $e);
}

// set up __autoload
if (!(spl_autoload_functions())
|| !in_array('CAS_autoload', spl_autoload_functions())
) {
// Set up autoload if not already configured by composer.
if (!class_exists('CAS_Client'))
{
trigger_error('phpCAS autoloader is deprecated. Install phpCAS using composer instead.', E_USER_DEPRECATED);
spl_autoload_register('CAS_autoload');
if (function_exists('__autoload')
&& !in_array('__autoload', spl_autoload_functions())
Expand Down