restructure testing, and update support files

auraphp · Mar 27, 2015 · fec7ddb · fec7ddb
1 parent 500e9d9
commit fec7ddb
Show file tree

Hide file tree

Showing 30 changed files with 10 additions and 26 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,8 +5,9 @@ php:
   - 5.5
   - 5.6
   - hhvm
+  - 7
 script:
-  - phpunit -c tests/unit/ --coverage-clover=coverage.clover
+  - phpunit --coverage-clover=coverage.clover
 after_script:
   - wget https://scrutinizer-ci.com/ocular.phar
   - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ although [PDO](http://php.net/PDO) in general is recommended.
 
 ### Installation
 
-This library requires PHP 5.3 or later, and has no userland dependencies.
+This library requires PHP 5.3 or later; we recommend using the latest available version of PHP as a matter of principle. It has no userland dependencies.
 
 It is installable and autoloadable via Composer as [aura/sqlquery](https://packagist.org/packages/aura/sqlquery).
 
@@ -20,7 +20,7 @@ Alternatively, [download a release](https://github.com/auraphp/Aura.SqlQuery/rel
 [![Code Coverage](https://scrutinizer-ci.com/g/auraphp/Aura.SqlQuery/badges/coverage.png?b=develop-2)](https://scrutinizer-ci.com/g/auraphp/Aura.SqlQuery/)
 [![Build Status](https://travis-ci.org/auraphp/Aura.SqlQuery.png?branch=develop-2)](https://travis-ci.org/auraphp/Aura.SqlQuery)
 
-To run the unit tests at the command line, issue `phpunit -c tests/unit/`. (This requires [PHPUnit][] to be available as `phpunit`.)
+To run the unit tests at the command line, issue `phpunit` at the package root. (This requires [PHPUnit][] to be available as `phpunit`.)
 
 [PHPUnit]: http://phpunit.de/manual/
 

diff --git a/autoload.php b/autoload.php
@@ -6,13 +6,9 @@
 
     // what prefixes should be recognized?
     $prefixes = array(
-        "{$ns}\_Config\\" => array(
-            __DIR__ . '/config',
-            __DIR__ . '/tests/container/src',
-        ),
         "{$ns}\\" => array(
             __DIR__ . '/src',
-            __DIR__ . '/tests/unit/src',
+            __DIR__ . '/tests',
         ),
     );
 

diff --git a/phpunit.php b/phpunit.php
@@ -0,0 +1,3 @@
+<?php
+error_reporting(E_ALL);
+require __DIR__ . '/autoload.php';
diff --git a/tests/unit/phpunit.xml → phpunit.xml.dist b/tests/unit/phpunit.xml → phpunit.xml.dist
@@ -1,7 +1,7 @@
-<phpunit bootstrap="./bootstrap.php">
+<phpunit bootstrap="./phpunit.php">
     <testsuites>
         <testsuite>
-            <directory>./src</directory>
+            <directory>./tests</directory>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/tests/unit/src/AbstractQueryTest.php → tests/AbstractQueryTest.php b/tests/unit/src/AbstractQueryTest.php → tests/AbstractQueryTest.php
diff --git a/tests/unit/src/Common/DeleteTest.php → tests/Common/DeleteTest.php b/tests/unit/src/Common/DeleteTest.php → tests/Common/DeleteTest.php
diff --git a/tests/unit/src/Common/InsertTest.php → tests/Common/InsertTest.php b/tests/unit/src/Common/InsertTest.php → tests/Common/InsertTest.php
diff --git a/tests/unit/src/Common/SelectTest.php → tests/Common/SelectTest.php b/tests/unit/src/Common/SelectTest.php → tests/Common/SelectTest.php
diff --git a/tests/unit/src/Common/UpdateTest.php → tests/Common/UpdateTest.php b/tests/unit/src/Common/UpdateTest.php → tests/Common/UpdateTest.php
diff --git a/tests/unit/src/FakeQuery.php → tests/FakeQuery.php b/tests/unit/src/FakeQuery.php → tests/FakeQuery.php
diff --git a/tests/unit/src/Mysql/DeleteTest.php → tests/Mysql/DeleteTest.php b/tests/unit/src/Mysql/DeleteTest.php → tests/Mysql/DeleteTest.php
diff --git a/tests/unit/src/Mysql/InsertTest.php → tests/Mysql/InsertTest.php b/tests/unit/src/Mysql/InsertTest.php → tests/Mysql/InsertTest.php
diff --git a/tests/unit/src/Mysql/SelectTest.php → tests/Mysql/SelectTest.php b/tests/unit/src/Mysql/SelectTest.php → tests/Mysql/SelectTest.php
diff --git a/tests/unit/src/Mysql/UpdateTest.php → tests/Mysql/UpdateTest.php b/tests/unit/src/Mysql/UpdateTest.php → tests/Mysql/UpdateTest.php
diff --git a/tests/unit/src/Pgsql/DeleteTest.php → tests/Pgsql/DeleteTest.php b/tests/unit/src/Pgsql/DeleteTest.php → tests/Pgsql/DeleteTest.php
diff --git a/tests/unit/src/Pgsql/InsertTest.php → tests/Pgsql/InsertTest.php b/tests/unit/src/Pgsql/InsertTest.php → tests/Pgsql/InsertTest.php
diff --git a/tests/unit/src/Pgsql/SelectTest.php → tests/Pgsql/SelectTest.php b/tests/unit/src/Pgsql/SelectTest.php → tests/Pgsql/SelectTest.php
diff --git a/tests/unit/src/Pgsql/UpdateTest.php → tests/Pgsql/UpdateTest.php b/tests/unit/src/Pgsql/UpdateTest.php → tests/Pgsql/UpdateTest.php
diff --git a/tests/unit/src/QueryFactoryTest.php → tests/QueryFactoryTest.php b/tests/unit/src/QueryFactoryTest.php → tests/QueryFactoryTest.php
diff --git a/tests/unit/src/QuoterTest.php → tests/QuoterTest.php b/tests/unit/src/QuoterTest.php → tests/QuoterTest.php
diff --git a/tests/unit/src/Sqlite/DeleteTest.php → tests/Sqlite/DeleteTest.php b/tests/unit/src/Sqlite/DeleteTest.php → tests/Sqlite/DeleteTest.php
diff --git a/tests/unit/src/Sqlite/InsertTest.php → tests/Sqlite/InsertTest.php b/tests/unit/src/Sqlite/InsertTest.php → tests/Sqlite/InsertTest.php
diff --git a/tests/unit/src/Sqlite/SelectTest.php → tests/Sqlite/SelectTest.php b/tests/unit/src/Sqlite/SelectTest.php → tests/Sqlite/SelectTest.php
diff --git a/tests/unit/src/Sqlite/UpdateTest.php → tests/Sqlite/UpdateTest.php b/tests/unit/src/Sqlite/UpdateTest.php → tests/Sqlite/UpdateTest.php
diff --git a/tests/unit/src/Sqlsrv/DeleteTest.php → tests/Sqlsrv/DeleteTest.php b/tests/unit/src/Sqlsrv/DeleteTest.php → tests/Sqlsrv/DeleteTest.php
diff --git a/tests/unit/src/Sqlsrv/InsertTest.php → tests/Sqlsrv/InsertTest.php b/tests/unit/src/Sqlsrv/InsertTest.php → tests/Sqlsrv/InsertTest.php
diff --git a/tests/unit/src/Sqlsrv/SelectTest.php → tests/Sqlsrv/SelectTest.php b/tests/unit/src/Sqlsrv/SelectTest.php → tests/Sqlsrv/SelectTest.php
diff --git a/tests/unit/src/Sqlsrv/UpdateTest.php → tests/Sqlsrv/UpdateTest.php b/tests/unit/src/Sqlsrv/UpdateTest.php → tests/Sqlsrv/UpdateTest.php
diff --git a/tests/unit/bootstrap.php b/tests/unit/bootstrap.php