Skip to content

Commit 48b6c56

Browse files
author
Marc Juchli
committed
Merge branch 'release/1.1.0'
Conflicts: Tests/bootstrap.php
2 parents 212841e + 9a33dcb commit 48b6c56

File tree

4 files changed

+41
-0
lines changed

4 files changed

+41
-0
lines changed

.travis.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
language: php
2+
3+
php:
4+
- 5.3
5+
- 5.4
6+
- 5.5
7+
8+
env:
9+
- SYMFONY_VERSION=2.1.*
10+
- SYMFONY_VERSION=2.2.*
11+
- SYMFONY_VERSION=2.3.*
12+
- SYMFONY_VERSION=dev-master
13+
14+
before_script:
15+
- composer require symfony/framework-bundle:${SYMFONY_VERSION} --no-update
16+
- composer update --dev
17+
18+
script: phpunit --coverage-text

Tests/bootstrap.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
namespace Codag\PredictionIOBundle\Tests;
1212

13+
use RuntimeException;
14+
1315
$file = __DIR__.'/../vendor/autoload.php';
1416
if (!file_exists($file)) {
1517
throw new RuntimeException('Install dependencies to run test suite.');

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"keywords": ["predictionio", "api"],
66
"homepage": "http://prediction.io",
77
"license": "Apache-2.0",
8+
"minimum-stability": "dev",
89
"authors": [
910
{
1011
"name": "Codag",

phpunit.xml.dist

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<phpunit bootstrap="./Tests/bootstrap.php" color="true">
4+
5+
<testsuites>
6+
<testsuite name="PredicionIOBundle Test Suite" bootstrap="./Tests/bootstrap.php">
7+
<directory suffix="Test.php">./Tests</directory>
8+
</testsuite>
9+
</testsuites>
10+
11+
<filter>
12+
<whitelist>
13+
<directory>./</directory>
14+
<exclude>
15+
<directory>./Resources</directory>
16+
<directory>./Tests</directory>
17+
</exclude>
18+
</whitelist>
19+
</filter>
20+
</phpunit>

0 commit comments

Comments
 (0)