Merge remote-tracking branch 'upstream/develop' into dev-multi. Updated documentation to rat format, and tests to use phpunit.

(Resolved)Conflicts:
	README.markdown
	idiorm.php
	test/test_queries.php

1 files changed, 5 insertions, 5 deletions

diff --git a/test/test_classes.php b/test/test_classes.php
index cf805c0..77d67f3 100644
--- a/test/test_classes.php
+++ b/test/test_classes.php
@@ -5,7 +5,7 @@
      * Mock version of the PDOStatement class.
      *
      */
-    class DummyPDOStatement extends PDOStatement {
+    class MockPDOStatement extends PDOStatement {
 
         private $current_row = 0;
         /**
@@ -31,13 +31,13 @@
      * of the PDO API.
      *
      */
-    class DummyPDO extends PDO {
+    class MockPDO extends PDO {
 
         /**
          * Return a dummy PDO statement
          */
         public function prepare($statement, $driver_options=array()) {
-            $this->last_query = new DummyPDOStatement($statement);
+            $this->last_query = new MockPDOStatement($statement);
             return $this->last_query;
         }
     }
@@ -119,7 +119,7 @@
         /**
          * Report a passed test
          */
-        private static function report_pass($test_name) {
+        public static function report_pass($test_name) {
             echo self::format_line("PASS: $test_name", 'GREEN');
             self::$passed_tests[] = $test_name;
         }
@@ -127,7 +127,7 @@
         /**
          * Report a failed test
          */
-        private static function report_failure($test_name, $expected, $actual) {
+        public static function report_failure($test_name, $expected, $actual) {
             echo self::format_line("FAIL: $test_name", 'RED');
             echo self::format_line("Expected: $expected", 'RED');
             echo self::format_line("Actual: $actual", 'RED');