Permalink
Browse files

Moved the Autloader into the Proem\Util name space.

Closes #117
  • Loading branch information...
1 parent 3fbe935 commit 7c8a4338eeb1541a31dd6a92960ee4dd75193054 @trq trq committed Oct 29, 2012
View
4 Phakefile
@@ -1,8 +1,8 @@
<?php
-require_once 'lib/Proem/Autoloader.php';
+require_once 'lib/Proem/Util/Autoloader.php';
-(new \Proem\Autoloader)
+(new \Proem\Util\Autoloader)
->attachNamespace('Proem', 'lib')
->register();
View
18 lib/Proem/Autoloader.php → lib/Proem/Util/Autoloader.php
@@ -25,9 +25,9 @@
*/
/**
- * @namespace Proem
+ * @namespace Proem\Util
*/
-namespace Proem;
+namespace Proem\Util;
/**
* The Proem Autoloader
@@ -80,7 +80,7 @@ public function __construct($loadProem = true)
* Register an array of namespaces
*
* @param array $namespaces An array of namespaces
- * @return Proem\Autoloader
+ * @return Proem\util\Autoloader
*/
public function attachNamespaces(array $namespaces)
{
@@ -95,7 +95,7 @@ public function attachNamespaces(array $namespaces)
*
* @param string $namespace The namespace
* @param array|string $paths The path to the namespace
- * @return Proem\Autoloader
+ * @return Proem\Util\Autoloader
*/
public function attachNamespace($namespace, $paths)
{
@@ -116,7 +116,7 @@ public function attachNamespace($namespace, $paths)
* Registers an array of classes using the Pear naming convention
*
* @param array $classes
- * @return Proem\Autoloader
+ * @return Proem\Util\Autoloader
*/
public function attachPearPrefixes(array $classes)
{
@@ -131,7 +131,7 @@ public function attachPearPrefixes(array $classes)
*
* @param string $prefix The prefix
* @param array|string $paths The path
- * @return Proem\Autoloader
+ * @return Proem\Util\Autoloader
*/
public function attachPearPrefix($prefix, $paths)
{
@@ -142,7 +142,7 @@ public function attachPearPrefix($prefix, $paths)
/**
* Register the autoloader.
*
- * @return Proem\Autoloader
+ * @return Proem\Util\Autoloader
*/
public function register()
{
@@ -153,7 +153,7 @@ public function register()
/**
* Unregister the autoloader.
*
- * @return Proem\Autoloader
+ * @return Proem\Util\Autoloader
*/
public function unregister()
{
@@ -172,7 +172,7 @@ public function unregister()
*
* @link http://proemframework.org/docs/cascading-namespace.html
* @param string $class The absolute (including namespace) name of the class
- * @return Proem\Autoloader
+ * @return Proem\Util\Autoloader
*/
public function load($class)
{
View
4 tests/bootstrap.php
@@ -1,8 +1,8 @@
<?php
-require_once 'lib/Proem/Autoloader.php';
+require_once 'lib/Proem/Util/Autoloader.php';
-use Proem\Autoloader;
+use Proem\Util\Autoloader;
$loader = new AutoLoader();
$loader->attachNamespaces([
View
2 tests/lib/Proem/Tests/AutoloaderTest.php
@@ -26,7 +26,7 @@
namespace Proem\Tests;
-use Proem\Autoloader;
+use Proem\Util\Autoloader;
use Namespaced;
class AutoloaderTest extends \PHPUnit_Framework_TestCase
View
2 tests/lib/Proem/Tests/ControllerTest.php
@@ -26,7 +26,7 @@
namespace Proem\Tests;
-use Proem\Autoloader;
+use Proem\Util\Autoloader;
class ControllerTest extends \PHPUnit_Framework_TestCase
{
View
2 tests/lib/Proem/Tests/ExtTest.php
@@ -26,7 +26,7 @@
namespace Proem\Tests;
-use Proem\Autoloader,
+use Proem\Util\Autoloader,
MyApp\Module\Foo;
class ExtTest extends \PHPUnit_Framework_TestCase

0 comments on commit 7c8a433

Please sign in to comment.