PSR-4 comliant tests

phpunit.xml

@@ -1,4 +1,4 @@
-<phpunit>
+<phpunit bootstrap="tests/autoload.php">
     <php>
         <ini name="display_errors" value="true"/>
     </php>

tests/Api.php

@@ -1,4 +1,5 @@
 <?php
+namespace PhpCrudApi\Tests;
 
 require_once(__DIR__ . '/../api.php');
 
@@ -12,12 +13,12 @@ class Api
     protected $config;
 
     /**
-     * @var PHP_CRUD_API_Test
+     * @var PhpCrudApi\Tests\BaseTest
      */
     protected $test;
 
     /**
-     * @var PHP_CRUD_API
+     * @var \PHP_CRUD_API
      */
     protected $api;
 
@@ -34,7 +35,7 @@ class Api
         $query = isset($url['query'])?$url['query']:'';
         parse_str($query,$get);
 
-        $this->api = new PHP_CRUD_API(array(
+        $this->api = new \PHP_CRUD_API(array(
             'dbengine'=>$this->config['dbengine'],
             'hostname'=>$this->config['hostname'],
             'username'=>$this->config['username'],

tests/Config.php.dist

@@ -1,4 +1,5 @@
 <?php
+namespace PhpCrudApi\Tests;
 
 class Config
 {

tests/Config.php.travis

@@ -1,4 +1,5 @@
 <?php
+namespace PhpCrudApi\Tests;
 
 class Config
 {

tests/MysqlTest.php

@@ -1,6 +1,5 @@
 <?php
-
-require_once(__DIR__ . '/Tests.php');
+namespace PhpCrudApi\Tests;
 
 class MysqlTest extends Tests
 {

tests/PostgresqlTest.php

@@ -1,6 +1,5 @@
 <?php
-
-require_once(__DIR__ . '/Tests.php');
+namespace PhpCrudApi\Tests;
 
 class PostgresqlTest extends Tests
 {

tests/SqlServerTest.php

@@ -1,6 +1,5 @@
 <?php
-
-require_once(__DIR__ . '/Tests.php');
+namespace PhpCrudApi\Tests;
 
 class SqlServerTest extends Tests
 {

tests/SqliteTest.php

@@ -1,6 +1,5 @@
 <?php
-
-require_once(__DIR__ . '/Tests.php');
+namespace PhpCrudApi\Tests;
 
 class SqliteTest extends Tests
 {
@@ -21,10 +20,10 @@ class SqliteTest extends Tests
      */
     public function connect($config)
     {
-        $db = new SQLite3($config['database']);
+        $db = new \SQLite3($config['database']);
 
         if (!$db) {
-            die("Could not open '$database' SQLite database: ".SQLite3::lastErrorMsg().' ('.SQLite3::lastErrorCode().")\n");
+            die("Could not open '$database' SQLite database: ".\SQLite3::lastErrorMsg().' ('.\SQLite3::lastErrorCode().")\n");
         }
 
         return $db;
@@ -49,7 +48,7 @@ class SqliteTest extends Tests
     {
         $major = 3;
         $minor = 0;
-        $version = SQLite3::version();
+        $version = \SQLite3::version();
         $v = explode('.',$version['versionString']);
         if ($v[0]<$major || ($v[0]==$major && $v[1]<$minor)) {
             die("Detected SQLite $v[0].$v[1], but only $major.$minor and up are supported\n");

tests/TestBase.php

@@ -1,8 +1,7 @@
 <?php
+namespace PhpCrudApi\Tests;
 
-require_once(__DIR__ . '/Config.php');
-
-abstract class TestBase extends PHPUnit_Framework_TestCase
+abstract class TestBase extends \PHPUnit_Framework_TestCase
 {
     public static function setUpBeforeClass()
     {

tests/Tests.php

@@ -1,7 +1,5 @@
 <?php
-
-require_once(__DIR__ . '/TestBase.php');
-require_once(__DIR__ . '/Api.php');
+namespace PhpCrudApi\Tests;
 
 abstract class Tests extends TestBase
 {

tests/autoload.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * An example of a project-specific implementation.
+ *
+ * After registering this autoload function with SPL, the following line
+ * would cause the function to attempt to load the \Foo\Bar\Baz\Qux class
+ * from /path/to/project/src/Baz/Qux.php:
+ *
+ *      new \Foo\Bar\Baz\Qux;
+ *
+ * @param string $class The fully-qualified class name.
+ * @return void
+ */
+spl_autoload_register(function ($class) {
+
+    // project-specific namespace prefix
+    $prefix = 'PhpCrudApi\\Tests\\';
+
+    // base directory for the namespace prefix
+    $base_dir = __DIR__ . '/';
+
+    // does the class use the namespace prefix?
+    $len = strlen($prefix);
+    if (strncmp($prefix, $class, $len) !== 0) {
+        // no, move to the next registered autoloader
+        return;
+    }
+
+    // get the relative class name
+    $relative_class = substr($class, $len);
+
+    // replace the namespace prefix with the base directory, replace namespace
+    // separators with directory separators in the relative class name, append
+    // with .php
+    $file = $base_dir . str_replace('\\', '/', $relative_class) . '.php';
+
+    // if the file exists, require it
+    if (file_exists($file)) {
+        require $file;
+    }
+});