update to 1.10.3

allow phpdocumentor/reflection-docblock 5.0

(cherry picked from commit 16349df7fe)
(cherry picked from commit 856441cc7d)

.gitignore

@@ -16,3 +16,7 @@ clog
 /php-phpspec-prophecy-1.7.6-33a7e3c.tgz
 /php-phpspec-prophecy-1.8.0-4ba436b.tgz
 /php-phpspec-prophecy-1.8.1-1927e75.tgz
+/php-phpspec-prophecy-1.9.0-f6811d9.tgz
+/php-phpspec-prophecy-1.10.1-cbe1df6.tgz
+/php-phpspec-prophecy-1.10.2-b4400ef.tgz
+/php-phpspec-prophecy-1.10.3-451c3cd.tgz

php-phpspec-prophecy-autoload.php

@@ -9,7 +9,9 @@ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
 
 // Dependencies
 require_once 'Doctrine/Instantiator/autoload.php';
-if ($dep = stream_resolve_include_path('phpDocumentor/Reflection/DocBlock4/autoload.php')) {
+if ($dep = stream_resolve_include_path('phpDocumentor/Reflection/DocBlock5/autoload.php')) {
+  require_once $dep;
+} else if ($dep = stream_resolve_include_path('phpDocumentor/Reflection/DocBlock4/autoload.php')) {
   require_once $dep;
 } else if ($dep = stream_resolve_include_path('phpDocumentor/Reflection/DocBlock/autoload.php')) {
   require_once $dep;
@@ -22,10 +24,13 @@ if ($dep = stream_resolve_include_path('phpDocumentor/Reflection/DocBlock4/autol
 unset($dep);
 
 if (!class_exists('SebastianBergmann\\Comparator\\Comparator')) { // v2 from phpunit, v1 from phpspec
-  require_once (stream_resolve_include_path('SebastianBergmann/Comparator3/autoload.php') ?:
+  require_once (stream_resolve_include_path('SebastianBergmann/Comparator4/autoload.php') ?:
+               (stream_resolve_include_path('SebastianBergmann/Comparator3/autoload.php') ?:
                (stream_resolve_include_path('SebastianBergmann/Comparator2/autoload.php') ?:
-                'SebastianBergmann/Comparator/autoload.php'));
+                'SebastianBergmann/Comparator/autoload.php')));
 }
 if (!class_exists('SebastianBergmann\\RecursionContext\\Context')) { // v3 from phpunit, v2 from phpspec (via exporter)
-  require_once (stream_resolve_include_path('SebastianBergmann/RecursionContext3/autoload.php') ?: 'SebastianBergmann/RecursionContext/autoload.php');
+  require_once (stream_resolve_include_path('SebastianBergmann/RecursionContext4/autoload.php') ?:
+               (stream_resolve_include_path('SebastianBergmann/RecursionContext3/autoload.php') ?:
+                'SebastianBergmann/RecursionContext/autoload.php'));
 }

php-phpspec-prophecy.spec

@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    1927e75f4ed19131ec9bcc3b002e07fb1173ee76
+%global gh_commit    451c3cd1418cf640de218914901e51b064abb093
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     phpspec
 %global gh_project   prophecy
@@ -19,7 +19,7 @@
 %endif
 
 Name:           php-phpspec-prophecy
-Version:        1.8.1
+Version:        1.10.3
 Release:        1%{?dist}
 Summary:        Highly opinionated mocking framework for PHP
 
@@ -43,14 +43,14 @@ BuildRequires:  php-composer(fedora/autoloader)
 
 # from composer.json, "requires": {
 #        "php":                               "^5.3|^7.0",
-#        "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
-#        "sebastian/comparator":              "^1.1|^2.0|^3.0",
+#        "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0",
+#        "sebastian/comparator":              "^1.2.3|^2.0|^3.0|^4.0",
 #        "doctrine/instantiator":             "^1.0.2",
-#        "sebastian/recursion-context":       "^1.0|^2.0|^3.0"
+#        "sebastian/recursion-context":       "^1.0|^2.0|^3.0|^4.0"
 Requires:       php(language) >= 5.3
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:       (php-composer(phpdocumentor/reflection-docblock) >= 2.0   with php-composer(phpdocumentor/reflection-docblock) < 5)
-Requires:       (php-composer(sebastian/comparator)              >= 1.1   with php-composer(sebastian/comparator)              < 4)
+Requires:       (php-composer(phpdocumentor/reflection-docblock) >= 2.0   with php-composer(phpdocumentor/reflection-docblock) < 6)
+Requires:       (php-composer(sebastian/comparator)              >= 1.2.3 with php-composer(sebastian/comparator)              < 5)
 # recursion-context will be pulled by phpspec or phpunit or phpunit6
 #Requires:      (php-composer(sebastian/recursion-context)       >= 1.0   with php-composer(sebastian/recursion-context)       < 4)
 # use 1.0.4 to ensure we have the autoloader
@@ -59,7 +59,7 @@ Requires:       (php-composer(doctrine/instantiator)             >= 1.0.4 with p
 Requires:       php-composer(phpdocumentor/reflection-docblock) >= 2.0
 # ignore v4 for now
 Requires:       php-composer(phpdocumentor/reflection-docblock) <  4
-Requires:       php-composer(sebastian/comparator)              >= 1.1
+Requires:       php-composer(sebastian/comparator)              >= 1.2.3
 Requires:       php-composer(sebastian/comparator)              <  3
 # recursion-context will be pulled by phpspec or phpunit or phpunit6
 #Requires:       php-composer(sebastian/recursion-context)       >= 1.0
@@ -135,7 +135,24 @@ exit $ret
 %{_datadir}/php/Prophecy
 
 
+# TODO ignore phpdocumentor/reflection-docblock 5.0
+# not yet packaged
+
 %changelog
+* Fri Mar  6 2020 Remi Collet <remi@remirepo.net> - 1.10.3-1
+- update to 1.10.3
+- allow phpdocumentor/reflection-docblock 5.0
+
+* Tue Jan 21 2020 Remi Collet <remi@remirepo.net> - 1.10.2-1
+- update to 1.10.2
+- allow sebastian/comparator 4 and sebastian/recursion-context 4
+
+* Fri Jan  3 2020 Remi Collet <remi@remirepo.net> - 1.10.1-1
+- update to 1.10.1
+
+* Fri Oct  4 2019 Remi Collet <remi@remirepo.net> - 1.9.0-1
+- update to 1.9.0
+
 * Thu Jun 13 2019 Remi Collet <remi@remirepo.net> - 1.8.1-1
 - update to 1.8.1
 

sources

@@ -1 +1 @@
-SHA512 (php-phpspec-prophecy-1.8.1-1927e75.tgz) = af79e9075c138fdc7cb3f316db7b5de0141ec9d2c02ea7fe891c0cfa5e52c939303aa387e40dc03f88fd794009c729ba7dc59ac79d1dec9d22c678594c549731
+SHA512 (php-phpspec-prophecy-1.10.3-451c3cd.tgz) = 5808e2cc28effdca81e0907fae0be4faa9d9daad533b6d4c641375c3acfd72b14bd508daf4e6e47047377a0565642d03556eea7914c2cf48cba0f6dcf0fadcfe