update to 9.6.20 (no change)

raise dependencies

3 files changed, 79 insertions, 127 deletions

diff --git a/composer.json b/composer.json
index 42e16c6..78db08d 100644
--- a/composer.json
+++ b/composer.json
@@ -29,25 +29,25 @@
         "ext-mbstring": "*",
         "ext-xml": "*",
         "ext-xmlwriter": "*",
-        "doctrine/instantiator": "^1.3.1 || ^2",
-        "myclabs/deep-copy": "^1.10.1",
-        "phar-io/manifest": "^2.0.3",
-        "phar-io/version": "^3.0.2",
-        "phpunit/php-code-coverage": "^9.2.28",
-        "phpunit/php-file-iterator": "^3.0.5",
+        "doctrine/instantiator": "^1.5.0 || ^2",
+        "myclabs/deep-copy": "^1.12.0",
+        "phar-io/manifest": "^2.0.4",
+        "phar-io/version": "^3.2.1",
+        "phpunit/php-code-coverage": "^9.2.31",
+        "phpunit/php-file-iterator": "^3.0.6",
         "phpunit/php-invoker": "^3.1.1",
-        "phpunit/php-text-template": "^2.0.3",
-        "phpunit/php-timer": "^5.0.2",
-        "sebastian/cli-parser": "^1.0.1",
-        "sebastian/code-unit": "^1.0.6",
+        "phpunit/php-text-template": "^2.0.4",
+        "phpunit/php-timer": "^5.0.3",
+        "sebastian/cli-parser": "^1.0.2",
+        "sebastian/code-unit": "^1.0.8",
         "sebastian/comparator": "^4.0.8",
-        "sebastian/diff": "^4.0.3",
-        "sebastian/environment": "^5.1.3",
-        "sebastian/exporter": "^4.0.5",
-        "sebastian/global-state": "^5.0.1",
-        "sebastian/object-enumerator": "^4.0.3",
-        "sebastian/resource-operations": "^3.0.3",
-        "sebastian/type": "^3.2",
+        "sebastian/diff": "^4.0.6",
+        "sebastian/environment": "^5.1.5",
+        "sebastian/exporter": "^4.0.6",
+        "sebastian/global-state": "^5.0.7",
+        "sebastian/object-enumerator": "^4.0.4",
+        "sebastian/resource-operations": "^3.0.4",
+        "sebastian/type": "^3.2.1",
         "sebastian/version": "^3.0.2"
     },
     "config": {
diff --git a/makesrc.sh b/makesrc.sh
index c85b319..04ad6a0 100755
--- a/makesrc.sh
+++ b/makesrc.sh
@@ -5,10 +5,12 @@ DATE=$(sed    -n '/^%global gh_date/{s/.* //;p}'    $NAME.spec)
 OWNER=$(sed   -n '/^%global gh_owner/{s/.* //;p}'   $NAME.spec)
 PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec)
 VERSION=$(sed -n '/^%global upstream_version/{s/.* //;p}' $NAME.spec)
+MAJOR=$(sed   -n '/^%global ver_major/{s/.* //;p}'  $NAME.spec)
+MINOR=$(sed   -n '/^%global ver_minor/{s/.* //;p}'  $NAME.spec)
 COMMIT=$(sed  -n '/^%global gh_commit/{s/.* //;p}'  $NAME.spec)
 SHORT=${COMMIT:0:7}
 
-DATE=$(date -d "$DATE -4 days" +%Y-%m-%d)
+DATE=$(date -d "$DATE -1 week" +%Y-%m-%d)
 
 if [ -f $NAME-$VERSION-$SHORT.tgz ]; then
 	echo "$NAME-$VERSION-$SHORT.tgz already there"
@@ -17,7 +19,7 @@ else
 
 	echo "Cloning..."
 	rm -rf $PROJECT-$COMMIT
-	git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT || exit 1
+	git clone --branch $MAJOR.$MINOR --shallow-since=$DATE https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT || exit 1
 
 	echo "Getting commit..."
 	pushd $PROJECT-$COMMIT
diff --git a/phpunit9.spec b/phpunit9.spec
index c3ec06b..2211801 100644
--- a/phpunit9.spec
+++ b/phpunit9.spec
@@ -12,8 +12,8 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    a1a54a473501ef4cdeaae4e06891674114d79db8
-%global gh_date      2024-04-05
+%global gh_commit    49d7820565836236411f5dc002d16dd689cde42f
+%global gh_date      2024-07-10
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   phpunit
@@ -26,7 +26,7 @@
 %global ver_major    9
 %global ver_minor    6
 
