remi pushed to php-phpunit-PHPUnit (f21). "detect and redirect to composer installed version #1157910"

[notifications at fedoraproject.org]

From e6d562a776caea1514a26199fd1f0917daea9fd7 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi at fedoraproject.org>
Date: Tue, 26 May 2015 09:16:12 +0200
Subject: detect and redirect to composer installed version #1157910


diff --git a/.gitignore b/.gitignore
index 3c1d7da..3ed58fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,3 +57,4 @@ clog
 /phpunit-4.6.2.tar.gz
 /phpunit-4.6.4.tar.gz
 /phpunit-4.6.5.tar.gz
+/phpunit-4.6.7.tar.gz
diff --git a/php-phpunit-PHPUnit.spec b/php-phpunit-PHPUnit.spec
index 0526b29..270fb5a 100644
--- a/php-phpunit-PHPUnit.spec
+++ b/php-phpunit-PHPUnit.spec
@@ -1,4 +1,4 @@
-# spec file for php-phpunit-PHPUnit
+# remirepo/fedora spec file for php-phpunit-PHPUnit
 #
 # Copyright (c) 2010-2015 Remi Collet
 # Copyright (c) 2006-2009 Christopher Stone
@@ -8,7 +8,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    1c54dd1d9a782d7c8715bb3604cde7b6e23c2614
+%global gh_commit    57bf06dd4eebe2a5ced79a8de71509e7d5c18b25
 %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.6.5
-Release:        1%{?dist}
+Version:        4.6.7
+Release:        2%{?dist}
 Summary:        The PHP Unit Testing framework
 
 Group:          Development/Libraries
@@ -197,6 +197,10 @@ fi
 
 
 %changelog
+* Tue May 26 2015 Remi Collet <remi at fedoraproject.org> - 4.6.7-2
+- detect and redirect to composer installed version #1157910
+- Update to 4.6.7 (no change)
+
 * Wed Apr 29 2015 Remi Collet <remi at fedoraproject.org> - 4.6.5-1
 - Update to 4.6.5
 
diff --git a/phpunit-rpm.patch b/phpunit-rpm.patch
index 03ace66..7392971 100644
--- a/phpunit-rpm.patch
+++ b/phpunit-rpm.patch
@@ -1,10 +1,10 @@
 diff -up ./phpunit.rpm ./phpunit
 --- ./phpunit.rpm	2015-01-17 12:24:41.000000000 +0100
 +++ ./phpunit	2015-01-18 08:52:50.896228541 +0100
-@@ -13,24 +13,7 @@ if (!ini_get('date.timezone')) {
+@@ -13,22 +13,11 @@
      ini_set('date.timezone', 'UTC');
  }
- 
+
 -foreach (array(__DIR__ . '/../../autoload.php', __DIR__ . '/../vendor/autoload.php', __DIR__ . '/vendor/autoload.php') as $file) {
 -    if (file_exists($file)) {
 -        define('PHPUNIT_COMPOSER_INSTALL', $file);
@@ -21,12 +21,14 @@ diff -up ./phpunit.rpm ./phpunit
 -        'php composer.phar install' . PHP_EOL
 -    );
 -    die(1);
--}
--
-+define ('PHPUNIT_COMPOSER_INSTALL', stream_resolve_include_path('PHPUnit/Autoload.php'));
++if (file_exists('./vendor/phpunit/phpunit/phpunit') && file_exists('./vendor/autoload.php')) {
++  echo "\n==== Redirecting to composer installed version in vendor/phpunit ====\n\n";
++  define ('PHPUNIT_COMPOSER_INSTALL', realpath('./vendor/autoload.php'));
++} else {
++  define ('PHPUNIT_COMPOSER_INSTALL', stream_resolve_include_path('PHPUnit/Autoload.php'));
+ }
+
  require PHPUNIT_COMPOSER_INSTALL;
- 
- PHPUnit_TextUI_Command::main();
 diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
 --- ./tests/bootstrap.php.rpm	2015-01-17 12:24:41.000000000 +0100
 +++ ./tests/bootstrap.php	2015-01-18 08:51:55.668966689 +0100
diff --git a/sources b/sources
index 7f284b6..de4907e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-535e30adef010bfe2e8f485438aca1a5  phpunit-4.6.5.tar.gz
+562f8a675e2678b439822baa547276a6  phpunit-4.6.7.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/php-phpunit-PHPUnit.git/commit/?h=f21&id=e6d562a776caea1514a26199fd1f0917daea9fd7