Merge pull request #185 from tamtamchik/composer-tests

added phpunit to composer and tests updated

.gitignore

@@ -0,0 +1,6 @@
+composer.phar
+vendor/
+
+# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
+# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
+composer.lock

composer.json

@@ -16,5 +16,8 @@
     },
     "autoload": {
         "files": [ "flight/autoload.php", "flight/Flight.php" ]
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~4.6"
     }
 }

tests/AutoloadTest.php

@@ -6,7 +6,7 @@
  * @license     MIT, http://flightphp.com/license
  */
 
-require_once 'PHPUnit/Autoload.php';
+require_once 'vendor/autoload.php';
 require_once __DIR__.'/../flight/autoload.php';
 
 class AutoloadTest extends PHPUnit_Framework_TestCase

tests/DispatcherTest.php

@@ -6,7 +6,7 @@
  * @license     MIT, http://flightphp.com/license
  */
 
-require_once 'PHPUnit/Autoload.php';
+require_once 'vendor/autoload.php';
 require_once __DIR__.'/classes/Hello.php';
 
 class DispatcherTest extends PHPUnit_Framework_TestCase

tests/FilterTest.php

@@ -6,7 +6,7 @@
  * @license     MIT, http://flightphp.com/license
  */
 
-require_once 'PHPUnit/Autoload.php';
+require_once 'vendor/autoload.php';
 require_once __DIR__.'/../flight/autoload.php';
 
 class FilterTest extends PHPUnit_Framework_TestCase

tests/FlightTest.php

@@ -6,7 +6,7 @@
  * @license     MIT, http://flightphp.com/license
  */
 
-require_once 'PHPUnit/Autoload.php';
+require_once 'vendor/autoload.php';
 require_once __DIR__.'/../flight/Flight.php';
 
 class FlightTest extends PHPUnit_Framework_TestCase

tests/LoaderTest.php

@@ -6,7 +6,7 @@
  * @license     MIT, http://flightphp.com/license
  */
 
-require_once 'PHPUnit/Autoload.php';
+require_once 'vendor/autoload.php';
 require_once __DIR__.'/classes/User.php';
 require_once __DIR__.'/classes/Factory.php';
 

tests/MapTest.php

@@ -6,7 +6,7 @@
  * @license     MIT, http://flightphp.com/license
  */
 
-require_once 'PHPUnit/Autoload.php';
+require_once 'vendor/autoload.php';
 require_once __DIR__.'/../flight/autoload.php';
 require_once __DIR__.'/classes/Hello.php';
 

tests/README.md

@@ -4,6 +4,7 @@ This directory contains unit tests for Flight. The tests were written for PHPUni
 
 To run the tests do:
 
-    phpunit tests
+    composer install
+    vendor/bin/phpunit tests
 
 Learn more about PHPUnit at [http://www.phpunit.de](http://www.phpunit.de/manual/current/en/index.html)

tests/RedirectTest.php

@@ -6,7 +6,7 @@
  * @license     MIT, http://flightphp.com/license
  */
 
-require_once 'PHPUnit/Autoload.php';
+require_once 'vendor/autoload.php';
 require_once __DIR__.'/../flight/autoload.php';
 
 class RedirectTest extends PHPUnit_Framework_TestCase

tests/RegisterTest.php

@@ -6,7 +6,7 @@
  * @license     MIT, http://flightphp.com/license
  */
 
-require_once 'PHPUnit/Autoload.php';
+require_once 'vendor/autoload.php';
 require_once __DIR__.'/../flight/autoload.php';
 require_once __DIR__.'/classes/User.php';
 

tests/RenderTest.php

@@ -6,7 +6,7 @@
  * @license     MIT, http://flightphp.com/license
  */
 
-require_once 'PHPUnit/Autoload.php';
+require_once 'vendor/autoload.php';
 require_once __DIR__.'/../flight/Flight.php';
 
 class RenderTest extends PHPUnit_Framework_TestCase

tests/RequestTest.php

@@ -6,7 +6,7 @@
  * @license     MIT, http://flightphp.com/license
  */
 
-require_once 'PHPUnit/Autoload.php';
+require_once 'vendor/autoload.php';
 require_once __DIR__.'/../flight/autoload.php';
 
 class RequestTest extends PHPUnit_Framework_TestCase

tests/RouterTest.php

@@ -6,7 +6,7 @@
  * @license     MIT, http://flightphp.com/license
  */
 
-require_once 'PHPUnit/Autoload.php';
+require_once 'vendor/autoload.php';
 require_once __DIR__.'/../flight/autoload.php';
 
 class RouterTest extends PHPUnit_Framework_TestCase

tests/VariableTest.php

@@ -6,7 +6,7 @@
  * @license     MIT, http://flightphp.com/license
  */
 
-require_once 'PHPUnit/Autoload.php';
+require_once 'vendor/autoload.php';
 require_once __DIR__.'/../flight/autoload.php';
 
 class VariableTest extends PHPUnit_Framework_TestCase

tests/ViewTest.php

@@ -6,7 +6,7 @@
  * @license     MIT, http://flightphp.com/license
  */
 
-require_once 'PHPUnit/Autoload.php';
+require_once 'vendor/autoload.php';
 require_once __DIR__.'/../flight/autoload.php';
 
 class ViewTest extends PHPUnit_Framework_TestCase