-%global upstream_version 9.6.19
+%global upstream_version 9.6.20
 #global upstream_prever  dev
 
 Name:           %{pk_project}%{ver_major}
@@ -44,53 +44,27 @@ Patch0:         %{name}-rpm.patch
 
 BuildArch:      noarch
 BuildRequires:  php(language) >= 7.3
-# remirepo:1
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires:  (php-composer(doctrine/instantiator) >= 1.3.1         with php-composer(doctrine/instantiator) <  3)
-BuildRequires:  (php-composer(myclabs/deep-copy) >= 1.10.1            with php-composer(myclabs/deep-copy) <  2)
-BuildRequires:  (php-composer(phar-io/manifest) >= 2.0.3              with php-composer(phar-io/manifest) < 3)
-BuildRequires:  (php-composer(phar-io/version) >= 3.0.2               with php-composer(phar-io/version) <  4)
+BuildRequires:  (php-composer(doctrine/instantiator) >= 1.5.0         with php-composer(doctrine/instantiator) <  3)
+BuildRequires:  (php-composer(myclabs/deep-copy) >= 1.12.0            with php-composer(myclabs/deep-copy) <  2)
+BuildRequires:  (php-composer(phar-io/manifest) >= 2.0.4              with php-composer(phar-io/manifest) < 3)
+BuildRequires:  (php-composer(phar-io/version) >= 3.2.1               with php-composer(phar-io/version) <  4)
 BuildRequires:  (php-composer(phpspec/prophecy) >= 1.12.1             with php-composer(phpspec/prophecy) <  2)
-BuildRequires:  (php-composer(phpunit/php-code-coverage) >= 9.2.13    with php-composer(phpunit/php-code-coverage) <  10)
-BuildRequires:  (php-composer(phpunit/php-file-iterator) >= 3.0.4     with php-composer(phpunit/php-file-iterator) <  4)
+BuildRequires:  (php-composer(phpunit/php-code-coverage) >= 9.2.31    with php-composer(phpunit/php-code-coverage) <  10)
+BuildRequires:  (php-composer(phpunit/php-file-iterator) >= 3.0.6     with php-composer(phpunit/php-file-iterator) <  4)
 BuildRequires:  (php-composer(phpunit/php-invoker) >= 3.1             with php-composer(phpunit/php-invoker) <  4)
-BuildRequires:  (php-composer(phpunit/php-text-template) >= 2.0.2     with php-composer(phpunit/php-text-template) <  3)
-BuildRequires:  (php-composer(phpunit/php-timer) >= 5.0.1             with php-composer(phpunit/php-timer) < 6)
-BuildRequires:  (php-composer(sebastian/cli-parser) >= 1.0            with php-composer(sebastian/cli-parser) < 2)
-BuildRequires:  (php-composer(sebastian/code-unit) >= 1.0.5           with php-composer(sebastian/code-unit) < 2)
+BuildRequires:  (php-composer(phpunit/php-text-template) >= 2.0.4     with php-composer(phpunit/php-text-template) <  3)
+BuildRequires:  (php-composer(phpunit/php-timer) >= 5.0.3             with php-composer(phpunit/php-timer) < 6)
+BuildRequires:  (php-composer(sebastian/cli-parser) >= 1.0.2          with php-composer(sebastian/cli-parser) < 2)
+BuildRequires:  (php-composer(sebastian/code-unit) >= 1.0.8           with php-composer(sebastian/code-unit) < 2)
 BuildRequires:  (php-composer(sebastian/comparator) >= 4.0.8          with php-composer(sebastian/comparator) <  5)
