Merge branch 'release/0.4.1'

This commit is contained in:
Alex Bilbie 2013-01-02 22:36:48 +00:00
commit b4e8c27618
6 changed files with 12 additions and 10 deletions

View File

@ -4,4 +4,5 @@ php:
- 5.3 - 5.3
- 5.4 - 5.4
script: phpunit --coverage-text --configuration build/phpunit.xml before_script: composer install
script: phpunit -c build/phpunit.xml

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit colors="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false"> <phpunit colors="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" bootstrap="../tests/Bootstrap.php">
<testsuites> <testsuites>
<testsuite name="Authentication Server"> <testsuite name="Authentication Server">
<directory suffix="test.php">../tests/authentication</directory> <directory suffix="test.php">../tests/authentication</directory>
@ -17,7 +17,8 @@
</blacklist> </blacklist>
</filter> </filter>
<logging> <logging>
<log type="coverage-html" target="coverage" title="lncd/OAuth" charset="UTF-8" yui="true" highlight="true" lowUpperBound="35" highLowerBound="70"/> <log type="coverage-html" target="coverage" title="lncd/OAuth" charset="UTF-8" yui="true" highlight="true" lowUpperBound="50" highLowerBound="90"/>
<log type="coverage-text" target="php://stdout" title="lncd/OAuth" charset="UTF-8" yui="true" highlight="true" lowUpperBound="50" highLowerBound="90"/>
<log type="coverage-clover" target="logs/clover.xml"/> <log type="coverage-clover" target="logs/clover.xml"/>
<log type="junit" target="logs/junit.xml" logIncompleteSkipped="false"/> <log type="junit" target="logs/junit.xml" logIncompleteSkipped="false"/>
</logging> </logging>

View File

@ -1,7 +1,7 @@
{ {
"name": "lncd/oauth2", "name": "lncd/oauth2",
"description": "OAuth 2.0 Framework", "description": "OAuth 2.0 Framework",
"version": "0.4", "version": "0.4.1",
"homepage": "https://github.com/lncd/OAuth2", "homepage": "https://github.com/lncd/OAuth2",
"license": "MIT", "license": "MIT",
"require": { "require": {

6
tests/Bootstrap.php Normal file
View File

@ -0,0 +1,6 @@
<?php
if ( ! @include_once __DIR__ . '/../vendor/autoload.php')
{
exit("You must set up the project dependencies, run the following commands:\n> wget http://getcomposer.org/composer.phar\n> php composer.phar install\n");
}

View File

@ -4,9 +4,6 @@ class Authentication_Server_test extends PHPUnit_Framework_TestCase
{ {
public function setUp() public function setUp()
{ {
require_once 'src/OAuth2/Authentication/Server.php';
require_once 'src/OAuth2/Authentication/Database.php';
$this->oauth = new Oauth2\Authentication\Server(); $this->oauth = new Oauth2\Authentication\Server();
require_once 'database_mock.php'; require_once 'database_mock.php';

View File

@ -4,9 +4,6 @@ class Resource_Server_test extends PHPUnit_Framework_TestCase {
function setUp() function setUp()
{ {
require_once 'src/OAuth2/Resource/Server.php';
require_once 'src/OAuth2/Resource/Database.php';
require_once('database_mock.php'); require_once('database_mock.php');
$this->server = new Oauth2\Resource\Server(); $this->server = new Oauth2\Resource\Server();
$this->db = new ResourceDB(); $this->db = new ResourceDB();