diff options
| author | Remi Collet <remi@remirepo.net> | 2018-10-18 12:21:32 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2018-10-18 12:21:32 +0200 |
| commit | f024463bfd96d093dc0862be01673c8d4293ab83 (patch) | |
| tree | 350b2d2be09f6860f216533762d3db87c69f8997 | |
| parent | 1d432219d76a19373a57cbd2125dbacb4a60518f (diff) | |
update to 7.4.1
allow sebastian/environment 4
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | phpunit7.spec | 19 |
2 files changed, 14 insertions, 7 deletions
diff --git a/composer.json b/composer.json index 76336de..a295cc6 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ "phpunit/php-timer": "^2.0", "sebastian/comparator": "^3.0", "sebastian/diff": "^3.0", - "sebastian/environment": "^3.1", + "sebastian/environment": "^3.1 || ^4.0", "sebastian/exporter": "^3.1", "sebastian/global-state": "^2.0", "sebastian/object-enumerator": "^3.0.3", diff --git a/phpunit7.spec b/phpunit7.spec index 0c3218f..8e5f171 100644 --- a/phpunit7.spec +++ b/phpunit7.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit f3837fa1e07758057ae06e8ddec6d06ba183f126 +%global gh_commit c5a120ade60992bd671a912188ee9ee9f8083bbd #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -24,7 +24,7 @@ %global php_home %{_datadir}/php %global ver_major 7 %global ver_minor 4 -%global ver_patch 0 +%global ver_patch 1 %global specrel 1 Name: %{pk_project}%{ver_major} @@ -54,7 +54,7 @@ BuildRequires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-co BuildRequires: (php-composer(phpunit/php-timer) >= 2.0 with php-composer(phpunit/php-timer) < 3) BuildRequires: (php-composer(sebastian/comparator) >= 3.0 with php-composer(sebastian/comparator) < 4) BuildRequires: (php-composer(sebastian/diff) >= 3.0 with php-composer(sebastian/diff) < 4) -BuildRequires: (php-composer(sebastian/environment) >= 3.1 with php-composer(sebastian/environment) < 4) +BuildRequires: (php-composer(sebastian/environment) >= 3.1 with php-composer(sebastian/environment) < 5) BuildRequires: (php-composer(sebastian/exporter) >= 3.1 with php-composer(sebastian/exporter) < 4) BuildRequires: (php-composer(sebastian/global-state) >= 2.0 with php-composer(sebastian/global-state) < 3) BuildRequires: (php-composer(sebastian/object-enumerator) >= 3.0.3 with php-composer(sebastian/object-enumerator) < 4) @@ -109,7 +109,7 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "phpunit/php-timer": "^2.0", # "sebastian/comparator": "^3.0", # "sebastian/diff": "^3.0", -# "sebastian/environment": "^3.1", +# "sebastian/environment": "^3.1 || ^4.0", # "sebastian/exporter": "^3.1", # "sebastian/global-state": "^2.0", # "sebastian/object-enumerator": "^3.0.3", @@ -135,7 +135,7 @@ Requires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-co Requires: (php-composer(phpunit/php-timer) >= 2.0 with php-composer(phpunit/php-timer) < 3) Requires: (php-composer(sebastian/comparator) >= 3.0 with php-composer(sebastian/comparator) < 4) Requires: (php-composer(sebastian/diff) >= 3.0 with php-composer(sebastian/diff) < 4) -Requires: (php-composer(sebastian/environment) >= 3.1 with php-composer(sebastian/environment) < 4) +Requires: (php-composer(sebastian/environment) >= 3.1 with php-composer(sebastian/environment) < 5) Requires: (php-composer(sebastian/exporter) >= 3.1 with php-composer(sebastian/exporter) < 4) Requires: (php-composer(sebastian/global-state) >= 2.0 with php-composer(sebastian/global-state) < 3) Requires: (php-composer(sebastian/object-enumerator) >= 3.0.3 with php-composer(sebastian/object-enumerator) < 4) @@ -211,7 +211,10 @@ cat << 'EOF' | tee -a src/autoload.php '%{php_home}/Prophecy/autoload.php', '%{php_home}/SebastianBergmann/Diff3/autoload.php', // Before comparator which may load v2 '%{php_home}/SebastianBergmann/Comparator3/autoload.php', - '%{php_home}/SebastianBergmann/Environment3/autoload.php', + [ + '%{php_home}/SebastianBergmann/Environment4/autoload.php', + '%{php_home}/SebastianBergmann/Environment3/autoload.php', + ], '%{php_home}/SebastianBergmann/Exporter3/autoload.php', '%{php_home}/SebastianBergmann/GlobalState2/autoload.php', '%{php_home}/SebastianBergmann/ObjectEnumerator3/autoload.php', @@ -273,6 +276,10 @@ exit $ret %changelog +* Thu Oct 18 2018 Remi Collet <remi@remirepo.net> - 7.4.1-1 +- update to 7.4.1 +- allow sebastian/environment 4 + * Fri Oct 5 2018 Remi Collet <remi@remirepo.net> - 7.4.0-1 - update to 7.4.0 - raise dependency on sebastian/resource-operations 2.0 |