diff --git a/.gitignore b/.gitignore index 5ba2197..82ee6f0 100644 --- a/.gitignore +++ b/.gitignore @@ -116,3 +116,24 @@ clog /php-cs-fixer-3.58.0-55d3483.tgz /php-cs-fixer-3.58.1-04e9424.tgz /php-cs-fixer-3.59.3-30ba9ec.tgz +/php-cs-fixer-3.60.0-e595e4e.tgz +/php-cs-fixer-3.61.1-94a8718.tgz +/php-cs-fixer-3.62.0-627692f.tgz +/php-cs-fixer-3.63.1-ee3cc2e.tgz +/php-cs-fixer-3.64.0-58dd9c9.tgz +/php-cs-fixer-3.65.0-79d4f3e.tgz +/php-cs-fixer-3.66.0-5f5f2a1.tgz +/php-cs-fixer-3.66.1-cde1867.tgz +/php-cs-fixer-3.66.2-25addd3.tgz +/php-cs-fixer-3.68.0-73f78d8.tgz +/php-cs-fixer-3.68.1-b9db2b2.tgz +/php-cs-fixer-3.68.3-85fd31c.tgz +/php-cs-fixer-3.68.4-5c2f466.tgz +/php-cs-fixer-3.68.5-7bedb71.tgz +/php-cs-fixer-3.69.0-630a594.tgz +/php-cs-fixer-3.69.1-13b0c0e.tgz +/php-cs-fixer-3.70.0-2ecd5aa.tgz +/php-cs-fixer-3.71.0-3825ffd.tgz +/php-cs-fixer-3.72.0-9003893.tgz +/php-cs-fixer-3.73.1-ffcb820.tgz +/php-cs-fixer-3.75.0-399a128.tgz diff --git a/makesrc.sh b/makesrc.sh index 55c46fd..69295c8 100755 --- a/makesrc.sh +++ b/makesrc.sh @@ -24,7 +24,10 @@ else cp composer.json ../ composer config platform.php 8.1.99 - composer install --no-interaction --no-progress --no-dev --optimize-autoloader + # see https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/master/dev-tools/build.sh + # some dev dep cannot be satisfied but are not needed + composer remove --dev infection/infection --no-update + composer install --no-interaction --no-progress --no-dev --no-scripts --optimize-autoloader cp vendor/composer/installed.json ../ popd diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index 6e2f0ce..acf1753 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -1,23 +1,20 @@ # remirepo/fedora spec file for php-cs-fixer # -# Copyright (c) 2016-2024 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2016-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # -# For compatibility with SCL -%undefine __brp_mangle_shebangs - -%global gh_commit 30ba9ecc2b0e5205e578fe29973c15653d9bfd29 +%global gh_commit 399a128ff2fdaf4281e4e79b755693286cdf325c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2024-06-16 +%global gh_date 2025-03-31 %global gh_owner FriendsOfPHP %global gh_project PHP-CS-Fixer Name: php-cs-fixer -Version: 3.59.3 +Version: 3.75.0 Release: 1%{?dist} Summary: PHP Coding Standards Fixer @@ -35,6 +32,7 @@ BuildArch: noarch BuildRequires: php(language) >= 8.1 BuildRequires: php-cli BuildRequires: php-json +BuildRequires: composer-generators >= 0.1.1 # see composer.json and makesrc.sh Requires: php(language) >= 8.1 @@ -49,46 +47,6 @@ Requires: php-mbstring Obsoletes: php-cs-fixer3 < 3.5 Provides: php-cs-fixer3 = %{version} -# Bundled PHP libraries -# License BSD-3-Clause -Provides: bundled(php-sebastian-diff) = 5.1.1 -# License MIT -Provides: bundled(php-clue-ndjson-react) = v1.3.0 -Provides: bundled(php-composer-pcre) = 3.1.4 -Provides: bundled(php-composer-semver) = 3.4.0 -Provides: bundled(php-composer-xdebug-handler) = 3.0.5 -Provides: bundled(php-evenement-evenement) = v3.0.2 -Provides: bundled(php-fidry-cpu-core-counter) = 1.1.0 -Provides: bundled(php-psr-container) = 2.0.2 -Provides: bundled(php-psr-event-dispatcher) = 1.0.0 -Provides: bundled(php-psr-log) = 2.0.0 -Provides: bundled(php-react-cache) = v1.2.0 -Provides: bundled(php-react-child-process) = v0.6.5 -Provides: bundled(php-react-dns) = v1.13.0 -Provides: bundled(php-react-event-loop) = v1.5.0 -Provides: bundled(php-react-promise) = v3.2.0 -Provides: bundled(php-react-socket) = v1.15.0 -Provides: bundled(php-react-stream) = v1.4.0 -Provides: bundled(php-symfony-console) = v6.4.9 -Provides: bundled(php-symfony-deprecation-contracts) = v3.5.0 -Provides: bundled(php-symfony-event-dispatcher) = v6.4.8 -Provides: bundled(php-symfony-event-dispatcher-contracts) = v3.5.0 -Provides: bundled(php-symfony-filesystem) = v6.4.9 -Provides: bundled(php-symfony-finder) = v6.4.8 -Provides: bundled(php-symfony-options-resolver) = v6.4.8 -Provides: bundled(php-symfony-polyfill-ctype) = v1.30.0 -Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.30.0 -Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.30.0 -Provides: bundled(php-symfony-polyfill-mbstring) = v1.30.0 -Provides: bundled(php-symfony-polyfill-php80) = v1.30.0 -Provides: bundled(php-symfony-polyfill-php81) = v1.30.0 -Provides: bundled(php-symfony-process) = v6.4.8 -Provides: bundled(php-symfony-service-contracts) = v3.5.0 -Provides: bundled(php-symfony-stopwatch) = v6.4.8 -Provides: bundled(php-symfony-string) = v6.4.9 - -Provides: php-composer(friendsofphp/php-cs-fixer) = %{version} - %description The PHP Coding Standards Fixer (PHP CS Fixer) tool fixes your code to follow @@ -108,26 +66,11 @@ projects. This tool does not only detect them, but also fixes them for you. %setup -q -n %{gh_project}-%{gh_commit} %patch -P0 -p1 -b .rpm -: List bundled libraries and Licenses -php -r ' - $pkgs = file_get_contents("vendor/composer/installed.json"); - $pkgs = json_decode($pkgs, true); - if (!is_array($pkgs) || !isset($pkgs["packages"])) { - echo "cant decode json file\n"; - exit(3); - } - $res = []; - foreach($pkgs["packages"] as $pkg) { - $lic = implode(" and ", $pkg["license"]); - if (!isset($res[$lic])) $res[$lic] = []; - $res[$lic][] = sprintf("Provides: bundled(php-%s) = %s", str_replace(["/", "_"], ["-", "-"], $pkg["name"]), $pkg["version"]); - } - ksort($res); - foreach($res as $lic => $lib) { - sort($lib); - printf("# License %s\n%s\n", $lic, implode("\n", $lib)); - } -' +# Fix version +#sed -e '/VERSION/s/3.68.6-DEV/%{version}/' -i src/Console/Application.php +# check version +grep "'%{version}'" src/Console/Application.php + %build # Empty build section, most likely nothing required. @@ -145,6 +88,7 @@ install -Dpm755 %{name} %{buildroot}%{_bindir}/%{name} %check sed -e 's:%{_datadir}:%{buildroot}%{_datadir}:' -i %{name} +PHP_CS_FIXER_IGNORE_ENV=1 ./%{name} --version PHP_CS_FIXER_IGNORE_ENV=1 ./%{name} --version | grep %{version} @@ -158,6 +102,72 @@ PHP_CS_FIXER_IGNORE_ENV=1 ./%{name} --version | grep %{version} %changelog +* Tue Apr 1 2025 Remi Collet - 3.75.0-1 +- update to 3.75.0 +- re-license spec file to CECILL-2.1 + +* Thu Mar 20 2025 Remi Collet - 3.73.1-1 +- update to 3.73.1 + +* Thu Mar 13 2025 Remi Collet - 3.72.0-1 +- update to 3.72.0 + +* Sat Mar 8 2025 Remi Collet - 3.71.0-1 +- update to 3.71.0 + +* Sun Feb 23 2025 Remi Collet - 3.70.0-1 +- update to 3.70.0 + +* Wed Feb 19 2025 Remi Collet - 3.69.1-1 +- update to 3.69.1 + +* Mon Feb 17 2025 Remi Collet - 3.69.0-1 +- update to 3.69.0 + +* Fri Jan 31 2025 Remi Collet - 3.68.5-1 +- update to 3.68.5 + +* Thu Jan 30 2025 Remi Collet - 3.68.4-1 +- update to 3.68.4 +- always use composer-generators + +* Tue Jan 28 2025 Remi Collet - 3.68.3-1 +- update to 3.68.3 + +* Fri Jan 17 2025 Remi Collet - 3.68.1-1 +- update to 3.68.1 + +* Tue Jan 14 2025 Remi Collet - 3.68.0-1 +- update to 3.68.0 + +* Tue Jan 7 2025 Remi Collet - 3.66.2-1 +- update to 3.66.2 + +* Mon Jan 6 2025 Remi Collet - 3.66.1-1 +- update to 3.66.1 + +* Mon Dec 30 2024 Remi Collet - 3.66.0-1 +- update to 3.66.0 +- add option to use composer-generators + +* Mon Nov 25 2024 Remi Collet - 3.65.0-1 +- update to 3.65.0 + +* Sat Aug 31 2024 Remi Collet - 3.64.0-1 +- update to 3.64.0 + +* Tue Aug 27 2024 Remi Collet - 3.63.1-1 +- update to 3.63.1 + +* Thu Aug 8 2024 Remi Collet - 3.62.0-1 +- update to 3.62.0 + +* Thu Aug 1 2024 Remi Collet - 3.61.1-1 +- update to 3.61.1 + +* Thu Jul 25 2024 Remi Collet - 3.60.0-1 +- update to 3.60.0 + * Tue Jul 2 2024 Remi Collet - 3.59.3-1 - update to 3.59.3 diff --git a/sources b/sources index 8e55a1a..8d2b1f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-cs-fixer-3.59.3-30ba9ec.tgz) = c5a266a353cfd4d122bed4f70dc9ea350b5ae1d998aeecec4bb47c90437f752214716f5a91850c90ba125e4aecf0012e711e8bde98c63b8638da7f7e4725771d +SHA512 (php-cs-fixer-3.75.0-399a128.tgz) = 1a9537b352b7aa9eb1962375988c7577dc4b80b50febaa1846f59ca7bede0d30a1c4b7a56c0b663c465383978c452cbcc50e5a047bbc972b48275b737a26be3b