Skip to content
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.

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

Avoid self autoload in Symfony require #100

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
36 changes: 19 additions & 17 deletions ApnsPHP/Autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,26 +30,28 @@
* @throws Exception if class name is empty, the current path is empty or class
* file does not exists or file was loaded but class name was not found.
*/
function ApnsPHP_Autoload($sClassName)
if(!function_exists('ApnsPHP_Autoload'))
{
if (empty($sClassName)) {
throw new Exception('Class name is empty');
}

$sPath = dirname(dirname(__FILE__));
if (empty($sPath)) {
throw new Exception('Current path is empty');
}

$sFile = sprintf('%s%s%s.php',
$sPath, DIRECTORY_SEPARATOR,
str_replace('_', DIRECTORY_SEPARATOR, $sClassName)
);
if (is_file($sFile) && is_readable($sFile)) {
require_once $sFile;
function ApnsPHP_Autoload($sClassName)
{
if (empty($sClassName)) {
throw new Exception('Class name is empty');
}

$sPath = dirname(dirname(__FILE__));
if (empty($sPath)) {
throw new Exception('Current path is empty');
}

$sFile = sprintf('%s%s%s.php',
$sPath, DIRECTORY_SEPARATOR,
str_replace('_', DIRECTORY_SEPARATOR, $sClassName)
);
if (is_file($sFile) && is_readable($sFile)) {
require_once $sFile;
}
}
}

// If your code has an existing __autoload function then this function must be explicitly registered on the __autoload stack.
// (PHP Documentation for spl_autoload_register [@see http://php.net/spl_autoload_register])
if (function_exists('__autoload')) {
Expand Down