-BuildRequires:  (php-composer(sebastian/diff) >= 4.0.2                with php-composer(sebastian/diff) <  5)
-BuildRequires:  (php-composer(sebastian/environment) >= 5.1.2         with php-composer(sebastian/environment) <  6)
-BuildRequires:  (php-composer(sebastian/exporter) >= 4.0.5            with php-composer(sebastian/exporter) <  5)
-BuildRequires:  (php-composer(sebastian/global-state) >= 5.0          with php-composer(sebastian/global-state) <  6)
-BuildRequires:  (php-composer(sebastian/object-enumerator) >= 4.0.2   with php-composer(sebastian/object-enumerator) <  5)
-BuildRequires:  (php-composer(sebastian/resource-operations) >= 3.0.2 with php-composer(sebastian/resource-operations) < 4)
-BuildRequires:  (php-composer(sebastian/type) >= 3.2                  with php-composer(sebastian/type) < 4)
+BuildRequires:  (php-composer(sebastian/diff) >= 4.0.6                with php-composer(sebastian/diff) <  5)
+BuildRequires:  (php-composer(sebastian/environment) >= 5.1.5         with php-composer(sebastian/environment) <  6)
+BuildRequires:  (php-composer(sebastian/exporter) >= 4.0.6            with php-composer(sebastian/exporter) <  5)
+BuildRequires:  (php-composer(sebastian/global-state) >= 5.0.7        with php-composer(sebastian/global-state) <  6)
+BuildRequires:  (php-composer(sebastian/object-enumerator) >= 4.0.4   with php-composer(sebastian/object-enumerator) <  5)
+BuildRequires:  (php-composer(sebastian/resource-operations) >= 3.0.4 with php-composer(sebastian/resource-operations) < 4)
+BuildRequires:  (php-composer(sebastian/type) >= 3.2.1                with php-composer(sebastian/type) < 4)
 BuildRequires:  (php-composer(sebastian/version) >= 3.0.1             with php-composer(sebastian/version) <  4)
-# remirepo:23
-%else
-BuildRequires:  php-doctrine-instantiator                   >= 1.3.1
-BuildRequires:  php-myclabs-deep-copy                       >= 1.10.1
-BuildRequires:  php-phar-io-manifest2                       >= 2.0.3
-BuildRequires:  php-phar-io-version3                        >= 3.0.2
-BuildRequires:  php-phpspec-prophecy                        >= 1.12.1
-BuildRequires:  php-phpunit-php-code-coverage9              >= 9.2.13
-BuildRequires:  php-phpunit-php-file-iterator3              >= 3.0.4
-BuildRequires:  php-phpunit-php-invoker3                    >= 3.1
-BuildRequires:  php-phpunit-php-text-template2              >= 2.0.2
-BuildRequires:  php-phpunit-php-timer5                      >= 5.0.1
-BuildRequires:  php-sebastian-cli-parser                    >= 1.0
-BuildRequires:  php-sebastian-code-unit                     >= 1.0.5
-BuildRequires:  php-sebastian-comparator4                   >= 4.0.8
-BuildRequires:  php-sebastian-diff4                         >= 4.0.2
-BuildRequires:  php-sebastian-environment5                  >= 5.1.2
-BuildRequires:  php-sebastian-exporter4                     >= 4.0.5
-BuildRequires:  php-sebastian-global-state5                 >= 5.0
-BuildRequires:  php-sebastian-object-enumerator4            >= 4.0.2
-BuildRequires:  php-sebastian-resource-operations3          >= 3.0.2
-BuildRequires:  php-sebastian-type3                         >= 3.2
-BuildRequires:  php-sebastian-version3                      >= 3.0.1
-%endif
 BuildRequires:  php-dom
 BuildRequires:  php-json
 BuildRequires:  php-mbstring
@@ -108,25 +82,25 @@ BuildRequires:  php-fedora-autoloader-devel >= 1.0.0
 #        "ext-mbstring": "*",
 #        "ext-xml": "*",
 #        "ext-xmlwriter": "*",
-#        "doctrine/instantiator": "^1.3.1 || ^2",
-#        "myclabs/deep-copy": "^1.10.1",
-#        "phar-io/manifest": "^2.0.3",
-#        "phar-io/version": "^3.0.2",
-#        "phpunit/php-code-coverage": "^9.2.28",
-#        "phpunit/php-file-iterator": "^3.0.5",
+#        "doctrine/instantiator": "^1.5.0 || ^2",
+#        "myclabs/deep-copy": "^1.12.0",
+#        "phar-io/manifest": "^2.0.4",
+#        "phar-io/version": "^3.2.1",
+#        "phpunit/php-code-coverage": "^9.2.31",
+#        "phpunit/php-file-iterator": "^3.0.6",
 #        "phpunit/php-invoker": "^3.1.1",
