[php-phpunit-PHPUnit/epel7] update to 4.3.2
Remi Collet
remi at fedoraproject.org
Fri Oct 17 12:25:15 UTC 2014
commit d85855b020624b57fb5b19281bcd708ea6d0aaad
Author: Remi Collet <remi at fedoraproject.org>
Date: Fri Oct 17 14:17:29 2014 +0200
update to 4.3.2
(cherry picked from commit f4b85c2e79bef0123505f40e846fa766e661f8d9)
.gitignore | 1 +
php-phpunit-PHPUnit.spec | 15 ++++++---
phpunit-colors.patch | 77 ++++++++++++++++++++++++---------------------
sources | 2 +-
4 files changed, 53 insertions(+), 42 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fe220e9..e17b0b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@ clog
/phpunit-4.2.2.tar.gz
/phpunit-4.2.4.tar.gz
/phpunit-4.3.0.tar.gz
+/phpunit-4.3.2.tar.gz
diff --git a/php-phpunit-PHPUnit.spec b/php-phpunit-PHPUnit.spec
index 0d44ccd..035e329 100644
--- a/php-phpunit-PHPUnit.spec
+++ b/php-phpunit-PHPUnit.spec
@@ -8,7 +8,7 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit 6913ac6c2f71ce18ff09b605df2fa37a6d789fd9
+%global gh_commit 02dd047049564f98f796789ec4207ee8f99bc3d4
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner sebastianbergmann
%global gh_project phpunit
@@ -17,8 +17,8 @@
%global pear_channel pear.phpunit.de
Name: php-phpunit-PHPUnit
-Version: 4.3.0
-Release: 2%{?dist}
+Version: 4.3.2
+Release: 1%{?dist}
Summary: The PHP Unit Testing framework
Group: Development/Libraries
@@ -44,7 +44,7 @@ BuildRequires: php-composer(phpunit/php-timer) >= 1.0.2
BuildRequires: php-composer(phpunit/phpunit-mock-objects) >= 2.3
BuildRequires: php-composer(sebastian/comparator) >= 1.0
BuildRequires: php-composer(sebastian/diff) >= 1.1
-BuildRequires: php-composer(sebastian/environment) >= 1.0
+BuildRequires: php-composer(sebastian/environment) >= 1.1
BuildRequires: php-composer(sebastian/exporter) >= 1.0
BuildRequires: php-composer(sebastian/version) >= 1.0
BuildRequires: php-composer(symfony/yaml) >= 2.0
@@ -84,7 +84,7 @@ Requires: php-composer(sebastian/comparator) >= 1.0
Requires: php-composer(sebastian/comparator) < 2
Requires: php-composer(sebastian/diff) >= 1.1
Requires: php-composer(sebastian/diff) < 2
-Requires: php-composer(sebastian/environment) >= 1.0
+Requires: php-composer(sebastian/environment) >= 1.1
Requires: php-composer(sebastian/environment) < 2
Requires: php-composer(sebastian/exporter) >= 1.0
Requires: php-composer(sebastian/exporter) < 2
@@ -193,6 +193,11 @@ fi
%changelog
+* Thu Oct 16 2014 Remi Collet <remi at fedoraproject.org> - 4.3.2-1
+- Update to 4.3.2
+- new upstream patch for "no colors" patch
+- raise dependency on sebastian/environment >= 1.1
+
* Mon Oct 6 2014 Remi Collet <remi at fedoraproject.org> - 4.3.0-2
- only enable colors when output to a terminal (from 4.4)
- open https://github.com/sebastianbergmann/phpunit/pull/1458
diff --git a/phpunit-colors.patch b/phpunit-colors.patch
index 847d46c..9c0a8f9 100644
--- a/phpunit-colors.patch
+++ b/phpunit-colors.patch
@@ -1,42 +1,47 @@
-From 591efd8fad55a526f021cad9c6cbcd9081df8969 Mon Sep 17 00:00:00 2001
-From: Remi Collet <fedora at famillecollet.com>
-Date: Mon, 6 Oct 2014 10:54:54 +0200
-Subject: [PATCH] only enable colors when output to a terminal (not to a file)
+From 3d56c46afb9ed10b0d248fb0ea698aa22d939421 Mon Sep 17 00:00:00 2001
+From: Sebastian Bergmann <sb at sebastian-bergmann.de>
+Date: Tue, 7 Oct 2014 11:29:29 +0200
+Subject: [PATCH] Rework 591efd8fad55a526f021cad9c6cbcd9081df8969
---
- src/TextUI/Command.php | 7 +++++--
- src/Util/Configuration.php | 3 +++
- 2 files changed, 8 insertions(+), 2 deletions(-)
+ composer.json | 2 +-
+ src/TextUI/ResultPrinter.php | 6 +++++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
-diff --git a/src/TextUI/Command.php b/src/TextUI/Command.php
-index 929ca36..42b08b6 100644
---- a/src/TextUI/Command.php
-+++ b/src/TextUI/Command.php
-@@ -278,8 +278,11 @@ protected function handleArguments(array $argv)
+diff --git a/composer.json b/composer.json
+index 9dc9950..ae6ff27 100644
+--- a/composer.json
++++ b/composer.json
+@@ -30,7 +30,7 @@
+ "symfony/yaml": "~2.0",
+ "sebastian/comparator": "~1.0",
+ "sebastian/diff": "~1.1",
+- "sebastian/environment": "~1.0",
++ "sebastian/environment": "~1.1",
+ "sebastian/exporter": "~1.0",
+ "sebastian/version": "~1.0",
+ "ext-dom": "*",
+diff --git a/src/TextUI/ResultPrinter.php b/src/TextUI/ResultPrinter.php
+index ca16c8a..e701e33 100644
+--- a/src/TextUI/ResultPrinter.php
++++ b/src/TextUI/ResultPrinter.php
+@@ -43,6 +43,8 @@
+ * @since File available since Release 2.0.0
+ */
- foreach ($this->options[0] as $option) {
- switch ($option[0]) {
-- case '--colors': {
-- $this->arguments['colors'] = true;
-+ case '--colors':
-+ if (function_exists("posix_isatty") && !posix_isatty(STDOUT)) {
-+ $this->arguments['colors'] = false;
-+ } else {
-+ $this->arguments['colors'] = true;
- }
- break;
-
-diff --git a/src/Util/Configuration.php b/src/Util/Configuration.php
-index 9ddcfb8..0fcc5fb 100644
---- a/src/Util/Configuration.php
-+++ b/src/Util/Configuration.php
-@@ -582,6 +582,9 @@ public function getPHPUnitConfiguration()
- $result['colors'] = $this->getBoolean(
- (string) $root->getAttribute('colors'), false
- );
-+ if ($result['colors'] && function_exists("posix_isatty") && !posix_isatty(STDOUT)) {
-+ $result['colors'] = false;
-+ }
++use SebastianBergmann\Environment\Console;
++
+ /**
+ * Prints the result of a TextUI TestRunner run.
+ *
+@@ -147,7 +149,9 @@ public function __construct($out = null, $verbose = false, $colors = false, $deb
}
- /**
+ if (is_bool($colors)) {
+- $this->colors = $colors;
++ $console = new Console;
++
++ $this->colors = $colors && $console->hasColorSupport();
+ } else {
+ throw PHPUnit_Util_InvalidArgumentHelper::factory(3, 'boolean');
+ }
diff --git a/sources b/sources
index d14b4ad..195b2ae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-10ad5881ba62ee42c8b942296d729777 phpunit-4.3.0.tar.gz
+1c5ecf78d913308381326e820e01e272 phpunit-4.3.2.tar.gz
More information about the scm-commits
mailing list