From 0c93dea849804a1aa410372e055076796a80f334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Pr=C3=A9vot?= Date: Sun, 22 Mar 2015 15:56:11 -0400 Subject: [PATCH 1/2] Fix dependencies (fixes #11) RC1 is not compatible with @stable. --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 11ebfba..1c86142 100644 --- a/composer.json +++ b/composer.json @@ -21,8 +21,8 @@ "irc": "irc://irc.freenode.net/phpunit" }, "require": { - "php": ">=5.2.7", - "phpunit/phpunit": ">=3.6.0RC1@stable", + "php": ">=5.3.3", + "phpunit/phpunit": ">=3.6.0@stable", "ext-spl": "*" }, "autoload": { From 984067c3046368d230d29cc2c039800e9b433221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Pr=C3=A9vot?= Date: Sun, 22 Mar 2015 16:07:10 -0400 Subject: [PATCH 2/2] PHPUnit output changed --- Tests/Functional/default.phpt | 2 +- Tests/Functional/story.phpt | 2 +- Tests/Functional/testdox.phpt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Tests/Functional/default.phpt b/Tests/Functional/default.phpt index f8bbfbd..7bf29bc 100644 --- a/Tests/Functional/default.phpt +++ b/Tests/Functional/default.phpt @@ -10,7 +10,7 @@ require_once 'PHPUnit/Autoload.php'; PHPUnit_TextUI_Command::main(); ?> --EXPECTF-- -PHPUnit %s by Sebastian Bergmann. +PHPUnit %s by Sebastian Bergmann and contributors. ..... diff --git a/Tests/Functional/story.phpt b/Tests/Functional/story.phpt index 69adce9..0d70304 100644 --- a/Tests/Functional/story.phpt +++ b/Tests/Functional/story.phpt @@ -12,7 +12,7 @@ require_once 'PHPUnit/Autoload.php'; PHPUnit_TextUI_Command::main(); ?> --EXPECTF-- -PHPUnit %s by Sebastian Bergmann. +PHPUnit %s by Sebastian Bergmann and contributors. BowlingGameSpec [x] Score for gutter game is 0 diff --git a/Tests/Functional/testdox.phpt b/Tests/Functional/testdox.phpt index 75890a0..19f2c3b 100644 --- a/Tests/Functional/testdox.phpt +++ b/Tests/Functional/testdox.phpt @@ -11,7 +11,7 @@ require_once 'PHPUnit/Autoload.php'; PHPUnit_TextUI_Command::main(); ?> --EXPECTF-- -PHPUnit %s by Sebastian Bergmann. +PHPUnit %s by Sebastian Bergmann and contributors. BowlingGameSpec [x] Score for gutter game is 0