diff --git a/.gitignore b/.gitignore index e31088f..0675edd 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,3 @@ /php-doctrine-lexer-1.1.0-e17f069.tgz /php-doctrine-lexer-1.2.0-5242d66.tgz /php-doctrine-lexer-1.2.1-e864bbf.tgz -/php-doctrine-lexer-1.2.2-9c50f84.tgz -/php-doctrine-lexer-1.2.3-c268e88.tgz diff --git a/composer.json b/composer.json index c435647..3432bae 100644 --- a/composer.json +++ b/composer.json @@ -17,13 +17,12 @@ {"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"} ], "require": { - "php": "^7.1 || ^8.0" + "php": "^7.2 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^9.0", - "phpstan/phpstan": "^1.3", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.11" + "doctrine/coding-standard": "^6.0", + "phpstan/phpstan": "^0.11.8", + "phpunit/phpunit": "^8.2" }, "autoload": { "psr-4": { "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer" } @@ -31,11 +30,12 @@ "autoload-dev": { "psr-4": { "Doctrine\\Tests\\": "tests/Doctrine" } }, + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } + }, "config": { - "allow-plugins": { - "composer/package-versions-deprecated": true, - "dealerdirect/phpcodesniffer-composer-installer": true - }, "sort-packages": true } } diff --git a/php-doctrine-lexer.spec b/php-doctrine-lexer.spec index 272b4aa..81fd555 100644 --- a/php-doctrine-lexer.spec +++ b/php-doctrine-lexer.spec @@ -1,7 +1,7 @@ # # Fedora spec file for php-doctrine-lexer # -# Copyright (c) 2013-2022 Shawn Iwinski +# Copyright (c) 2013-2019 Shawn Iwinski # # License: MIT # http://opensource.org/licenses/MIT @@ -11,8 +11,8 @@ # Github %global github_owner doctrine %global github_name lexer -%global github_version 1.2.3 -%global github_commit c268e882d4dbdd85e36e4ad69e02dc284f89d229 +%global github_version 1.2.1 +%global github_commit e864bbf5904cb8f5bb334f99209b48018522f042 %global github_short %(c=%{github_commit}; echo ${c:0:7}) # Namespace %global ns_vendor Doctrine @@ -22,15 +22,15 @@ %global composer_vendor doctrine %global composer_project lexer -# "php": "^7.1 || ^8.0" -%global php_min_ver 7.1 +# "php": "^7.2 || ^8.0" +%global php_min_ver 7.2 %{!?phpdir: %global phpdir %{_datadir}/php} %global with_tests 0%{!?_without_tests:1} Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 9%{?github_release}%{?dist} +Release: 2%{?github_release}%{?dist} Summary: Base library for a lexer that can be used in top-down, recursive descent parsers License: MIT @@ -45,7 +45,7 @@ BuildRequires: php-fedora-autoloader-devel BuildRequires: php(language) >= %{php_min_ver} BuildRequires: php-pcre BuildRequires: php-reflection -BuildRequires: phpunit9 +BuildRequires: phpunit8 %endif # composer.json @@ -102,9 +102,9 @@ EOF : Run test suite ret=0 -for cmd in php php74 php80 php81; do +for cmd in php php72 php73 php74 php80; do if which $cmd; then - $cmd %{_bindir}/phpunit9 \ + $cmd %{_bindir}/phpunit8 \ --bootstrap vendor/autoload.php \ --verbose || ret=1 fi @@ -126,46 +126,6 @@ exit $ret %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 1.2.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jan 18 2025 Fedora Release Engineering - 1.2.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 19 2024 Fedora Release Engineering - 1.2.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 1.2.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 1.2.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 1.2.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Jan 20 2023 Fedora Release Engineering - 1.2.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jul 22 2022 Fedora Release Engineering - 1.2.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Feb 28 2022 Remi Collet - 1.2.3-1 -- update to 1.2.3 - -* Fri Jan 21 2022 Fedora Release Engineering - 1.2.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jan 12 2022 Remi Collet - 1.2.2-1 -- update to 1.2.2 -- switch to phpunit9 - -* Fri Jul 23 2021 Fedora Release Engineering - 1.2.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 1.2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - * Tue Jul 28 2020 Fedora Release Engineering - 1.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 10ea7b3..b3be879 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-doctrine-lexer-1.2.3-c268e88.tgz) = d595844b12c048896f1cab68c3fdc26142921aea1ed06e0949035a9a8697b1b1b8cd168adecb88de91448511ff80965ae43f9ab710550eca77967a62cbbe4eb3 +SHA512 (php-doctrine-lexer-1.2.1-e864bbf.tgz) = c70db2910c01e5f9ce8c5987e4dc6d2d5a32067055e14067a27768ec6ecc533269d5b69a4b2d53ec95f6914133c9899274bde73a1aeca24c52ea90f4851e2a5b