Added namespace to everything including the future generated files in…

… source.
nickl- · May 25, 2012 · 2ff82ef · 2ff82ef · nickl- · May 26, 2012
1 parent 61704d3
commit 2ff82ef
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/config.php b/src/config.php
@@ -1,4 +1,6 @@
 <?php
+namespace DumbledORM;
+
 class DbConfig {
   const HOST = 'localhost';
   const PORT = 3306;

diff --git a/src/dumbledorm.php b/src/dumbledorm.php
@@ -1,4 +1,5 @@
 <?php
+namespace DumbledORM;
 /**
  *
  *  DumbledORM
@@ -104,7 +105,7 @@ public static function generateBase($prefix=null,$dir='model') {
         }
       }
     }
-    $basetables = "<?php\nspl_autoload_register(function(\$class) { @include(__DIR__.\"/\$class.class.php\"); });\n";
+    $basetables = "<?php\nnamespace DumbledORM;\n\nspl_autoload_register(function(\$class) { @include(__DIR__.\"/\$class.class.php\"); });\n";
     foreach ($tables as $table => $conf) {
       $relations = preg_replace('/[\n\t\s]+/','',var_export((array)@$conf['relations'],true));
       $meta = isset($conf['meta']) ? "\$meta_class = '{$conf['meta']['class']}', \$meta_field = '{$conf['meta']['field']}'," : '';
@@ -115,7 +116,7 @@ public static function generateBase($prefix=null,$dir='model') {
     foreach (array_keys($tables) as $table) {
       $file = "./$dir/$prefix".self::camelCase($table).'.class.php';
       if (!file_exists($file)) {
-        file_put_contents($file,"<?php\nclass ".$prefix.self::camelCase($table).' extends '.$prefix.self::camelCase($table).'Base {}');
+        file_put_contents($file,"<?php\nnamespace DumbledORM;\n\nclass ".$prefix.self::camelCase($table).' extends '.$prefix.self::camelCase($table).'Base {}');
       }
     }
   }

diff --git a/test/test.php b/test/test.php
@@ -1,7 +1,9 @@
 <?php
+namespace DumbledORM;
+
+require 'bootstrap.php';
 $dbname = DbConfig::DBNAME;
-require('dumbledorm.php');
-class OrmTestException extends Exception {}
+class OrmTestException extends \Exception {}
 class OrmTest {
   public static $fails = 0;
   public static function assertTrue($message,$test) {