coderkun/questlab
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Wiki Activity

correct namespaces

Browse source
This commit is contained in:
coderkun 2013-09-22 21:39:53 +02:00
commit 1779c38218
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/Agent.inc
View file

@ -398,7 +398,7 @@
{ {
try { try {
// Load Agent // Load Agent
BottomlevelAgent::load($agentName); \nre\agents\BottomlevelAgent::load($agentName);
// Construct Agent // Construct Agent
$this->subAgents[] = call_user_func_array( $this->subAgents[] = call_user_func_array(
@ -468,7 +468,7 @@
return array( return array(
'name' => strtolower($agentName), 'name' => strtolower($agentName),
'response' => $response, 'response' => $response,
'object' => BottomlevelAgent::factory( 'object' => \nre\agents\BottomlevelAgent::factory(
$agentName, $agentName,
$this->request, $this->request,
$response, $response,
@ -548,7 +548,7 @@
try { try {
// Load Agenten // Load Agenten
BottomlevelAgent::load($agentName); \nre\agents\BottomlevelAgent::load($agentName);
// Construct Agent // Construct Agent
$subAgent = $this->newSubAgent($agentName); $subAgent = $this->newSubAgent($agentName);

10
core/Driver.inc
View file

@ -42,11 +42,11 @@
// Validate class // Validate class
ClassLoader::check($className, get_class()); ClassLoader::check($className, get_class());
} }
catch(ClassNotValidException $e) { catch(\nre\exceptions\ClassNotValidException $e) {
throw new DriverNotValidException($e->getClassName()); throw new \nre\exceptions\DriverNotValidException($e->getClassName());
} }
catch(ClassNotFoundException $e) { catch(\nre\exceptions\ClassNotFoundException $e) {
throw new DriverNotFoundException($e->getClassName()); throw new \nre\exceptions\DriverNotFoundException($e->getClassName());
} }
} }
@ -75,7 +75,7 @@
*/ */
private static function getClassName($driverName) private static function getClassName($driverName)
{ {
$className = \nre\core\ClassLoader::concatClassNames($driverName, \nre\core\ClassLoader::stripNamespace(get_class())); $className = ClassLoader::concatClassNames($driverName, ClassLoader::stripNamespace(get_class()));
return "\\nre\\drivers\\$className"; return "\\nre\\drivers\\$className";