-#        "phpunit/php-text-template": "^2.0.3",
-#        "phpunit/php-timer": "^5.0.2",
-#        "sebastian/cli-parser": "^1.0.1",
-#        "sebastian/code-unit": "^1.0.6",
+#        "phpunit/php-text-template": "^2.0.4",
+#        "phpunit/php-timer": "^5.0.3",
+#        "sebastian/cli-parser": "^1.0.2",
+#        "sebastian/code-unit": "^1.0.8",
 #        "sebastian/comparator": "^4.0.8",
-#        "sebastian/diff": "^4.0.3",
-#        "sebastian/environment": "^5.1.3",
-#        "sebastian/exporter": "^4.0.5",
-#        "sebastian/global-state": "^5.0.1",
-#        "sebastian/object-enumerator": "^4.0.3",
-#        "sebastian/resource-operations": "^3.0.3",
-#        "sebastian/type": "^3.2",
+#        "sebastian/diff": "^4.0.6",
+#        "sebastian/environment": "^5.1.5",
+#        "sebastian/exporter": "^4.0.6",
+#        "sebastian/global-state": "^5.0.7",
+#        "sebastian/object-enumerator": "^4.0.4",
+#        "sebastian/resource-operations": "^3.0.4",
+#        "sebastian/type": "^3.2.1",
 #        "sebastian/version": "^3.0.2"
 Requires:       php(language) >= 7.3
 Requires:       php-cli
@@ -136,28 +110,26 @@ Requires:       php-libxml
 Requires:       php-mbstring
 Requires:       php-xml
 Requires:       php-xmlwriter
-# remirepo:1
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:       (php-composer(doctrine/instantiator) >= 1.3.1         with php-composer(doctrine/instantiator) <  3)
-Requires:       (php-composer(myclabs/deep-copy) >= 1.10.1            with php-composer(myclabs/deep-copy) <  2)
-Requires:       (php-composer(phar-io/manifest) >= 2.0.3              with php-composer(phar-io/manifest) < 3)
-Requires:       (php-composer(phar-io/version) >= 3.0.2               with php-composer(phar-io/version) < 4)
+Requires:       (php-composer(doctrine/instantiator) >= 1.5.0         with php-composer(doctrine/instantiator) <  3)
+Requires:       (php-composer(myclabs/deep-copy) >= 1.12.0            with php-composer(myclabs/deep-copy) <  2)
+Requires:       (php-composer(phar-io/manifest) >= 2.0.4              with php-composer(phar-io/manifest) < 3)
+Requires:       (php-composer(phar-io/version) >= 3.2.1               with php-composer(phar-io/version) < 4)
 Requires:       (php-composer(phpspec/prophecy) >= 1.12.1             with php-composer(phpspec/prophecy) <  2)
-Requires:       (php-composer(phpunit/php-code-coverage) >= 9.2.28    with php-composer(phpunit/php-code-coverage) <  10)
-Requires:       (php-composer(phpunit/php-file-iterator) >= 3.0.4     with php-composer(phpunit/php-file-iterator) <  4)
+Requires:       (php-composer(phpunit/php-code-coverage) >= 9.2.31    with php-composer(phpunit/php-code-coverage) <  10)
+Requires:       (php-composer(phpunit/php-file-iterator) >= 3.0.6     with php-composer(phpunit/php-file-iterator) <  4)
 Requires:       (php-composer(phpunit/php-invoker) >= 3.1             with php-composer(phpunit/php-invoker) <  4)
-Requires:       (php-composer(phpunit/php-text-template) >= 2.0.2     with php-composer(phpunit/php-text-template) <  3)
-Requires:       (php-composer(phpunit/php-timer) >= 5.0.1             with php-composer(phpunit/php-timer) < 6)
-Requires:       (php-composer(sebastian/cli-parser) >= 1.0            with php-composer(sebastian/cli-parser) < 2)
-Requires:       (php-composer(sebastian/code-unit) >= 1.0.5           with php-composer(sebastian/code-unit) < 2)
+Requires:       (php-composer(phpunit/php-text-template) >= 2.0.4     with php-composer(phpunit/php-text-template) <  3)
+Requires:       (php-composer(phpunit/php-timer) >= 5.0.3             with php-composer(phpunit/php-timer) < 6)
+Requires:       (php-composer(sebastian/cli-parser) >= 1.0.2          with php-composer(sebastian/cli-parser) < 2)
+Requires:       (php-composer(sebastian/code-unit) >= 1.0.8           with php-composer(sebastian/code-unit) < 2)
 Requires:       (php-composer(sebastian/comparator) >= 4.0.8          with php-composer(sebastian/comparator) <  5)
