Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'hotfix/fu-autoloader' into develop

  • Loading branch information...
commit c6429de6c52f44333fb1b5416fc359b779061ffa 2 parents 1c8fc48 + 9c1544c
@trq trq authored
Showing with 4 additions and 10 deletions.
  1. +4 −10 lib/Proem/Util/Autoloader.php
View
14 lib/Proem/Util/Autoloader.php
@@ -72,7 +72,7 @@ public function __construct($loadProem = true)
}
if ($loadProem) {
- $this->attachNamespace('Proem', __DIR__);
+ $this->attachNamespace('Proem', realpath(__DIR__ . '/../..'));
}
}
@@ -164,15 +164,8 @@ public function unregister()
/**
* Load a class
*
- * This load mechanism is not only responsible for locating and including the
- * file where a class is defined, but is also responsible for implementing Proem's
- * cascading file system. This is achieved by suffixing \Api onto the Proem part
- * of any namespace starting with Proem, including the class from within the Proem
- * namespace, and then aliasing that class back to Proem (without the \Api suffix)
- *
- * @link http://proemframework.org/docs/cascading-namespace.html
* @param string $class The absolute (including namespace) name of the class
- * @return Proem\Util\Autoloader
+ * @return bool
*/
public function load($class)
{
@@ -182,9 +175,10 @@ public function load($class)
if ($file = $this->locate($class)) {
include $file;
+ return true;
}
- return $this;
+ return false;
}
/**
Please sign in to comment.
Something went wrong with that request. Please try again.