Fixed autoloader (Close #6)

atoum · Feb 21, 2015 · 75ee8a6 · 75ee8a6
1 parent a7c7a33
commit 75ee8a6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/.atoum.php b/.atoum.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
+require_once __DIR__ . DIRECTORY_SEPARATOR . 'autoloader.php';
 
 use mageekguy\atoum\visibility;
 

diff --git a/.bootstrap.atoum.php b/.bootstrap.atoum.php
@@ -1,3 +1,8 @@
 <?php
 
-require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
+if (is_file($vendorAutoloader = __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php'))
+{
+    require_once $vendorAutoloader;
+}
+
+require_once __DIR__ . DIRECTORY_SEPARATOR . 'autoloader.php';
diff --git a/autoloader.php b/autoloader.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace mageekguy\atoum\jsonSchema;
+namespace mageekguy\atoum\visibility;
 
 use mageekguy\atoum;
 
 atoum\autoloader::get()
-	->addNamespaceAlias('atoum\jsonSchema', __NAMESPACE__)
+	->addNamespaceAlias('atoum\visibility', __NAMESPACE__)
 	->addDirectory(__NAMESPACE__, __DIR__ . DIRECTORY_SEPARATOR . 'classes');
-;
+;
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
         }
     ],
     "require-dev": {
-        "atoum/atoum": "~1.0"
+        "atoum/atoum": "<3.0"
     },
     "autoload": {
         "psr-4": {