-Requires:       (php-composer(sebastian/diff) >= 4.0.2                with php-composer(sebastian/diff) <  5)
-Requires:       (php-composer(sebastian/environment) >= 5.1.2         with php-composer(sebastian/environment) <  6)
-Requires:       (php-composer(sebastian/exporter) >= 4.0.5            with php-composer(sebastian/exporter) <  5)
-Requires:       (php-composer(sebastian/global-state) >= 5.0          with php-composer(sebastian/global-state) <  6)
-Requires:       (php-composer(sebastian/object-enumerator) >= 4.0.2   with php-composer(sebastian/object-enumerator) <  5)
-Requires:       (php-composer(sebastian/resource-operations) >= 3.0.2 with php-composer(sebastian/resource-operations) <  4)
-Requires:       (php-composer(sebastian/type) >= 3.2                  with php-composer(sebastian/type) < 4)
+Requires:       (php-composer(sebastian/diff) >= 4.0.6                with php-composer(sebastian/diff) <  5)
+Requires:       (php-composer(sebastian/environment) >= 5.1.5         with php-composer(sebastian/environment) <  6)
+Requires:       (php-composer(sebastian/exporter) >= 4.0.6            with php-composer(sebastian/exporter) <  5)
+Requires:       (php-composer(sebastian/global-state) >= 5.0.7        with php-composer(sebastian/global-state) <  6)
+Requires:       (php-composer(sebastian/object-enumerator) >= 4.0.4   with php-composer(sebastian/object-enumerator) <  5)
+Requires:       (php-composer(sebastian/resource-operations) >= 3.0.4 with php-composer(sebastian/resource-operations) <  4)
+Requires:       (php-composer(sebastian/type) >= 3.2.1                with php-composer(sebastian/type) < 4)
 Requires:       (php-composer(sebastian/version) >= 3.0.1             with php-composer(sebastian/version) <  4)
 # From composer.json, "suggest": {
 #        "ext-soap": "*",
@@ -170,30 +142,6 @@ Recommends:     phpunit10
 %if 0%{?fedora} >= 38
 Recommends:     phpunit11
 %endif
-# remirepo:23
-%else
-Requires:       php-doctrine-instantiator                   >= 1.3.1
-Requires:       php-myclabs-deep-copy                       >= 1.10.1
-Requires:       php-phar-io-manifest2                       >= 2.0.3
-Requires:       php-phar-io-version3                        >= 3.0.2
-Requires:       php-phpspec-prophecy                        >= 1.12.1
-Requires:       php-phpunit-php-code-coverage9              >= 9.2.28
-Requires:       php-phpunit-php-file-iterator3              >= 3.0.4
-Requires:       php-phpunit-php-invoker3                    >= 3.1
-Requires:       php-phpunit-php-text-template2              >= 2.0.2
-Requires:       php-phpunit-php-timer5                      >= 5.0.1
-Requires:       php-sebastian-cli-parser                    >= 1.0
-Requires:       php-sebastian-code-unit                     >= 1.0.5
-Requires:       php-sebastian-comparator4                   >= 4.0.8
-Requires:       php-sebastian-diff4                         >= 4.0.2
-Requires:       php-sebastian-environment5                  >= 5.1.2
-Requires:       php-sebastian-exporter4                     >= 4.0.5
-Requires:       php-sebastian-global-state5                 >= 5.0
-Requires:       php-sebastian-object-enumerator4            >= 4.0.2
-Requires:       php-sebastian-resource-operations3          >= 3.0.2
-Requires:       php-sebastian-type3                         >= 3.2
-Requires:       php-sebastian-version3                      >= 3.0.1
-%endif
 # Autoloader
 Requires:       php-composer(fedora/autoloader)
 # From phpcompatinfo report for version 8.0.0
@@ -309,8 +257,6 @@ exit $ret
 
 
 %files
-# remirepo:1
-%{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc README.md ChangeLog-%{ver_major}.%{ver_minor}.md
 %doc composer.json
@@ -319,6 +265,10 @@ exit $ret
 
 
 %changelog
+* Thu Jul 11 2024 Remi Collet <remi@remirepo.net> - 9.6.20-1
+- update to 9.6.20 (no change)
+- raise dependencies
+
 * Fri Apr  5 2024 Remi Collet <remi@remirepo.net> - 9.6.19-1
 - update to 9.6.19 (no change)