From 703c3ceb9025d6969ad40acc892755f3549dd7df Mon Sep 17 00:00:00 2001 From: Irakli Nadareishvili Date: Tue, 22 May 2012 13:39:44 -0300 Subject: [PATCH 1/2] Making autoloader act nicer to autoloaders that may be running in parallel --- lib/Predis/Autoloader.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/Predis/Autoloader.php b/lib/Predis/Autoloader.php index 27006f1b..c8b49230 100644 --- a/lib/Predis/Autoloader.php +++ b/lib/Predis/Autoloader.php @@ -52,7 +52,10 @@ class Autoloader { if (0 === strpos($className, $this->prefix)) { $parts = explode('\\', substr($className, $this->prefixLength)); - require($this->directory.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, $parts).'.php'); + $filepath = $this->directory.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, $parts).'.php'; + if (file_exists($filepath)) { + require_once($filepath); + } } } } From 4f16e232a8b8e58c273106c20ef1e75eae64f578 Mon Sep 17 00:00:00 2001 From: Irakli Nadareishvili Date: Sat, 26 May 2012 08:14:29 -0300 Subject: [PATCH 2/2] Updated file_exists() to is_file() and changed require_once() to require() per Predis' author's suggestions --- lib/Predis/Autoloader.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Predis/Autoloader.php b/lib/Predis/Autoloader.php index c8b49230..54d83fbe 100644 --- a/lib/Predis/Autoloader.php +++ b/lib/Predis/Autoloader.php @@ -53,8 +53,8 @@ class Autoloader if (0 === strpos($className, $this->prefix)) { $parts = explode('\\', substr($className, $this->prefixLength)); $filepath = $this->directory.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, $parts).'.php'; - if (file_exists($filepath)) { - require_once($filepath); + if (is_file($filepath)) { + require($filepath); } } }