update to 2.0.0HEADmaster

rename to php-doctrine-instantiator2
install in /usr/share/php/Doctrine/Instantiator2
raise dependency on PHP 8.1

2 files changed, 27 insertions, 21 deletions

diff --git a/composer.json b/composer.json
index fab8172..179145e 100644
--- a/composer.json
+++ b/composer.json
@@ -16,17 +16,17 @@
         }
     ],
     "require": {
-        "php": "^7.1 || ^8.0"
+        "php": "^8.1"
     },
     "require-dev": {
         "ext-phar":                  "*",
         "ext-pdo":                   "*",
-        "doctrine/coding-standard":  "^9 || ^11",
-        "phpbench/phpbench":         "^0.16 || ^1",
-        "phpstan/phpstan":           "^1.4",
-        "phpstan/phpstan-phpunit":   "^1",
-        "phpunit/phpunit":           "^7.5 || ^8.5 || ^9.5",
-        "vimeo/psalm": "^4.30 || ^5.4"
+        "doctrine/coding-standard":  "^11",
+        "phpbench/phpbench":         "^1.2",
+        "phpstan/phpstan":           "^1.9.4",
+        "phpstan/phpstan-phpunit":   "^1.3",
+        "phpunit/phpunit":           "^9.5.27",
+        "vimeo/psalm":               "^5.4"
     },
     "autoload": {
         "psr-4": {
diff --git a/php-doctrine-instantiator2.spec b/php-doctrine-instantiator2.spec
index 3f8966f..d7d8e26 100644
--- a/php-doctrine-instantiator2.spec
+++ b/php-doctrine-instantiator2.spec
@@ -1,4 +1,4 @@
-# remirepo/fedora spec file for php-doctrine-instantiator
+# remirepo/fedora spec file for php-doctrine-instantiator2
 #
 # Copyright (c) 2014-2023 Remi Collet
 # License: CC-BY-SA
@@ -9,31 +9,31 @@
 
 # bootstrap needed when rebuilding PHPUnit for new major version
 %global bootstrap    0
-%global gh_commit    0a0fa9780f5d4e507415a065172d26a98d02047b
+%global gh_commit    c6222283fa3f4ac679f8b9ced9a4e23f163e80d0
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     doctrine
 %global gh_project   instantiator
-%global major        %nil
+%global major        2
 %if %{bootstrap}
 %global with_tests   0%{?_with_tests:1}
 %else
 %global with_tests   0%{!?_without_tests:1}
 %endif
 
-Name:           php-doctrine-instantiator
-Version:        1.5.0
+Name:           php-doctrine-instantiator%{major}
+Version:        2.0.0
 Release:        1%{?dist}
-Summary:        Instantiate objects in PHP without invoking their constructors
+Summary:        Instantiate objects in PHP without invoking their constructors, version %{major}
 
 License:        MIT
 URL:            https://github.com/%{gh_owner}/%{gh_project}
-Source0:        php-%{gh_owner}-%{gh_project}-%{version}-%{gh_short}.tgz
+Source0:        %{name}-%{version}-%{gh_short}.tgz
 Source1:        makesrc.sh
 
 BuildArch:      noarch
 BuildRequires:  php-fedora-autoloader-devel
 %if %{with_tests}
-BuildRequires:  php(language) >= 7.1
+BuildRequires:  php(language) >= 8.1
 BuildRequires:  php-phar
 BuildRequires:  php-pdo
 BuildRequires:  php-reflection
@@ -43,16 +43,14 @@ BuildRequires:  %{phpunit}
 %endif
 
 # From composer.json
-#        "php": "^7.1 || ^8.0"
-Requires:       php(language) >= 7.1
+#        "php": "^8.1"
+Requires:       php(language) >= 8.1
 # From phpcompatinfo report for version 1.1.0
 Requires:       php-reflection
 Requires:       php-spl
 # Autoloader
 Requires:       php-composer(fedora/autoloader)
 
-Obsoletes:      php-doctrine-instantiator11 < %{version}-%{release}
-Provides:       php-doctrine-instantiator11 = %{version}-%{release}
 Provides:       php-composer(doctrine/instantiator) = %{version}
 
 
@@ -60,6 +58,8 @@ Provides:       php-composer(doctrine/instantiator) = %{version}
 This library provides a way of avoiding usage of constructors when
 instantiating PHP classes.
 
+This package provides version %{major}.
+
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
@@ -87,7 +87,7 @@ mkdir vendor
     --template fedora \
     tests
 cat << 'EOF' | tee -a vendor/autoload.php
-require "%{buildroot}%{_datadir}/php/Doctrine/Instantiator/autoload.php";
+require "%{buildroot}%{_datadir}/php/Doctrine/Instantiator%{major}/autoload.php";
 Fedora\Autoloader\Autoload::addPsr0('DoctrineTest\\InstantiatorPerformance\\', dirname(__DIR__).'/tests');
 Fedora\Autoloader\Autoload::addPsr0('DoctrineTest\\InstantiatorTest\\', dirname(__DIR__).'/tests');
 Fedora\Autoloader\Autoload::addPsr0('DoctrineTest\\InstantiatorTestAsset\\', dirname(__DIR__).'/tests');
@@ -95,7 +95,7 @@ EOF
 
 : Run test suite
 ret=0
-for cmdarg in "php %{phpunit}" php80 php81 php82; do
+for cmdarg in "php %{phpunit}" php81 php82; do
   if which $cmdarg; then
     set $cmdarg
     $1 -d auto_prepend_file=vendor/autoload.php \
@@ -120,6 +120,12 @@ exit $ret
 
 %changelog
 * Tue Jan  3 2023 Remi Collet <remi@remirepo.net> - 1.5.0-1
+- update to 2.0.0
+- rename to php-doctrine-instantiator2
+- install in /usr/share/php/Doctrine/Instantiator2
+- raise dependency on PHP 8.1
+
+* Tue Jan  3 2023 Remi Collet <remi@remirepo.net> - 1.5.0-1
 - update to 1.5.0
 
 * Thu Mar  3 2022 Remi Collet <remi@remirepo.net> - 1.4.1-1