diff --git a/.gitignore b/.gitignore index 5ba2197..34adb01 100644 --- a/.gitignore +++ b/.gitignore @@ -1,118 +1,18 @@ clog -/php-cs-fixer-2.2.*.tgz -/php-cs-fixer-2.3.1-d5257f7.tgz -/php-cs-fixer-2.3.2-597745f.tgz -/php-cs-fixer-2.4.0-63661f3.tgz -/php-cs-fixer-2.5.0-63aad57.tgz -/php-cs-fixer-2.6.0-5642a36.tgz -/php-cs-fixer-2.6.1-a048433.tgz -/php-cs-fixer-2.7.0-e4e93a1.tgz -/php-cs-fixer-2.7.1-ab2e189.tgz -/php-cs-fixer-diff-1.1.0-d068eda.tgz -/php-cs-fixer-2.8.0-89e7b08.tgz -/php-cs-fixer-diff-1.2.0-f0ef613.tgz -/php-cs-fixer-2.8.1-04f71e5.tgz -/php-cs-fixer-2.8.2-b331701.tgz -/php-cs-fixer-2.8.3-d9ec9b8.tgz -/php-cs-fixer-2.9.0-454ddbe.tgz -/php-cs-fixer-2.10.0-513a376.tgz -/php-cs-fixer-2.10.2-74e4682.tgz -/php-cs-fixer-diff-1.2.1-b95b8c0.tgz -/php-cs-fixer-2.10.3-1634a2c.tgz -/php-cs-fixer-diff-1.3.0-78bb099.tgz -/php-cs-fixer-2.10.4-b2dce1d.tgz -/php-cs-fixer-2.11.0-2ac8def.tgz -/php-cs-fixer-2.11.1-ad94441.tgz -/php-cs-fixer-2.12.0-a53f39a.tgz -/php-cs-fixer-2.12.1-beef6cb.tgz -/php-cs-fixer-2.12.2-dcc87d5.tgz -/php-cs-fixer-2.12.3-b23d499.tgz -/php-cs-fixer-2.13.0-7136aa4.tgz -/php-cs-fixer-2.13.1-54814c6.tgz -/php-cs-fixer-2.13.2-ce6c4bb.tgz -/php-cs-fixer-2.14.0-b788ea0.tgz -/php-cs-fixer-2.14.1-2e82abd.tgz -/php-cs-fixer-2.14.2-ff401e5.tgz -/php-cs-fixer-2.15.0-adfab51.tgz -/php-cs-fixer-2.15.1-2006451.tgz -/php-cs-fixer-2.15.2-c9d30fd.tgz -/php-cs-fixer-2.15.3-705490b.tgz -/php-cs-fixer-2.16.0-ceaff36.tgz -/php-cs-fixer-2.16.1-c8afb59.tgz -/php-cs-fixer-2.16.2-c460a3c.tgz -/php-cs-fixer-2.16.3-83baf82.tgz -/php-cs-fixer-2.16.4-1023c34.tgz -/php-cs-fixer-2.16.7-4e35806.tgz -/php-cs-fixer-2.17.0-5274ce3.tgz -/php-cs-fixer-2.17.1-5198b73.tgz -/php-cs-fixer-diff-1.3.1-dbd31ae.tgz -/php-cs-fixer-2.18.2-18f8c9d.tgz -/php-cs-fixer-2.18.3-ab99202.tgz -/php-cs-fixer-2.18.4-06f764e.tgz -/php-cs-fixer-2.18.5-e0f6d05.tgz -/php-cs-fixer-2.18.6-5fed214.tgz -/php-cs-fixer-2.19.0-d5b8a9d.tgz -/php-cs-fixer-2.19.1-1fa4af9.tgz -/php-cs-fixer-2.19.2-d5c737c.tgz -/php-cs-fixer-2.19.3-75ac86f.tgz -/php-cs-fixer-3.5.0-333f15e.tgz -/php-cs-fixer-3.6.0-1975e44.tgz -/php-cs-fixer-3.7.0-7705d5a.tgz -/php-cs-fixer-3.8.0-cbad111.tgz -/php-cs-fixer-3.9.1-9444163.tgz -/php-cs-fixer-3.9.2-9b23c42.tgz -/php-cs-fixer-3.9.3-bad87e6.tgz -/php-cs-fixer-3.9.4-093466b.tgz -/php-cs-fixer-3.9.5-4465d70.tgz -/php-cs-fixer-3.10.0-76d7da6.tgz -/php-cs-fixer-3.11.0-7dcdea3.tgz -/php-cs-fixer-3.12.0-eae11d9.tgz -/php-cs-fixer-3.13.0-a623222.tgz -/php-cs-fixer-3.13.1-78d2251.tgz -/php-cs-fixer-3.13.2-3952f08.tgz -/php-cs-fixer-3.14.3-b418036.tgz -/php-cs-fixer-3.14.4-1b3d9db.tgz -/php-cs-fixer-3.15.0-7306744.tgz -/php-cs-fixer-3.15.1-d487553.tgz -/php-cs-fixer-3.16.0-d40f943.tgz -/php-cs-fixer-3.17.0-3f0ed86.tgz -/php-cs-fixer-3.18.0-b123395.tgz -/php-cs-fixer-3.19.2-210dd89.tgz -/php-cs-fixer-3.20.0-0e8249e.tgz -/php-cs-fixer-3.21.1-229b55b.tgz -/php-cs-fixer-3.22.0-92b019f.tgz -/php-cs-fixer-3.23.0-35af3cb.tgz -/php-cs-fixer-3.24.0-bb6c9d7.tgz -/php-cs-fixer-3.25.0-9025b7d.tgz -/php-cs-fixer-3.25.1-8e21d69.tgz -/php-cs-fixer-3.26.0-5fcf0c6.tgz -/php-cs-fixer-3.26.1-d023ba6.tgz -/php-cs-fixer-3.27.0-e73ccaa.tgz -/php-cs-fixer-3.28.0-113e09f.tgz -/php-cs-fixer-3.30.0-95c6469.tgz -/php-cs-fixer-3.31.0-983a24f.tgz -/php-cs-fixer-3.34.1-98bf1b1.tgz -/php-cs-fixer-3.35.1-ec1ccc2.tgz -/php-cs-fixer-3.36.0-e889301.tgz -/php-cs-fixer-3.37.1-c3fe769.tgz -/php-cs-fixer-3.38.2-d872cdd.tgz -/php-cs-fixer-3.39.0-04bf7b2.tgz -/php-cs-fixer-3.40.0-27d2b32.tgz -/php-cs-fixer-3.40.2-4344562.tgz -/php-cs-fixer-3.41.1-8b6ae8d.tgz -/php-cs-fixer-3.45.0-c0daa33.tgz -/php-cs-fixer-3.46.0-be6831c.tgz -/php-cs-fixer-3.47.1-173c60d.tgz -/php-cs-fixer-3.48.0-a92472c.tgz -/php-cs-fixer-3.49.0-8742f7a.tgz -/php-cs-fixer-3.50.0-dbea11d.tgz -/php-cs-fixer-3.51.0-127fa74.tgz -/php-cs-fixer-3.52.0-a3564bd.tgz -/php-cs-fixer-3.52.1-6e77207.tgz -/php-cs-fixer-3.53.0-69a1909.tgz -/php-cs-fixer-3.54.0-2aecbc8.tgz -/php-cs-fixer-3.56.1-69c6168.tgz -/php-cs-fixer-3.57.2-22f7f31.tgz -/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.82.2-684ed3a.tgz +/php-cs-fixer-3.84.0-38dad07.tgz +/php-cs-fixer-3.85.1-2fb6d7f.tgz +/php-cs-fixer-3.86.0-4a952bd.tgz +/php-cs-fixer-3.87.1-2f51703.tgz +/php-cs-fixer-3.87.2-da5f0a7.tgz +/php-cs-fixer-3.88.0-f234696.tgz +/php-cs-fixer-3.88.2-a8d1558.tgz +/php-cs-fixer-3.89.0-4dd6768.tgz +/php-cs-fixer-3.89.1-f34967d.tgz +/php-cs-fixer-3.89.2-7569658.tgz +/php-cs-fixer-3.90.0-ad732c2.tgz +/php-cs-fixer-3.91.2-f171dc2.tgz +/php-cs-fixer-3.91.3-9f10aa6.tgz +/php-cs-fixer-3.92.3-2ba8f5a.tgz +/php-cs-fixer-3.92.4-9e7488b.tgz +/php-cs-fixer-3.92.5-260cc8c.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-autoload.patch b/php-cs-fixer-autoload.patch index 983d89a..a14e08a 100644 --- a/php-cs-fixer-autoload.patch +++ b/php-cs-fixer-autoload.patch @@ -1,7 +1,7 @@ diff -up ./php-cs-fixer.rpm ./php-cs-fixer --- ./php-cs-fixer.rpm 2022-01-14 15:01:36.281743286 +0100 +++ ./php-cs-fixer 2022-01-14 15:01:59.983646138 +0100 -@@ -85,7 +85,7 @@ set_error_handler(static function ($seve +@@ -81,7 +81,7 @@ set_error_handler(static function ($seve if ($require) { // OK, it's not, let give Composer autoloader a try! diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index 6e2f0ce..ed61663 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-2026 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 260cc8c4a1d2f6d2f22cd4f9c70aa72e55ebac58 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2024-06-16 +%global gh_date 2026-01-08 %global gh_owner FriendsOfPHP %global gh_project PHP-CS-Fixer Name: php-cs-fixer -Version: 3.59.3 +Version: 3.92.5 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,141 @@ PHP_CS_FIXER_IGNORE_ENV=1 ./%{name} --version | grep %{version} %changelog +* Fri Jan 9 2026 Remi Collet - 3.92.5-1 +- update to 3.92.5 + +* Sun Jan 4 2026 Remi Collet - 3.92.4-1 +- update to 3.92.4 + +* Thu Dec 18 2025 Remi Collet - 3.92.3-1 +- update to 3.92.3 + +* Sat Dec 6 2025 Remi Collet - 3.91.3-1 +- update to 3.91.3 + +* Tue Dec 2 2025 Remi Collet - 3.91.2-1 +- update to 3.91.2 + +* Fri Nov 21 2025 Remi Collet - 3.90.0-1 +- update to 3.90.0 + +* Fri Nov 7 2025 Remi Collet - 3.89.2-1 +- update to 3.89.2 + +* Fri Oct 24 2025 Remi Collet - 3.89.1-1 +- update to 3.89.1 + +* Mon Oct 20 2025 Remi Collet - 3.89.0-1 +- update to 3.89.0 + +* Sat Sep 27 2025 Remi Collet - 3.88.2-1 +- update to 3.88.2 + +* Thu Sep 25 2025 Remi Collet - 3.88.0-1 +- update to 3.88.0 + +* Wed Sep 10 2025 Remi Collet - 3.87.2-1 +- update to 3.87.2 + +* Wed Sep 3 2025 Remi Collet - 3.87.1-1 +- update to 3.87.1 + +* Thu Aug 14 2025 Remi Collet - 3.86.0-1 +- update to 3.86.0 + +* Wed Jul 30 2025 Remi Collet - 3.85.1-1 +- update to 3.85.1 + +* Fri Jul 25 2025 Fedora Release Engineering - 3.84.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Wed Jul 16 2025 Remi Collet - 3.84.0-1 +- update to 3.84.0 + +* Wed Jul 9 2025 Remi Collet - 3.82.2-1 +- update to 3.82.2 + +* Tue Jul 8 2025 Remi Collet - 3.82.1-1 +- update to 3.82.1 + +* Tue Jul 8 2025 Remi Collet - 3.82.0-1 +- update to 3.82.0 + +* Mon Jul 7 2025 Remi Collet - 3.80.0-1 +- update to 3.80.0 + +* Tue Jul 1 2025 Remi Collet - 3.76.0-1 +- update to 3.76.0 + +* 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 + +* Fri Jul 19 2024 Fedora Release Engineering - 3.59.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jul 2 2024 Remi Collet - 3.59.3-1 - update to 3.59.3 diff --git a/sources b/sources index 8e55a1a..8bc191f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-cs-fixer-3.59.3-30ba9ec.tgz) = c5a266a353cfd4d122bed4f70dc9ea350b5ae1d998aeecec4bb47c90437f752214716f5a91850c90ba125e4aecf0012e711e8bde98c63b8638da7f7e4725771d +SHA512 (php-cs-fixer-3.92.5-260cc8c.tgz) = 77e64c844b6eae37cbbd652de1afaec3a784762b52e0a8d1c1b4f9a4307e7bf7ac99a4fc8963781febdfed524fc439aa2ec6b2013802b0ca44b64ccbcc56dc4a