summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnant Narayanan <anant@kix.in>2013-08-30 13:26:50 -0700
committerAnant Narayanan <anant@kix.in>2013-08-30 13:26:50 -0700
commitb8acf5a5deab7b929a383c76470469baf68830ab (patch)
tree11727e2965a06973d2e152b456167ead69c2a717
parentc794eeba527537f9690c1157b9f7f71999ded4ce (diff)
parent66c3957571107fb35a0d441a9e109512cdc46f97 (diff)
downloadphp-jwt-b8acf5a5deab7b929a383c76470469baf68830ab.zip
php-jwt-b8acf5a5deab7b929a383c76470469baf68830ab.tar.gz
php-jwt-b8acf5a5deab7b929a383c76470469baf68830ab.tar.bz2
Merge pull request #3 from phansys/master
Improved test suite
-rw-r--r--.travis.yml12
-rw-r--r--README.md2
-rw-r--r--phpunit.xml.dist19
-rw-r--r--tests/JWTTest.php2
-rw-r--r--tests/autoload.php.dist17
-rw-r--r--tests/bootstrap.php7
6 files changed, 56 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..1ecd967
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,12 @@
+language: php
+
+php:
+ - 5.3
+ - 5.4
+ - 5.5
+
+before_script:
+ - wget -nc http://getcomposer.org/composer.phar
+ - php composer.phar install
+
+script: phpunit --configuration phpunit.xml.dist
diff --git a/README.md b/README.md
index 2f9e439..61989ae 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-
+[![Build Status](https://travis-ci.org/phansys/php-jwt.png?branch=master)](https://travis-ci.org/phansys/php-jwt)
PHP-JWT
=======
A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 0000000..9f85f5b
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit backupGlobals="false"
+ backupStaticAttributes="false"
+ colors="true"
+ convertErrorsToExceptions="true"
+ convertNoticesToExceptions="true"
+ convertWarningsToExceptions="true"
+ processIsolation="false"
+ stopOnFailure="false"
+ syntaxCheck="false"
+ bootstrap="tests/bootstrap.php"
+>
+ <testsuites>
+ <testsuite name="PHP JSON Web Token Test Suite">
+ <directory>./tests</directory>
+ </testsuite>
+ </testsuites>
+</phpunit>
diff --git a/tests/JWTTest.php b/tests/JWTTest.php
index db50ee6..a649051 100644
--- a/tests/JWTTest.php
+++ b/tests/JWTTest.php
@@ -1,7 +1,5 @@
<?php
-include_once 'Authentication/JWT.php';
-
class JWTTest extends PHPUnit_Framework_TestCase {
function testEncodeDecode() {
$msg = JWT::encode('abc', 'my_key');
diff --git a/tests/autoload.php.dist b/tests/autoload.php.dist
new file mode 100644
index 0000000..4533624
--- /dev/null
+++ b/tests/autoload.php.dist
@@ -0,0 +1,17 @@
+<?php
+
+// if the library is the project, try to use the composer's autoload for the tests
+$composerAutoload = __DIR__ . '/../vendor/autoload.php';
+
+if (is_file($composerAutoload)) {
+ include $composerAutoload;
+} else {
+ die('Unable to find autoload.php file, please use composer to load dependencies:
+
+wget http://getcomposer.org/composer.phar
+php composer.phar install
+
+Visit http://getcomposer.org/ for more information.
+
+');
+} \ No newline at end of file
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100644
index 0000000..326c216
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,7 @@
+<?php
+
+if (file_exists($file = __DIR__ . '/autoload.php')) {
+ require_once $file;
+} elseif (file_exists($file = __DIR__ . '/autoload.php.dist')) {
+ require_once $file;
+}