update to 2.1.0

raise dependency on phpspec/prophecy 1.18
allow phpunit9 or phpunit10

2 files changed, 63 insertions, 14 deletions

diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..83a8818
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,37 @@
+{
+    "name": "phpspec/prophecy-phpunit",
+    "description": "Integrating the Prophecy mocking library in PHPUnit test cases",
+    "keywords": ["Phpunit", "Prophecy"],
+    "homepage": "http://phpspec.net",
+    "type": "library",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Christophe Coevoet",
+            "email": "stof@notk.org"
+        }
+    ],
+    "minimum-stability": "dev",
+    "prefer-stable": true,
+    "require": {
+        "php": "^7.3 || ^8",
+        "phpspec/prophecy": "^1.18",
+        "phpunit/phpunit":"^9.1 || ^10.1"
+    },
+    "autoload": {
+        "psr-4": {
+            "Prophecy\\PhpUnit\\": "src"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Prophecy\\PhpUnit\\Tests\\Fixtures\\": "fixtures",
+            "Prophecy\\PhpUnit\\Tests\\": "tests"
+        }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0-dev"
+        }
+    }
+}
diff --git a/php-phpspec-prophecy-phpunit.spec b/php-phpspec-prophecy-phpunit.spec
index 9ed8f00..c2697fb 100644
--- a/php-phpspec-prophecy-phpunit.spec
+++ b/php-phpspec-prophecy-phpunit.spec
@@ -9,13 +9,13 @@
 
 %bcond_without       tests
 
-%global gh_commit    9f26c224a2fa335f33e6666cc078fbf388255e87
+%global gh_commit    29f8114c2c319a4308e6b070902211e062efa392
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     phpspec
 %global gh_project   prophecy-phpunit
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        2.0.2
+Version:        2.1.0
 Release:        1%{?dist}
 Summary:        Integrating the Prophecy mocking library in PHPUnit test cases
 
@@ -29,11 +29,12 @@ BuildRequires:  php(language) >= 7.3
 %if %{with tests}
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(phpspec/prophecy) >= 1.3   with php-composer(phpspec/prophecy) < 2)
+BuildRequires: (php-composer(phpspec/prophecy) >= 1.18  with php-composer(phpspec/prophecy) < 2)
 # remirepo:3
 %else
-BuildRequires:  php-phpspec-prophecy           >= 1.3
+BuildRequires:  php-phpspec-prophecy           >= 1.18
 %endif
+BuildRequires:  phpunit10 >= 10.1
 BuildRequires:  phpunit9 >= 9.1
 %endif
 # Autoloader
@@ -41,17 +42,18 @@ BuildRequires:  php-fedora-autoloader-devel
 
 # from composer.json, "requires": {
 #        "php": "^7.3 || ^8",
-#        "phpspec/prophecy": "^1.3",
+#        "phpspec/prophecy": "^1.18",
 #        "phpunit/phpunit":"^9.1"
 Requires:       php(language) >= 7.3
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:      (php-composer(phpspec/prophecy) >= 1.3   with php-composer(phpspec/prophecy) < 2)
-# remirepo:3
+Requires:      (php-composer(phpspec/prophecy) >= 1.18  with php-composer(phpspec/prophecy) < 2)
+Requires:      (phpunit9 >= 9.1 or phpunit10 >= 10.1)
+# remirepo:4
 %else
-Requires:       php-phpspec-prophecy           >= 1.3
-%endif
+Requires:       php-phpspec-prophecy           >= 1.18
 Requires:       phpunit9 >= 9.1
+%endif
 # From phpcompatinfo report for version 2.0.1
 #none
 # Autoloader
@@ -90,11 +92,11 @@ cp -pr src/* %{buildroot}%{_datadir}/php/Prophecy/PhpUnit/
 %if %{with tests}
 : Dev autoloader
 mkdir vendor
-phpab --output vendor/autoload.php fixtures tests
+phpab --output vendor/autoload.php.in fixtures tests
 
-cat << 'EOF' | tee -a vendor/autoload.php
+cat << 'EOF' | tee -a vendor/autoload.php.in
 require_once '%{buildroot}%{_datadir}/php/Prophecy/PhpUnit/autoload.php';
-require_once '%{_datadir}/php/PHPUnit9/autoload.php';
+require_once '%{_datadir}/php/@PHPUNIT@/autoload.php';
 EOF
 
 : check autoloader
@@ -105,10 +107,15 @@ sed -e 's:src/::' -i tests/MockFailure.phpt
 
 : upstream test suite
 ret=0
-for cmd in php php80 php81 php82; do
+for cmd in php php81 php82 php83; do
   if which $cmd; then
+	sed -e 's/@PHPUNIT@/PHPUnit9/' vendor/autoload.php.in > vendor/autoload.php
     $cmd -d auto_prepend_file=vendor/autoload.php \
-      %{_bindir}/phpunit9 || ret=1
+      %{_bindir}/phpunit9 --no-coverage|| ret=1
+
+	sed -e 's/@PHPUNIT@/PHPUnit10/' vendor/autoload.php.in > vendor/autoload.php
+    $cmd -d auto_prepend_file=vendor/autoload.php \
+      %{_bindir}/phpunit10 --no-coverage|| ret=1
   fi
 done
 exit $ret
@@ -127,6 +134,11 @@ exit $ret
 
 
 %changelog
+* Mon Dec 11 2023 Remi Collet <remi@remirepo.net> - 2.1.0-1
+- update to 2.1.0
+- raise dependency on phpspec/prophecy 1.18
+- allow phpunit9 or phpunit10
+
 * Wed Apr 19 2023 Remi Collet <remi@remirepo.net> - 2.0.2-1
 - update to 2.0.2