update to 2.0.0

rename to php-webmozart-assert2
install in /usr/share/php/Webmozart/Assert2
raise dependency on PHP 8.2

3 files changed, 36 insertions, 19 deletions

diff --git a/composer.json b/composer.json
index dcaf97a..18f625c 100644
--- a/composer.json
+++ b/composer.json
@@ -11,10 +11,14 @@
         {
             "name": "Bernhard Schussek",
             "email": "bschussek@gmail.com"
+        },
+        {
+            "name": "Woody Gilk",
+            "email": "woody.gilk@gmail.com"
         }
     ],
     "require": {
-        "php": "^7.2 || ^8.0",
+        "php": "^8.2",
         "ext-ctype": "*",
         "ext-date": "*",
         "ext-filter": "*"
@@ -37,7 +41,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.10-dev"
+            "dev-feature/2-0": "2.0-dev"
         }
     },
     "scripts": {
@@ -47,6 +51,13 @@
             "composer --working-dir=tools/psalm install",
             "composer --working-dir=tools/roave-bc-check install"
         ],
+        "update-tools": [
+            "composer --working-dir=tools/php-cs-fixer update",
+            "composer --working-dir=tools/phpunit update",
+            "composer --working-dir=tools/psalm update",
+            "composer --working-dir=tools/roave-bc-check update"
+        ],
+        "generate-mixin": "php bin/generate.php",
         "bc-check": "./tools/roave-bc-check/vendor/bin/roave-backward-compatibility-check",
         "cs-check" : "./tools/php-cs-fixer/vendor/bin/php-cs-fixer check",
         "cs-fix": "./tools/php-cs-fixer/vendor/bin/php-cs-fixer fix",
diff --git a/php-webmozart-assert2-get-source.sh b/php-webmozart-assert2-get-source.sh
index b2ac62b..81a3c06 100755
--- a/php-webmozart-assert2-get-source.sh
+++ b/php-webmozart-assert2-get-source.sh
@@ -54,7 +54,8 @@ pushd $TEMP_DIR
 
     pushd $GIT_DIR
         print "Checking out commit..."
-        $GIT checkout $GIT_COMMIT
+        $GIT checkout $GIT_COMMIT || exit 1
+        cp composer.json ${SPEC_DIR}
     popd
 
     TAR_DIR=${GIT_NAME}-${GIT_COMMIT}
diff --git a/php-webmozart-assert2.spec b/php-webmozart-assert2.spec
index f0abd52..ea24121 100644
--- a/php-webmozart-assert2.spec
+++ b/php-webmozart-assert2.spec
@@ -1,6 +1,4 @@
-# remirepo spec file for php-webmozart-assert, from
-#
-# Fedora spec file for php-webmozart-assert
+# remirepo/Fedora spec file for php-webmozart-assert
 #
 # Copyright (c) 2016-2025 Shawn Iwinski <shawn@iwin.ski>
 #
@@ -14,18 +12,19 @@
 %global bootstrap 0
 %global github_owner     webmozart
 %global github_name      assert
-%global github_version   1.12.1
-%global github_commit    9be6926d8b485f55b9229203f962b51ed377ba68
+%global github_version   2.0.0
+%global github_commit    1b34b004e35a164bc5bb6ebd33c844b2d8069a54
+%global major            2
 
 %global composer_vendor  webmozart
 %global composer_project assert
 
-# "php": "^7.2 || ^8.0"
-%global php_min_ver 7.2
+# "php": "^8.2"
+%global php_min_ver 8.2
 
 # PHPUnit
-%global phpunit_require phpunit8
-%global phpunit_exec    phpunit8
+%global phpunit_require phpunit11
+%global phpunit_exec    phpunit11
 
 %if %{bootstrap}
 # Build using "--with tests" to enable tests
@@ -37,7 +36,7 @@
 
 %{!?phpdir:  %global phpdir  %{_datadir}/php}
 
-Name:          php-%{composer_vendor}-%{composer_project}
+Name:          php-%{composer_vendor}-%{composer_project}%{major}
 Version:       %{github_version}
 Release:       1%{?github_release}%{?dist}
 Summary:       Assertions to validate method input/output with nice error messages
@@ -83,7 +82,7 @@ needed to write a safe implementation.
 All assertions in the Assert class throw an \InvalidArgumentException if they
 fail.
 
-Autoloader: %{phpdir}/Webmozart/Assert/autoload.php
+Autoloader: %{phpdir}/Webmozart/Assert%{major}/autoload.php
 
 
 %prep
@@ -105,7 +104,7 @@ AUTOLOAD
 
 %install
 mkdir -p %{buildroot}%{phpdir}/Webmozart
-cp -rp src %{buildroot}%{phpdir}/Webmozart/Assert
+cp -rp src %{buildroot}%{phpdir}/Webmozart/Assert%{major}
 
 
 %check
@@ -120,13 +119,13 @@ BOOTSTRAP
 : Upstream tests
 RETURN_CODE=0
 PHPUNIT=$(which %{phpunit_exec})
-for PHP_EXEC in php81 php82 php83 php84 php85; do
+for PHP_EXEC in php82 php83 php84 php85; do
     if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then
         $PHP_EXEC \
-            -d auto_prepend_file=%{buildroot}%{phpdir}/Webmozart/Assert/autoload.php \
+            -d auto_prepend_file=%{buildroot}%{phpdir}/Webmozart/Assert%{major}/autoload.php \
             $PHPUNIT \
                 --bootstrap bootstrap.php \
-                --verbose || RETURN_CODE=1
+                || RETURN_CODE=1
     fi
 done
 exit $RETURN_CODE
@@ -140,10 +139,16 @@ exit $RETURN_CODE
 %doc *.md
 %doc composer.json
 %dir %{phpdir}/Webmozart
-     %{phpdir}/Webmozart/Assert
+     %{phpdir}/Webmozart/Assert%{major}
 
 
 %changelog
+* Thu Dec 25 2025 Remi Collet <remi@remirepo.net> - 2.0.0-1
+- update to 2.0.0
+- rename to php-webmozart-assert2
+- install in /usr/share/php/Webmozart/Assert2
+- raise dependency on PHP 8.2
+
 * Thu Oct 30 2025 Remi Collet <remi@remirepo.net> - 1.12.1-1
 - update to 1.12.1 (no change)