From 81f7dd3af1b614145b0b4d4c5d7c94f73a72a3ac Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 9 Sep 2022 09:32:05 +0200 Subject: [PATCH 1/2] v2.0.5 (cherry picked from commit 0c43cbd5b20b618d79119d8077184852d4143147) --- .gitignore | 1 + composer.json | 17 +++++++++++------ php-doctrine-inflector2.spec | 15 +++++++++------ sources | 2 +- 4 files changed, 22 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 4d81af1..86ca142 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /php-doctrine-inflector2-2.0.3-9cf661f4eb38f7c881cac67c75ea9b00bf97b210.tar.gz /php-doctrine-inflector2-2.0.4-8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89.tar.gz +/php-doctrine-inflector2-2.0.5-ade2b3bbfb776f27f0558e26eed43b5d9fe1b392.tar.gz diff --git a/composer.json b/composer.json index f08fdc3..87da3e2 100644 --- a/composer.json +++ b/composer.json @@ -16,12 +16,12 @@ "php": "^7.2 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^8.2", - "phpstan/phpstan": "^0.12", - "phpstan/phpstan-phpunit": "^0.12", - "phpstan/phpstan-strict-rules": "^0.12", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", - "vimeo/psalm": "^4.10" + "doctrine/coding-standard": "^9", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-phpunit": "^1.1", + "phpstan/phpstan-strict-rules": "^1.3", + "phpunit/phpunit": "^8.5 || ^9.5", + "vimeo/psalm": "^4.25" }, "autoload": { "psr-4": { @@ -32,5 +32,10 @@ "psr-4": { "Doctrine\\Tests\\Inflector\\": "tests/Doctrine/Tests/Inflector" } + }, + "config": { + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true + } } } diff --git a/php-doctrine-inflector2.spec b/php-doctrine-inflector2.spec index 6bf08d7..d82e143 100644 --- a/php-doctrine-inflector2.spec +++ b/php-doctrine-inflector2.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-doctrine-inflector2 # -# Copyright (c) 2013-2021 Shawn Iwinski, Remi Collet +# Copyright (c) 2013-2022 Shawn Iwinski, Remi Collet # # License: MIT # http://opensource.org/licenses/MIT @@ -10,9 +10,9 @@ %global github_owner doctrine %global github_name inflector -%global github_version 2.0.4 +%global github_version 2.0.5 %global major 2 -%global github_commit 8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89 +%global github_commit ade2b3bbfb776f27f0558e26eed43b5d9fe1b392 %global composer_vendor doctrine %global composer_project inflector @@ -27,7 +27,7 @@ Name: php-%{composer_vendor}-%{composer_project}%{major} Version: %{github_version} -Release: 2%{?github_release}%{?dist} +Release: 1%{?github_release}%{?dist} Summary: Common string manipulations with regard to casing and singular/plural rules License: MIT @@ -42,7 +42,7 @@ BuildArch: noarch # Tests %if %{with_tests} ## composer.json -BuildRequires: phpunit9 +BuildRequires: phpunit9 >= 9.5 BuildRequires: php(language) >= %{php_min_ver} ## phpcompatinfo (computed from version 2.0.1) BuildRequires: php-mbstring @@ -96,7 +96,7 @@ BOOTSTRAP : Upstream tests RETURN_CODE=0 -for PHP_EXEC in "" php73 php74 php80 php81; do +for PHP_EXEC in "" php74 php80 php81 php82; do if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then phpunit9 --verbose --bootstrap bootstrap.php \ || RETURN_CODE=1 @@ -117,6 +117,9 @@ exit $RETURN_CODE %changelog +* Fri Sep 9 2022 Remi Collet - 2.0.5-1 +- update to 2.0.5 + * Fri Jan 21 2022 Fedora Release Engineering - 2.0.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 63b4ddb..2191396 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-doctrine-inflector2-2.0.4-8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89.tar.gz) = fa79b9935f6c54e4ee59f7e8bd72b4387094c2398c88525c09f7d48aff80a9556b6e57e4d8766847bb5f4509119b0555276326587bdbfe92ceb1384d1d6baa8a +SHA512 (php-doctrine-inflector2-2.0.5-ade2b3bbfb776f27f0558e26eed43b5d9fe1b392.tar.gz) = 061c504f9c383c0a2175cfc6cbf65aac089d72efdc57a1a74baad4e1e12f1db80c541d79a67e649d3826507611ec01c777b9000fcc69483ab97582554930b31c From bf2521ced2c5e351a6a8262eb3081b0f66375524 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 21 Oct 2022 10:11:44 +0200 Subject: [PATCH 2/2] v2.0.6 (cherry picked from commit 642ade4351f6acbfa41653fe6152b222d80a25fb) --- .gitignore | 1 + php-doctrine-inflector2.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 86ca142..b6b0dc7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /php-doctrine-inflector2-2.0.3-9cf661f4eb38f7c881cac67c75ea9b00bf97b210.tar.gz /php-doctrine-inflector2-2.0.4-8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89.tar.gz /php-doctrine-inflector2-2.0.5-ade2b3bbfb776f27f0558e26eed43b5d9fe1b392.tar.gz +/php-doctrine-inflector2-2.0.6-d9d313a36c872fd6ee06d9a6cbcf713eaa40f024.tar.gz diff --git a/php-doctrine-inflector2.spec b/php-doctrine-inflector2.spec index d82e143..3a40bbe 100644 --- a/php-doctrine-inflector2.spec +++ b/php-doctrine-inflector2.spec @@ -10,9 +10,9 @@ %global github_owner doctrine %global github_name inflector -%global github_version 2.0.5 +%global github_version 2.0.6 %global major 2 -%global github_commit ade2b3bbfb776f27f0558e26eed43b5d9fe1b392 +%global github_commit d9d313a36c872fd6ee06d9a6cbcf713eaa40f024 %global composer_vendor doctrine %global composer_project inflector @@ -117,6 +117,9 @@ exit $RETURN_CODE %changelog +* Fri Oct 21 2022 Remi Collet - 2.0.6-1 +- update to 2.0.6 + * Fri Sep 9 2022 Remi Collet - 2.0.5-1 - update to 2.0.5 diff --git a/sources b/sources index 2191396..be32727 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-doctrine-inflector2-2.0.5-ade2b3bbfb776f27f0558e26eed43b5d9fe1b392.tar.gz) = 061c504f9c383c0a2175cfc6cbf65aac089d72efdc57a1a74baad4e1e12f1db80c541d79a67e649d3826507611ec01c777b9000fcc69483ab97582554930b31c +SHA512 (php-doctrine-inflector2-2.0.6-d9d313a36c872fd6ee06d9a6cbcf713eaa40f024.tar.gz) = e582db15ec0a394a32da4d55c0de2a8ca120247a60e5319b941086da724b27ee59ce0e22c80cee310336f50d4d01015fc6759a718c5c8fd1e313650208c237c3