summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Autoload.php.in3
-rw-r--r--php-phpunit-PHPUnit.spec32
2 files changed, 23 insertions, 12 deletions
diff --git a/Autoload.php.in b/Autoload.php.in
index 6c8355a..f12fd6e 100644
--- a/Autoload.php.in
+++ b/Autoload.php.in
@@ -14,6 +14,8 @@ require_once 'SebastianBergmann/Exporter/autoload.php';
require_once 'SebastianBergmann/Version/autoload.php';
require_once 'SebastianBergmann/Comparator/autoload.php';
require_once 'SebastianBergmann/GlobalState/autoload.php';
+require_once 'Doctrine/Instantiator/autoload.php';
+require_once 'Prophecy/autoload.php';
$vendorDir = '/usr/share/php';
require_once $vendorDir . '/Symfony/Component/ClassLoader/UniversalClassLoader.php';
@@ -23,7 +25,6 @@ $loader = new UniversalClassLoader();
$loader->registerNamespaces(array(
'Symfony\\Component\\Yaml' => $vendorDir,
'Symfony\\Component\\ClassLoader' => $vendorDir,
- 'Doctrine\\Instantiator' => $vendorDir,
));
$loader->register();
diff --git a/php-phpunit-PHPUnit.spec b/php-phpunit-PHPUnit.spec
index 636be11..56efc29 100644
--- a/php-phpunit-PHPUnit.spec
+++ b/php-phpunit-PHPUnit.spec
@@ -8,7 +8,7 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit 2e8580deebb7d1ac92ac878595e6bffe01069c2a
+%global gh_commit 5b578d3865a9128b9c209b011fda6539ec06e7a5
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner sebastianbergmann
%global gh_project phpunit
@@ -17,7 +17,7 @@
%global pear_channel pear.phpunit.de
Name: php-phpunit-PHPUnit
-Version: 4.4.5
+Version: 4.5.0
Release: 1%{?dist}
Summary: The PHP Unit Testing framework
@@ -41,10 +41,11 @@ BuildRequires: php-composer(phpunit/php-text-template) >= 1.2
BuildRequires: php-composer(phpunit/php-code-coverage) >= 2.0
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(phpspec/prophecy) >= 1.3.1
+BuildRequires: php-composer(sebastian/comparator) >= 1.1
BuildRequires: php-composer(sebastian/diff) >= 1.1
-BuildRequires: php-composer(sebastian/environment) >= 1.1
-BuildRequires: php-composer(sebastian/exporter) >= 1.1
+BuildRequires: php-composer(sebastian/environment) >= 1.2
+BuildRequires: php-composer(sebastian/exporter) >= 1.2
BuildRequires: php-composer(sebastian/recursion-context) >= 1.0
BuildRequires: php-composer(sebastian/global-state) >= 1.0
BuildRequires: php-composer(sebastian/version) >= 1.0
@@ -59,6 +60,7 @@ BuildRequires: php-composer(phpunit/php-invoker) >= 1.1.0
# "phpunit/php-code-coverage": "~2.0",
# "phpunit/php-timer": "~1.0.2",
# "phpunit/phpunit-mock-objects": "~2.2",
+# "phpspec/prophecy": "~1.3.1",
# "symfony/yaml": "~2.0",
# "sebastian/comparator": "~1.0",
# "sebastian/diff": "~1.1",
@@ -83,16 +85,16 @@ Requires: php-composer(phpunit/php-timer) >= 1.0.2
Requires: php-composer(phpunit/php-timer) < 1.1
Requires: php-composer(phpunit/phpunit-mock-objects) >= 2.3
Requires: php-composer(phpunit/phpunit-mock-objects) < 3
-Requires: php-composer(sebastian/comparator) >= 1.0
+Requires: php-composer(phpspec/prophecy) >= 1.3.1
+Requires: php-composer(phpspec/prophecy) < 1.4
+Requires: php-composer(sebastian/comparator) >= 1.1
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.1
+Requires: php-composer(sebastian/environment) >= 1.2
Requires: php-composer(sebastian/environment) < 2
-Requires: php-composer(sebastian/exporter) >= 1.1
+Requires: php-composer(sebastian/exporter) >= 1.2
Requires: php-composer(sebastian/exporter) < 2
-Requires: php-composer(sebastian/recursion-context) >= 1.0
-Requires: php-composer(sebastian/recursion-context) < 2
Requires: php-composer(sebastian/global-state) >= 1.0
Requires: php-composer(sebastian/global-state) < 2
Requires: php-composer(sebastian/version) >= 1.0
@@ -109,10 +111,11 @@ Requires: php-spl
Requires: php-composer(phpunit/php-invoker) >= 1.1
Requires: php-composer(phpunit/php-invoker) < 2
# For our autoload patch
-Requires: php-composer(doctrine/instantiator) >= 1.0.1
+Requires: php-composer(doctrine/instantiator) >= 1.0.4
Requires: php-composer(doctrine/instantiator) < 2
Requires: php-composer(symfony/class-loader) >= 2.0
Requires: php-composer(symfony/class-loader) < 3
+Requires: php-composer(sebastian/recursion-context) >= 1.0
# From phpcompatinfo report for version 4.0.18
Requires: php-date
Requires: php-libxml
@@ -204,6 +207,13 @@ fi
%changelog
+* Fri Feb 13 2015 Remi Collet <remi@fedoraproject.org> - 4.5.0-1
+- Update to 4.5.0
+- add dependency on phpspec/prophecy
+- raise dependencies on sebastian/comparator >= 1.1,
+ sebastian/environment >= 1.2, sebastian/exporter >= 1.2
+ and doctrine/instantiator >= 1.0.4 (for autoloader file)
+
* Tue Jan 27 2015 Remi Collet <remi@fedoraproject.org> - 4.4.5-1
- Update to 4.4.5 (no change)