From 55ff41301b51a50cc62e8f44df4f6b762397a537 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 25 Jul 2024 14:56:22 +0200 Subject: [PATCH 01/21] v3.60.0 (cherry picked from commit b7504b586f43b1367dd38b944a2c721f28849759) --- .gitignore | 1 + php-cs-fixer.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 5ba2197..37d613a 100644 --- a/.gitignore +++ b/.gitignore @@ -116,3 +116,4 @@ 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 diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index 6e2f0ce..7816b23 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -10,14 +10,14 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 30ba9ecc2b0e5205e578fe29973c15653d9bfd29 +%global gh_commit e595e4e070d17c5d42ed8c4206f630fcc5f401a4 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2024-06-16 +%global gh_date 2024-07-25 %global gh_owner FriendsOfPHP %global gh_project PHP-CS-Fixer Name: php-cs-fixer -Version: 3.59.3 +Version: 3.60.0 Release: 1%{?dist} Summary: PHP Coding Standards Fixer @@ -54,8 +54,8 @@ Provides: php-cs-fixer3 = %{version} 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-pcre) = 3.2.0 +Provides: bundled(php-composer-semver) = 3.4.2 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 @@ -158,6 +158,9 @@ PHP_CS_FIXER_IGNORE_ENV=1 ./%{name} --version | grep %{version} %changelog +* 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..e39da15 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-cs-fixer-3.59.3-30ba9ec.tgz) = c5a266a353cfd4d122bed4f70dc9ea350b5ae1d998aeecec4bb47c90437f752214716f5a91850c90ba125e4aecf0012e711e8bde98c63b8638da7f7e4725771d +SHA512 (php-cs-fixer-3.60.0-e595e4e.tgz) = 395257fe415ac5b22faa7cdd8ef357c55dcc3a879f3153484ac3daa361b0b3d305e747677a6b70cf7e5b0ddac4ed344de6af51683982c7d06e9eeb22cbeee758 From c35e5c0152440fa6db0b6b8650560a9e9bcc6998 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 5 Aug 2024 08:18:59 +0200 Subject: [PATCH 02/21] v3.61.1 (cherry picked from commit cad9fb63fa3b48fafc1a611169ca5ea6eeb4dc93) --- .gitignore | 1 + php-cs-fixer.spec | 17 ++++++++++------- sources | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 37d613a..03b59c0 100644 --- a/.gitignore +++ b/.gitignore @@ -117,3 +117,4 @@ clog /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 diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index 7816b23..62f020d 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -10,14 +10,14 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit e595e4e070d17c5d42ed8c4206f630fcc5f401a4 +%global gh_commit 94a87189f55814e6cabca2d9a33b06de384a2ab8 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2024-07-25 +%global gh_date 2024-07-31 %global gh_owner FriendsOfPHP %global gh_project PHP-CS-Fixer Name: php-cs-fixer -Version: 3.60.0 +Version: 3.61.1 Release: 1%{?dist} Summary: PHP Coding Standards Fixer @@ -67,14 +67,14 @@ 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-socket) = v1.16.0 Provides: bundled(php-react-stream) = v1.4.0 -Provides: bundled(php-symfony-console) = v6.4.9 +Provides: bundled(php-symfony-console) = v6.4.10 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-finder) = v6.4.10 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 @@ -85,7 +85,7 @@ 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: bundled(php-symfony-string) = v6.4.10 Provides: php-composer(friendsofphp/php-cs-fixer) = %{version} @@ -158,6 +158,9 @@ PHP_CS_FIXER_IGNORE_ENV=1 ./%{name} --version | grep %{version} %changelog +* 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 diff --git a/sources b/sources index e39da15..caf2c23 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-cs-fixer-3.60.0-e595e4e.tgz) = 395257fe415ac5b22faa7cdd8ef357c55dcc3a879f3153484ac3daa361b0b3d305e747677a6b70cf7e5b0ddac4ed344de6af51683982c7d06e9eeb22cbeee758 +SHA512 (php-cs-fixer-3.61.1-94a8718.tgz) = f391a1881ce8ff45a2a163a76d19fd14d4d2df17f09f2c2bb05f2df46ae1c5e8a670e3f65e8a2e726524232931aa38cdf1988089c8a8c99641560ca40082a542 From 29c6d5618058c547396e469eda54ffa7f31478e8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 14 Aug 2024 09:40:32 +0200 Subject: [PATCH 03/21] v3.62.0 (cherry picked from commit a89da16e2f878bc71b332be5c07b4bff222f7556) --- .gitignore | 1 + php-cs-fixer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 03b59c0..6ba1b6b 100644 --- a/.gitignore +++ b/.gitignore @@ -118,3 +118,4 @@ clog /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 diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index 62f020d..3d2c7be 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -10,14 +10,14 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 94a87189f55814e6cabca2d9a33b06de384a2ab8 +%global gh_commit 627692f794d35c43483f34b01d94740df2a73507 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2024-07-31 +%global gh_date 2024-08-08 %global gh_owner FriendsOfPHP %global gh_project PHP-CS-Fixer Name: php-cs-fixer -Version: 3.61.1 +Version: 3.62.0 Release: 1%{?dist} Summary: PHP Coding Standards Fixer @@ -158,6 +158,9 @@ PHP_CS_FIXER_IGNORE_ENV=1 ./%{name} --version | grep %{version} %changelog +* 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 diff --git a/sources b/sources index caf2c23..a322778 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-cs-fixer-3.61.1-94a8718.tgz) = f391a1881ce8ff45a2a163a76d19fd14d4d2df17f09f2c2bb05f2df46ae1c5e8a670e3f65e8a2e726524232931aa38cdf1988089c8a8c99641560ca40082a542 +SHA512 (php-cs-fixer-3.62.0-627692f.tgz) = 1a7d5365158817674e7e9b0e6f15161d5c2d99b39d385878af21d010808cb2fa18cabfc437613a9f8e80fe435ae89414884e2c3bffd16d821847a36d1ce8ebd8 From 89725a719bbaf82f7d9c8a9e0e1e16471fcd9c0e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 27 Aug 2024 07:31:16 +0200 Subject: [PATCH 04/21] v3.63.1 (cherry picked from commit ca4de970cd542c7f97dd7658e4bec0cb372aa88b) --- .gitignore | 1 + php-cs-fixer.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 6ba1b6b..6b7cbe3 100644 --- a/.gitignore +++ b/.gitignore @@ -119,3 +119,4 @@ clog /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 diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index 3d2c7be..498b361 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -10,14 +10,14 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 627692f794d35c43483f34b01d94740df2a73507 +%global gh_commit ee3cc2e1fbfbddf98c17d4615db574a2a311c1ea %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2024-08-08 +%global gh_date 2024-08-27 %global gh_owner FriendsOfPHP %global gh_project PHP-CS-Fixer Name: php-cs-fixer -Version: 3.62.0 +Version: 3.63.1 Release: 1%{?dist} Summary: PHP Coding Standards Fixer @@ -54,7 +54,7 @@ Provides: php-cs-fixer3 = %{version} 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.2.0 +Provides: bundled(php-composer-pcre) = 3.3.0 Provides: bundled(php-composer-semver) = 3.4.2 Provides: bundled(php-composer-xdebug-handler) = 3.0.5 Provides: bundled(php-evenement-evenement) = v3.0.2 @@ -158,6 +158,9 @@ PHP_CS_FIXER_IGNORE_ENV=1 ./%{name} --version | grep %{version} %changelog +* 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 diff --git a/sources b/sources index a322778..ca76bad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-cs-fixer-3.62.0-627692f.tgz) = 1a7d5365158817674e7e9b0e6f15161d5c2d99b39d385878af21d010808cb2fa18cabfc437613a9f8e80fe435ae89414884e2c3bffd16d821847a36d1ce8ebd8 +SHA512 (php-cs-fixer-3.63.1-ee3cc2e.tgz) = 1a9bae83299a26c0f8a4fdecd0e28e20eb860197d419f97cfb6c7be2394db64af7867b059a8ad2798468fc09c4423d51bc37031c58215dc9d1e1d403d5dcc5fd From 7f3b33c559bb0fbd5ff131c5facd506f3d155faa Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 4 Sep 2024 07:29:15 +0200 Subject: [PATCH 05/21] v3.64.0 (cherry picked from commit 07bad72d300c74be59abdd5317762710bc69ffa6) --- .gitignore | 1 + php-cs-fixer.spec | 19 +++++++++++-------- sources | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 6b7cbe3..6ba1416 100644 --- a/.gitignore +++ b/.gitignore @@ -120,3 +120,4 @@ clog /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 diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index 498b361..4975173 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -10,14 +10,14 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit ee3cc2e1fbfbddf98c17d4615db574a2a311c1ea +%global gh_commit 58dd9c931c785a79739310aef5178928305ffa67 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2024-08-27 +%global gh_date 2024-08-30 %global gh_owner FriendsOfPHP %global gh_project PHP-CS-Fixer Name: php-cs-fixer -Version: 3.63.1 +Version: 3.64.0 Release: 1%{?dist} Summary: PHP Coding Standards Fixer @@ -54,11 +54,11 @@ Provides: php-cs-fixer3 = %{version} 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.3.0 +Provides: bundled(php-composer-pcre) = 3.3.1 Provides: bundled(php-composer-semver) = 3.4.2 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-fidry-cpu-core-counter) = 1.2.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 @@ -69,12 +69,12 @@ Provides: bundled(php-react-event-loop) = v1.5.0 Provides: bundled(php-react-promise) = v3.2.0 Provides: bundled(php-react-socket) = v1.16.0 Provides: bundled(php-react-stream) = v1.4.0 -Provides: bundled(php-symfony-console) = v6.4.10 +Provides: bundled(php-symfony-console) = v6.4.11 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.10 +Provides: bundled(php-symfony-finder) = v6.4.11 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 @@ -85,7 +85,7 @@ 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.10 +Provides: bundled(php-symfony-string) = v6.4.11 Provides: php-composer(friendsofphp/php-cs-fixer) = %{version} @@ -158,6 +158,9 @@ PHP_CS_FIXER_IGNORE_ENV=1 ./%{name} --version | grep %{version} %changelog +* 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 diff --git a/sources b/sources index ca76bad..02bbc0d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-cs-fixer-3.63.1-ee3cc2e.tgz) = 1a9bae83299a26c0f8a4fdecd0e28e20eb860197d419f97cfb6c7be2394db64af7867b059a8ad2798468fc09c4423d51bc37031c58215dc9d1e1d403d5dcc5fd +SHA512 (php-cs-fixer-3.64.0-58dd9c9.tgz) = 6aaabe39bd10914796769c9a7df92976f9985137b54130f43f9b36e8f7f9de60b51ac4df93de328f41ba7643d93938531a7a3c8592beac9ebab69b0c64b4272f From a467fd844834c22da268437173be104ec88892a8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 25 Nov 2024 12:52:46 +0100 Subject: [PATCH 06/21] v3.65.0 (cherry picked from commit fa134583df9d9fd9deafa0e342a364b32c9ae6a5) --- .gitignore | 1 + php-cs-fixer.spec | 79 ++++++++++++++++++++++++----------------------- sources | 2 +- 3 files changed, 43 insertions(+), 39 deletions(-) diff --git a/.gitignore b/.gitignore index 6ba1416..bd90946 100644 --- a/.gitignore +++ b/.gitignore @@ -121,3 +121,4 @@ clog /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 diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index 4975173..6b26e93 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -10,14 +10,14 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 58dd9c931c785a79739310aef5178928305ffa67 +%global gh_commit 79d4f3e77b250a7d8043d76c6af8f0695e8a469f %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2024-08-30 +%global gh_date 2024-11-25 %global gh_owner FriendsOfPHP %global gh_project PHP-CS-Fixer Name: php-cs-fixer -Version: 3.64.0 +Version: 3.65.0 Release: 1%{?dist} Summary: PHP Coding Standards Fixer @@ -51,41 +51,41 @@ Provides: php-cs-fixer3 = %{version} # Bundled PHP libraries # License BSD-3-Clause -Provides: bundled(php-sebastian-diff) = 5.1.1 +Provides: bundled(php-composer(sebastian/diff)) = 5.1.1 # License MIT -Provides: bundled(php-clue-ndjson-react) = v1.3.0 -Provides: bundled(php-composer-pcre) = 3.3.1 -Provides: bundled(php-composer-semver) = 3.4.2 -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.2.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.16.0 -Provides: bundled(php-react-stream) = v1.4.0 -Provides: bundled(php-symfony-console) = v6.4.11 -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.11 -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.11 +Provides: bundled(php-composer(clue/ndjson-react)) = v1.3.0 +Provides: bundled(php-composer(composer/pcre)) = 3.3.2 +Provides: bundled(php-composer(composer/semver)) = 3.4.3 +Provides: bundled(php-composer(composer/xdebug-handler)) = 3.0.5 +Provides: bundled(php-composer(evenement/evenement)) = v3.0.2 +Provides: bundled(php-composer(fidry/cpu-core-counter)) = 1.2.0 +Provides: bundled(php-composer(psr/container)) = 2.0.2 +Provides: bundled(php-composer(psr/event-dispatcher)) = 1.0.0 +Provides: bundled(php-composer(psr/log)) = 2.0.0 +Provides: bundled(php-composer(react/cache)) = v1.2.0 +Provides: bundled(php-composer(react/child-process)) = v0.6.5 +Provides: bundled(php-composer(react/dns)) = v1.13.0 +Provides: bundled(php-composer(react/event-loop)) = v1.5.0 +Provides: bundled(php-composer(react/promise)) = v3.2.0 +Provides: bundled(php-composer(react/socket)) = v1.16.0 +Provides: bundled(php-composer(react/stream)) = v1.4.0 +Provides: bundled(php-composer(symfony/console)) = v6.4.15 +Provides: bundled(php-composer(symfony/deprecation-contracts)) = v3.5.0 +Provides: bundled(php-composer(symfony/event-dispatcher)) = v6.4.13 +Provides: bundled(php-composer(symfony/event-dispatcher-contracts)) = v3.5.0 +Provides: bundled(php-composer(symfony/filesystem)) = v6.4.13 +Provides: bundled(php-composer(symfony/finder)) = v6.4.13 +Provides: bundled(php-composer(symfony/options-resolver)) = v6.4.13 +Provides: bundled(php-composer(symfony/polyfill-ctype)) = v1.31.0 +Provides: bundled(php-composer(symfony/polyfill-intl-grapheme)) = v1.31.0 +Provides: bundled(php-composer(symfony/polyfill-intl-normalizer)) = v1.31.0 +Provides: bundled(php-composer(symfony/polyfill-mbstring)) = v1.31.0 +Provides: bundled(php-composer(symfony/polyfill-php80)) = v1.31.0 +Provides: bundled(php-composer(symfony/polyfill-php81)) = v1.31.0 +Provides: bundled(php-composer(symfony/process)) = v6.4.15 +Provides: bundled(php-composer(symfony/service-contracts)) = v3.5.0 +Provides: bundled(php-composer(symfony/stopwatch)) = v6.4.13 +Provides: bundled(php-composer(symfony/string)) = v6.4.15 Provides: php-composer(friendsofphp/php-cs-fixer) = %{version} @@ -120,7 +120,7 @@ php -r ' 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"]); + $res[$lic][] = sprintf("Provides: bundled(php-composer(%s)) = %s", $pkg["name"], $pkg["version"]); } ksort($res); foreach($res as $lic => $lib) { @@ -158,6 +158,9 @@ PHP_CS_FIXER_IGNORE_ENV=1 ./%{name} --version | grep %{version} %changelog +* 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 diff --git a/sources b/sources index 02bbc0d..8088f24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-cs-fixer-3.64.0-58dd9c9.tgz) = 6aaabe39bd10914796769c9a7df92976f9985137b54130f43f9b36e8f7f9de60b51ac4df93de328f41ba7643d93938531a7a3c8592beac9ebab69b0c64b4272f +SHA512 (php-cs-fixer-3.65.0-79d4f3e.tgz) = ea6b86334e520b9838c01f226fb56a3d83cf70b2b62073755464aa4305dba617e7ac061e3dda45a28edad09aa8d9d94082b5ce48c73a28a2f7fe21f46fd4a133 From 1ab3f275ffc799327bf4d58f635c638daba83fd7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 30 Dec 2024 08:38:50 +0100 Subject: [PATCH 07/21] update to 3.66.0 add option to use composer-generators (cherry picked from commit d9d30c34acd2b823c3c0f1fb6200eefee53c1910) --- .gitignore | 1 + php-cs-fixer.spec | 28 +++++++++++++++++++--------- sources | 2 +- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index bd90946..f58b1d0 100644 --- a/.gitignore +++ b/.gitignore @@ -122,3 +122,4 @@ clog /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 diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index 6b26e93..893c118 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -7,17 +7,16 @@ # Please, preserve the changelog entries # -# For compatibility with SCL -%undefine __brp_mangle_shebangs +%bcond_with generators -%global gh_commit 79d4f3e77b250a7d8043d76c6af8f0695e8a469f +%global gh_commit 5f5f2a142ff36b93c41885bca29cc5f861c013e6 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2024-11-25 +%global gh_date 2024-12-29 %global gh_owner FriendsOfPHP %global gh_project PHP-CS-Fixer Name: php-cs-fixer -Version: 3.65.0 +Version: 3.66.0 Release: 1%{?dist} Summary: PHP Coding Standards Fixer @@ -35,6 +34,9 @@ BuildArch: noarch BuildRequires: php(language) >= 8.1 BuildRequires: php-cli BuildRequires: php-json +%if %{with generators} +BuildRequires: composer-generators +%endif # see composer.json and makesrc.sh Requires: php(language) >= 8.1 @@ -49,6 +51,7 @@ Requires: php-mbstring Obsoletes: php-cs-fixer3 < 3.5 Provides: php-cs-fixer3 = %{version} +%if %{without generators} # Bundled PHP libraries # License BSD-3-Clause Provides: bundled(php-composer(sebastian/diff)) = 5.1.1 @@ -70,12 +73,12 @@ Provides: bundled(php-composer(react/promise)) = v3.2.0 Provides: bundled(php-composer(react/socket)) = v1.16.0 Provides: bundled(php-composer(react/stream)) = v1.4.0 Provides: bundled(php-composer(symfony/console)) = v6.4.15 -Provides: bundled(php-composer(symfony/deprecation-contracts)) = v3.5.0 +Provides: bundled(php-composer(symfony/deprecation-contracts)) = v3.5.1 Provides: bundled(php-composer(symfony/event-dispatcher)) = v6.4.13 -Provides: bundled(php-composer(symfony/event-dispatcher-contracts)) = v3.5.0 +Provides: bundled(php-composer(symfony/event-dispatcher-contracts)) = v3.5.1 Provides: bundled(php-composer(symfony/filesystem)) = v6.4.13 Provides: bundled(php-composer(symfony/finder)) = v6.4.13 -Provides: bundled(php-composer(symfony/options-resolver)) = v6.4.13 +Provides: bundled(php-composer(symfony/options-resolver)) = v6.4.16 Provides: bundled(php-composer(symfony/polyfill-ctype)) = v1.31.0 Provides: bundled(php-composer(symfony/polyfill-intl-grapheme)) = v1.31.0 Provides: bundled(php-composer(symfony/polyfill-intl-normalizer)) = v1.31.0 @@ -83,11 +86,12 @@ Provides: bundled(php-composer(symfony/polyfill-mbstring)) = v1.31.0 Provides: bundled(php-composer(symfony/polyfill-php80)) = v1.31.0 Provides: bundled(php-composer(symfony/polyfill-php81)) = v1.31.0 Provides: bundled(php-composer(symfony/process)) = v6.4.15 -Provides: bundled(php-composer(symfony/service-contracts)) = v3.5.0 +Provides: bundled(php-composer(symfony/service-contracts)) = v3.5.1 Provides: bundled(php-composer(symfony/stopwatch)) = v6.4.13 Provides: bundled(php-composer(symfony/string)) = v6.4.15 Provides: php-composer(friendsofphp/php-cs-fixer) = %{version} +%endif %description @@ -108,6 +112,7 @@ 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 +%if %{without generators} : List bundled libraries and Licenses php -r ' $pkgs = file_get_contents("vendor/composer/installed.json"); @@ -128,6 +133,7 @@ php -r ' printf("# License %s\n%s\n", $lic, implode("\n", $lib)); } ' +%endif %build # Empty build section, most likely nothing required. @@ -158,6 +164,10 @@ PHP_CS_FIXER_IGNORE_ENV=1 ./%{name} --version | grep %{version} %changelog +* 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 diff --git a/sources b/sources index 8088f24..953884b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-cs-fixer-3.65.0-79d4f3e.tgz) = ea6b86334e520b9838c01f226fb56a3d83cf70b2b62073755464aa4305dba617e7ac061e3dda45a28edad09aa8d9d94082b5ce48c73a28a2f7fe21f46fd4a133 +SHA512 (php-cs-fixer-3.66.0-5f5f2a1.tgz) = 99888933e936c86afa54bca0e799865ad7b552b09c36fefe9d95f529d6380e2fcb48346bf80115901f48b653c85eacc3f51d22ce9720324f69957ff2108525bc From 3b71ae7841c571073645a0d46a38c7252748c201 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 7 Jan 2025 07:59:03 +0100 Subject: [PATCH 08/21] v3.66.1 (cherry picked from commit 7b7bb6ae6a4a2d0876d4bd58acc7be8f137d6e62) --- .gitignore | 1 + php-cs-fixer.spec | 65 +++++++++++++++++++++++++---------------------- sources | 2 +- 3 files changed, 36 insertions(+), 32 deletions(-) diff --git a/.gitignore b/.gitignore index f58b1d0..536cb55 100644 --- a/.gitignore +++ b/.gitignore @@ -123,3 +123,4 @@ clog /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 diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index 893c118..81e21a8 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -9,14 +9,14 @@ %bcond_with generators -%global gh_commit 5f5f2a142ff36b93c41885bca29cc5f861c013e6 +%global gh_commit cde186799d8e92960c5a00c96e6214bf7f5547a9 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2024-12-29 +%global gh_date 2025-01-06 %global gh_owner FriendsOfPHP %global gh_project PHP-CS-Fixer Name: php-cs-fixer -Version: 3.66.0 +Version: 3.66.1 Release: 1%{?dist} Summary: PHP Coding Standards Fixer @@ -35,7 +35,7 @@ BuildRequires: php(language) >= 8.1 BuildRequires: php-cli BuildRequires: php-json %if %{with generators} -BuildRequires: composer-generators +BuildRequires: composer-generators >= 0.1.1 %endif # see composer.json and makesrc.sh @@ -56,39 +56,39 @@ Provides: php-cs-fixer3 = %{version} # License BSD-3-Clause Provides: bundled(php-composer(sebastian/diff)) = 5.1.1 # License MIT -Provides: bundled(php-composer(clue/ndjson-react)) = v1.3.0 +Provides: bundled(php-composer(clue/ndjson-react)) = 1.3.0 Provides: bundled(php-composer(composer/pcre)) = 3.3.2 Provides: bundled(php-composer(composer/semver)) = 3.4.3 Provides: bundled(php-composer(composer/xdebug-handler)) = 3.0.5 -Provides: bundled(php-composer(evenement/evenement)) = v3.0.2 +Provides: bundled(php-composer(evenement/evenement)) = 3.0.2 Provides: bundled(php-composer(fidry/cpu-core-counter)) = 1.2.0 Provides: bundled(php-composer(psr/container)) = 2.0.2 Provides: bundled(php-composer(psr/event-dispatcher)) = 1.0.0 Provides: bundled(php-composer(psr/log)) = 2.0.0 -Provides: bundled(php-composer(react/cache)) = v1.2.0 -Provides: bundled(php-composer(react/child-process)) = v0.6.5 -Provides: bundled(php-composer(react/dns)) = v1.13.0 -Provides: bundled(php-composer(react/event-loop)) = v1.5.0 -Provides: bundled(php-composer(react/promise)) = v3.2.0 -Provides: bundled(php-composer(react/socket)) = v1.16.0 -Provides: bundled(php-composer(react/stream)) = v1.4.0 -Provides: bundled(php-composer(symfony/console)) = v6.4.15 -Provides: bundled(php-composer(symfony/deprecation-contracts)) = v3.5.1 -Provides: bundled(php-composer(symfony/event-dispatcher)) = v6.4.13 -Provides: bundled(php-composer(symfony/event-dispatcher-contracts)) = v3.5.1 -Provides: bundled(php-composer(symfony/filesystem)) = v6.4.13 -Provides: bundled(php-composer(symfony/finder)) = v6.4.13 -Provides: bundled(php-composer(symfony/options-resolver)) = v6.4.16 -Provides: bundled(php-composer(symfony/polyfill-ctype)) = v1.31.0 -Provides: bundled(php-composer(symfony/polyfill-intl-grapheme)) = v1.31.0 -Provides: bundled(php-composer(symfony/polyfill-intl-normalizer)) = v1.31.0 -Provides: bundled(php-composer(symfony/polyfill-mbstring)) = v1.31.0 -Provides: bundled(php-composer(symfony/polyfill-php80)) = v1.31.0 -Provides: bundled(php-composer(symfony/polyfill-php81)) = v1.31.0 -Provides: bundled(php-composer(symfony/process)) = v6.4.15 -Provides: bundled(php-composer(symfony/service-contracts)) = v3.5.1 -Provides: bundled(php-composer(symfony/stopwatch)) = v6.4.13 -Provides: bundled(php-composer(symfony/string)) = v6.4.15 +Provides: bundled(php-composer(react/cache)) = 1.2.0 +Provides: bundled(php-composer(react/child-process)) = 0.6.6 +Provides: bundled(php-composer(react/dns)) = 1.13.0 +Provides: bundled(php-composer(react/event-loop)) = 1.5.0 +Provides: bundled(php-composer(react/promise)) = 3.2.0 +Provides: bundled(php-composer(react/socket)) = 1.16.0 +Provides: bundled(php-composer(react/stream)) = 1.4.0 +Provides: bundled(php-composer(symfony/console)) = 6.4.17 +Provides: bundled(php-composer(symfony/deprecation-contracts)) = 3.5.1 +Provides: bundled(php-composer(symfony/event-dispatcher)) = 6.4.13 +Provides: bundled(php-composer(symfony/event-dispatcher-contracts)) = 3.5.1 +Provides: bundled(php-composer(symfony/filesystem)) = 6.4.13 +Provides: bundled(php-composer(symfony/finder)) = 6.4.17 +Provides: bundled(php-composer(symfony/options-resolver)) = 6.4.16 +Provides: bundled(php-composer(symfony/polyfill-ctype)) = 1.31.0 +Provides: bundled(php-composer(symfony/polyfill-intl-grapheme)) = 1.31.0 +Provides: bundled(php-composer(symfony/polyfill-intl-normalizer)) = 1.31.0 +Provides: bundled(php-composer(symfony/polyfill-mbstring)) = 1.31.0 +Provides: bundled(php-composer(symfony/polyfill-php80)) = 1.31.0 +Provides: bundled(php-composer(symfony/polyfill-php81)) = 1.31.0 +Provides: bundled(php-composer(symfony/process)) = 6.4.15 +Provides: bundled(php-composer(symfony/service-contracts)) = 3.5.1 +Provides: bundled(php-composer(symfony/stopwatch)) = 6.4.13 +Provides: bundled(php-composer(symfony/string)) = 6.4.15 Provides: php-composer(friendsofphp/php-cs-fixer) = %{version} %endif @@ -125,7 +125,7 @@ php -r ' foreach($pkgs["packages"] as $pkg) { $lic = implode(" and ", $pkg["license"]); if (!isset($res[$lic])) $res[$lic] = []; - $res[$lic][] = sprintf("Provides: bundled(php-composer(%s)) = %s", $pkg["name"], $pkg["version"]); + $res[$lic][] = sprintf("Provides: bundled(php-composer(%s)) = %s", $pkg["name"], ltrim($pkg["version"], "v")); } ksort($res); foreach($res as $lic => $lib) { @@ -164,6 +164,9 @@ PHP_CS_FIXER_IGNORE_ENV=1 ./%{name} --version | grep %{version} %changelog +* 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 diff --git a/sources b/sources index 953884b..6174a31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-cs-fixer-3.66.0-5f5f2a1.tgz) = 99888933e936c86afa54bca0e799865ad7b552b09c36fefe9d95f529d6380e2fcb48346bf80115901f48b653c85eacc3f51d22ce9720324f69957ff2108525bc +SHA512 (php-cs-fixer-3.66.1-cde1867.tgz) = 6cac7747beb3e60c85a4278ad985389e8b32703a531c7b93d9c8df75d259d12cc953c923574240fbcf9e422623d7822b6c70ff287606eff6ad6c9b116d340c0f From 63fdfaafc35995399dd04c3236e764ba67355690 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 7 Jan 2025 12:09:12 +0100 Subject: [PATCH 09/21] v3.66.2 (cherry picked from commit 618e81132ee69167271d66ebe5a27219b1b6f6f4) --- .gitignore | 1 + php-cs-fixer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 536cb55..53a1372 100644 --- a/.gitignore +++ b/.gitignore @@ -124,3 +124,4 @@ clog /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 diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index 81e21a8..1e8b305 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -9,14 +9,14 @@ %bcond_with generators -%global gh_commit cde186799d8e92960c5a00c96e6214bf7f5547a9 +%global gh_commit 25addd3cb10e54cfd20b84d9c083c6625cd52218 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2025-01-06 +%global gh_date 2025-01-07 %global gh_owner FriendsOfPHP %global gh_project PHP-CS-Fixer Name: php-cs-fixer -Version: 3.66.1 +Version: 3.66.2 Release: 1%{?dist} Summary: PHP Coding Standards Fixer @@ -164,6 +164,9 @@ PHP_CS_FIXER_IGNORE_ENV=1 ./%{name} --version | grep %{version} %changelog +* 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 diff --git a/sources b/sources index 6174a31..e553fa8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-cs-fixer-3.66.1-cde1867.tgz) = 6cac7747beb3e60c85a4278ad985389e8b32703a531c7b93d9c8df75d259d12cc953c923574240fbcf9e422623d7822b6c70ff287606eff6ad6c9b116d340c0f +SHA512 (php-cs-fixer-3.66.2-25addd3.tgz) = c38105eb307437633eb94c2977ac9aa95bfada72fc32bda7d7202108bd7fba54587980d11e67fa6d3994176dd16c4cb0dac45c6796b86ba22cba68cdcd853fdd From c715f92c5f0fab56a304e209cdb67ff1c3fa028e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 15 Jan 2025 11:04:54 +0100 Subject: [PATCH 10/21] v3.68.0 (cherry picked from commit 9c588b719ffdf24bb750bc99619a4cc094ae9ab7) --- .gitignore | 1 + php-cs-fixer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 53a1372..7358aed 100644 --- a/.gitignore +++ b/.gitignore @@ -125,3 +125,4 @@ clog /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 diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index 1e8b305..fd7d90b 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -9,14 +9,14 @@ %bcond_with generators -%global gh_commit 25addd3cb10e54cfd20b84d9c083c6625cd52218 +%global gh_commit 73f78d8b2b34a0dd65fedb434a602ee4c2c8ad4c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2025-01-07 +%global gh_date 2025-01-13 %global gh_owner FriendsOfPHP %global gh_project PHP-CS-Fixer Name: php-cs-fixer -Version: 3.66.2 +Version: 3.68.0 Release: 1%{?dist} Summary: PHP Coding Standards Fixer @@ -164,6 +164,9 @@ PHP_CS_FIXER_IGNORE_ENV=1 ./%{name} --version | grep %{version} %changelog +* 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 diff --git a/sources b/sources index e553fa8..f4a54b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-cs-fixer-3.66.2-25addd3.tgz) = c38105eb307437633eb94c2977ac9aa95bfada72fc32bda7d7202108bd7fba54587980d11e67fa6d3994176dd16c4cb0dac45c6796b86ba22cba68cdcd853fdd +SHA512 (php-cs-fixer-3.68.0-73f78d8.tgz) = df41c18062042c80a8348119c2b589a4590a1f311753ccb72900a3846b93dbd448dbf1a0dcd70fade3a4831bfe4b014a578bd1b907abe585b550a2064b11f11d From 7800f86dbf6ebf88c8e91189131ae8e2e7bcbb1c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 17 Jan 2025 14:57:56 +0100 Subject: [PATCH 11/21] v3.68.1 (cherry picked from commit b296aa829a314ebf79e764e91a9b8274c8fdd858) --- .gitignore | 1 + php-cs-fixer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7358aed..b6400f7 100644 --- a/.gitignore +++ b/.gitignore @@ -126,3 +126,4 @@ clog /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 diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index fd7d90b..120594e 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -9,14 +9,14 @@ %bcond_with generators -%global gh_commit 73f78d8b2b34a0dd65fedb434a602ee4c2c8ad4c +%global gh_commit b9db2b2ea3cdba7201067acee46f984ef2397cff %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2025-01-13 +%global gh_date 2025-01-17 %global gh_owner FriendsOfPHP %global gh_project PHP-CS-Fixer Name: php-cs-fixer -Version: 3.68.0 +Version: 3.68.1 Release: 1%{?dist} Summary: PHP Coding Standards Fixer @@ -164,6 +164,9 @@ PHP_CS_FIXER_IGNORE_ENV=1 ./%{name} --version | grep %{version} %changelog +* 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 diff --git a/sources b/sources index f4a54b2..02e68af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-cs-fixer-3.68.0-73f78d8.tgz) = df41c18062042c80a8348119c2b589a4590a1f311753ccb72900a3846b93dbd448dbf1a0dcd70fade3a4831bfe4b014a578bd1b907abe585b550a2064b11f11d +SHA512 (php-cs-fixer-3.68.1-b9db2b2.tgz) = c1643898147adec140dd0087eac87ec890e19f4a2ae2f9e8bd2095631359e20d2f89f60cda0a1e2968ce65da251a51642f7f5f7fdf4a08cbf0040d434c8e6502 From 7389e38170f20a6a40215eddb0f4855e1372ee6e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 28 Jan 2025 07:06:01 +0100 Subject: [PATCH 12/21] v3.68.3 (cherry picked from commit c2b30d25f2febabe642a29b12751ea7325540dbe) --- .gitignore | 1 + php-cs-fixer.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index b6400f7..4950cb6 100644 --- a/.gitignore +++ b/.gitignore @@ -127,3 +127,4 @@ clog /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 diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index 120594e..40fbd58 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-cs-fixer # -# Copyright (c) 2016-2024 Remi Collet +# Copyright (c) 2016-2025 Remi Collet # License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -9,14 +9,14 @@ %bcond_with generators -%global gh_commit b9db2b2ea3cdba7201067acee46f984ef2397cff +%global gh_commit 85fd31cced824749a732e697acdd1a3d657312f0 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2025-01-17 +%global gh_date 2025-01-27 %global gh_owner FriendsOfPHP %global gh_project PHP-CS-Fixer Name: php-cs-fixer -Version: 3.68.1 +Version: 3.68.3 Release: 1%{?dist} Summary: PHP Coding Standards Fixer @@ -164,6 +164,9 @@ PHP_CS_FIXER_IGNORE_ENV=1 ./%{name} --version | grep %{version} %changelog +* 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 diff --git a/sources b/sources index 02e68af..d977be6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-cs-fixer-3.68.1-b9db2b2.tgz) = c1643898147adec140dd0087eac87ec890e19f4a2ae2f9e8bd2095631359e20d2f89f60cda0a1e2968ce65da251a51642f7f5f7fdf4a08cbf0040d434c8e6502 +SHA512 (php-cs-fixer-3.68.3-85fd31c.tgz) = 59d42aac8a2a915447b16546e4b33928a0e9c48d66d416ce1feeaf46fd413217ef91105e3a84fa0c2d964a84601ebe261c02f562c332dfd8f6a6e175e5d69341 From 8e08ddb33651dce55e278f84856df911ea99287e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 30 Jan 2025 12:23:37 +0100 Subject: [PATCH 13/21] v3.68.4 (cherry picked from commit 8b33c0e262b9088d1d36c8cd8d30e75b1e31d386) --- .gitignore | 1 + php-cs-fixer.spec | 78 +++++------------------------------------------ sources | 2 +- 3 files changed, 9 insertions(+), 72 deletions(-) diff --git a/.gitignore b/.gitignore index 4950cb6..47304c5 100644 --- a/.gitignore +++ b/.gitignore @@ -128,3 +128,4 @@ clog /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 diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index 40fbd58..016ed2e 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -7,16 +7,14 @@ # Please, preserve the changelog entries # -%bcond_with generators - -%global gh_commit 85fd31cced824749a732e697acdd1a3d657312f0 +%global gh_commit 5c2f466ef3d7eba8af9463bcab829370b975333f %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2025-01-27 +%global gh_date 2025-01-30 %global gh_owner FriendsOfPHP %global gh_project PHP-CS-Fixer Name: php-cs-fixer -Version: 3.68.3 +Version: 3.68.4 Release: 1%{?dist} Summary: PHP Coding Standards Fixer @@ -34,9 +32,7 @@ BuildArch: noarch BuildRequires: php(language) >= 8.1 BuildRequires: php-cli BuildRequires: php-json -%if %{with generators} BuildRequires: composer-generators >= 0.1.1 -%endif # see composer.json and makesrc.sh Requires: php(language) >= 8.1 @@ -51,48 +47,6 @@ Requires: php-mbstring Obsoletes: php-cs-fixer3 < 3.5 Provides: php-cs-fixer3 = %{version} -%if %{without generators} -# Bundled PHP libraries -# License BSD-3-Clause -Provides: bundled(php-composer(sebastian/diff)) = 5.1.1 -# License MIT -Provides: bundled(php-composer(clue/ndjson-react)) = 1.3.0 -Provides: bundled(php-composer(composer/pcre)) = 3.3.2 -Provides: bundled(php-composer(composer/semver)) = 3.4.3 -Provides: bundled(php-composer(composer/xdebug-handler)) = 3.0.5 -Provides: bundled(php-composer(evenement/evenement)) = 3.0.2 -Provides: bundled(php-composer(fidry/cpu-core-counter)) = 1.2.0 -Provides: bundled(php-composer(psr/container)) = 2.0.2 -Provides: bundled(php-composer(psr/event-dispatcher)) = 1.0.0 -Provides: bundled(php-composer(psr/log)) = 2.0.0 -Provides: bundled(php-composer(react/cache)) = 1.2.0 -Provides: bundled(php-composer(react/child-process)) = 0.6.6 -Provides: bundled(php-composer(react/dns)) = 1.13.0 -Provides: bundled(php-composer(react/event-loop)) = 1.5.0 -Provides: bundled(php-composer(react/promise)) = 3.2.0 -Provides: bundled(php-composer(react/socket)) = 1.16.0 -Provides: bundled(php-composer(react/stream)) = 1.4.0 -Provides: bundled(php-composer(symfony/console)) = 6.4.17 -Provides: bundled(php-composer(symfony/deprecation-contracts)) = 3.5.1 -Provides: bundled(php-composer(symfony/event-dispatcher)) = 6.4.13 -Provides: bundled(php-composer(symfony/event-dispatcher-contracts)) = 3.5.1 -Provides: bundled(php-composer(symfony/filesystem)) = 6.4.13 -Provides: bundled(php-composer(symfony/finder)) = 6.4.17 -Provides: bundled(php-composer(symfony/options-resolver)) = 6.4.16 -Provides: bundled(php-composer(symfony/polyfill-ctype)) = 1.31.0 -Provides: bundled(php-composer(symfony/polyfill-intl-grapheme)) = 1.31.0 -Provides: bundled(php-composer(symfony/polyfill-intl-normalizer)) = 1.31.0 -Provides: bundled(php-composer(symfony/polyfill-mbstring)) = 1.31.0 -Provides: bundled(php-composer(symfony/polyfill-php80)) = 1.31.0 -Provides: bundled(php-composer(symfony/polyfill-php81)) = 1.31.0 -Provides: bundled(php-composer(symfony/process)) = 6.4.15 -Provides: bundled(php-composer(symfony/service-contracts)) = 3.5.1 -Provides: bundled(php-composer(symfony/stopwatch)) = 6.4.13 -Provides: bundled(php-composer(symfony/string)) = 6.4.15 - -Provides: php-composer(friendsofphp/php-cs-fixer) = %{version} -%endif - %description The PHP Coding Standards Fixer (PHP CS Fixer) tool fixes your code to follow @@ -112,28 +66,6 @@ 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 -%if %{without generators} -: 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-composer(%s)) = %s", $pkg["name"], ltrim($pkg["version"], "v")); - } - ksort($res); - foreach($res as $lic => $lib) { - sort($lib); - printf("# License %s\n%s\n", $lic, implode("\n", $lib)); - } -' -%endif %build # Empty build section, most likely nothing required. @@ -164,6 +96,10 @@ PHP_CS_FIXER_IGNORE_ENV=1 ./%{name} --version | grep %{version} %changelog +* 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 diff --git a/sources b/sources index d977be6..661cd76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-cs-fixer-3.68.3-85fd31c.tgz) = 59d42aac8a2a915447b16546e4b33928a0e9c48d66d416ce1feeaf46fd413217ef91105e3a84fa0c2d964a84601ebe261c02f562c332dfd8f6a6e175e5d69341 +SHA512 (php-cs-fixer-3.68.4-5c2f466.tgz) = f8893116d2419ee0fdd43f4d6465eb423dc1e718a1df34151806bc3659068354f5167df6f8881578fdd5d864ea9249c2f78143ac5ed5f29c2c7c467a89758987 From 181c7731dc88b7213f17ebb729400225799af1a0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 31 Jan 2025 10:12:14 +0100 Subject: [PATCH 14/21] v3.68.5 (cherry picked from commit df510153bbece5f7a2cf354de00e72500c7bfc27) --- .gitignore | 1 + php-cs-fixer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 47304c5..a0ddbda 100644 --- a/.gitignore +++ b/.gitignore @@ -129,3 +129,4 @@ clog /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 diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index 016ed2e..b782c0c 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -7,14 +7,14 @@ # Please, preserve the changelog entries # -%global gh_commit 5c2f466ef3d7eba8af9463bcab829370b975333f +%global gh_commit 7bedb718b633355272428c60736dc97fb96daf27 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_date 2025-01-30 %global gh_owner FriendsOfPHP %global gh_project PHP-CS-Fixer Name: php-cs-fixer -Version: 3.68.4 +Version: 3.68.5 Release: 1%{?dist} Summary: PHP Coding Standards Fixer @@ -96,6 +96,9 @@ PHP_CS_FIXER_IGNORE_ENV=1 ./%{name} --version | grep %{version} %changelog +* 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 diff --git a/sources b/sources index 661cd76..e78e2f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-cs-fixer-3.68.4-5c2f466.tgz) = f8893116d2419ee0fdd43f4d6465eb423dc1e718a1df34151806bc3659068354f5167df6f8881578fdd5d864ea9249c2f78143ac5ed5f29c2c7c467a89758987 +SHA512 (php-cs-fixer-3.68.5-7bedb71.tgz) = 2fa05773ccb9484646c31414731f9499a7d71f983e9af57fdf935624983481161cfc929d59675b906ff73c0d75674aa6c528a1d73e704b700269c0384fef4bd6 From ae7123f5b4e664262fd8413e5a176e470c85b338 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 17 Feb 2025 08:38:44 +0100 Subject: [PATCH 15/21] v3.69.0 (cherry picked from commit 13a076da08bcb3c67a9ca7469c9954edf9b8e637) --- .gitignore | 1 + makesrc.sh | 5 ++++- php-cs-fixer.spec | 13 ++++++++++--- sources | 2 +- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a0ddbda..0be094a 100644 --- a/.gitignore +++ b/.gitignore @@ -130,3 +130,4 @@ clog /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 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 b782c0c..70df3dd 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -7,14 +7,14 @@ # Please, preserve the changelog entries # -%global gh_commit 7bedb718b633355272428c60736dc97fb96daf27 +%global gh_commit 630a59448c00729bc235d5e95cfedefeaca37523 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2025-01-30 +%global gh_date 2025-02-14 %global gh_owner FriendsOfPHP %global gh_project PHP-CS-Fixer Name: php-cs-fixer -Version: 3.68.5 +Version: 3.69.0 Release: 1%{?dist} Summary: PHP Coding Standards Fixer @@ -66,6 +66,9 @@ 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 +# Fix version +sed -e '/VERSION/s/3.68.6-DEV/%{version}/' -i src/Console/Application.php + %build # Empty build section, most likely nothing required. @@ -83,6 +86,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} @@ -96,6 +100,9 @@ PHP_CS_FIXER_IGNORE_ENV=1 ./%{name} --version | grep %{version} %changelog +* 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 diff --git a/sources b/sources index e78e2f2..c8b4dbd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-cs-fixer-3.68.5-7bedb71.tgz) = 2fa05773ccb9484646c31414731f9499a7d71f983e9af57fdf935624983481161cfc929d59675b906ff73c0d75674aa6c528a1d73e704b700269c0384fef4bd6 +SHA512 (php-cs-fixer-3.69.0-630a594.tgz) = 4ddab8e3875b8255d152c995147d783d5caafb651a1a50ed6fc0f18ea3dc07dfb3e5f0cb2908253584e9548d5cc8cccc35da0a8548b300705802523c12d4d729 From 749dd3461e258cb1ea47b7be001a9cb4958c55a6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 19 Feb 2025 15:30:43 +0100 Subject: [PATCH 16/21] v3.69.1 (cherry picked from commit c5e0c3b0e82c4d413f924e330bcbd10b8c7be5e2) --- .gitignore | 1 + php-cs-fixer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0be094a..f5cfaf6 100644 --- a/.gitignore +++ b/.gitignore @@ -131,3 +131,4 @@ clog /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 diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index 70df3dd..887452e 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -7,14 +7,14 @@ # Please, preserve the changelog entries # -%global gh_commit 630a59448c00729bc235d5e95cfedefeaca37523 +%global gh_commit 13b0c0eede38c11cd674b080f2b485d0f14ffa9f %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2025-02-14 +%global gh_date 2025-02-18 %global gh_owner FriendsOfPHP %global gh_project PHP-CS-Fixer Name: php-cs-fixer -Version: 3.69.0 +Version: 3.69.1 Release: 1%{?dist} Summary: PHP Coding Standards Fixer @@ -100,6 +100,9 @@ PHP_CS_FIXER_IGNORE_ENV=1 ./%{name} --version | grep %{version} %changelog +* 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 diff --git a/sources b/sources index c8b4dbd..fed0822 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-cs-fixer-3.69.0-630a594.tgz) = 4ddab8e3875b8255d152c995147d783d5caafb651a1a50ed6fc0f18ea3dc07dfb3e5f0cb2908253584e9548d5cc8cccc35da0a8548b300705802523c12d4d729 +SHA512 (php-cs-fixer-3.69.1-13b0c0e.tgz) = 569e4a47424f269116a2e3831a4f91ca873a9b502bacaaabc462cba0203f3bcc1432ccb62e8a362b2a75282dd1113bf6b5fafce1a39fcb4ae7776ba513b6fdfd From 8a08905cd40333dc6968399764201759e91d5480 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 27 Feb 2025 09:32:47 +0100 Subject: [PATCH 17/21] v3.70.0 (cherry picked from commit d67d42423ed60db87748baa49f8bca82cf74f629) --- .gitignore | 1 + php-cs-fixer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f5cfaf6..008bb2e 100644 --- a/.gitignore +++ b/.gitignore @@ -132,3 +132,4 @@ clog /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 diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index 887452e..95af3ce 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -7,14 +7,14 @@ # Please, preserve the changelog entries # -%global gh_commit 13b0c0eede38c11cd674b080f2b485d0f14ffa9f +%global gh_commit 2ecd5aae0edc937f0d5aa4a22d1d705c6b2e084e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2025-02-18 +%global gh_date 2025-02-23 %global gh_owner FriendsOfPHP %global gh_project PHP-CS-Fixer Name: php-cs-fixer -Version: 3.69.1 +Version: 3.70.0 Release: 1%{?dist} Summary: PHP Coding Standards Fixer @@ -100,6 +100,9 @@ PHP_CS_FIXER_IGNORE_ENV=1 ./%{name} --version | grep %{version} %changelog +* 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 diff --git a/sources b/sources index fed0822..64aeaa3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-cs-fixer-3.69.1-13b0c0e.tgz) = 569e4a47424f269116a2e3831a4f91ca873a9b502bacaaabc462cba0203f3bcc1432ccb62e8a362b2a75282dd1113bf6b5fafce1a39fcb4ae7776ba513b6fdfd +SHA512 (php-cs-fixer-3.70.0-2ecd5aa.tgz) = c326a9208c2e0d908aaa596c978dcb521367d42381354b00133ab08d42eed0d8d08579b2b6e1fa25e6ba02f3238a03542f5ef46541c8047b8a4f7682dd151330 From c9a7c0e798922fa85051028f08946d79fac5c931 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 10 Mar 2025 08:40:19 +0100 Subject: [PATCH 18/21] v3.71.0 (cherry picked from commit e03806907ea50ca716ec850bba618ae2a48881a3) --- .gitignore | 1 + php-cs-fixer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 008bb2e..82b7f41 100644 --- a/.gitignore +++ b/.gitignore @@ -133,3 +133,4 @@ clog /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 diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index 95af3ce..ee8d26e 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -7,14 +7,14 @@ # Please, preserve the changelog entries # -%global gh_commit 2ecd5aae0edc937f0d5aa4a22d1d705c6b2e084e +%global gh_commit 3825ffdc69501e1c9230291b79f036a0c0d8749d %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2025-02-23 +%global gh_date 2025-03-07 %global gh_owner FriendsOfPHP %global gh_project PHP-CS-Fixer Name: php-cs-fixer -Version: 3.70.0 +Version: 3.71.0 Release: 1%{?dist} Summary: PHP Coding Standards Fixer @@ -100,6 +100,9 @@ PHP_CS_FIXER_IGNORE_ENV=1 ./%{name} --version | grep %{version} %changelog +* 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 diff --git a/sources b/sources index 64aeaa3..841bfef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-cs-fixer-3.70.0-2ecd5aa.tgz) = c326a9208c2e0d908aaa596c978dcb521367d42381354b00133ab08d42eed0d8d08579b2b6e1fa25e6ba02f3238a03542f5ef46541c8047b8a4f7682dd151330 +SHA512 (php-cs-fixer-3.71.0-3825ffd.tgz) = 8919ba6c63a4ae77a68a96002f351a018903881ef8d93593587a40493557d1455771b3c00a37c40a56ec21e5ecc00005eec0ed0eeb26fb663406def31616f5e9 From 822f85174ea08e057254849d574a921f70f17e15 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 18 Mar 2025 08:29:25 +0100 Subject: [PATCH 19/21] v3.72.0 (cherry picked from commit d9017e2cbfb3ab37851b846d92f27342f56b4143) --- .gitignore | 1 + php-cs-fixer.spec | 13 +++++++++---- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 82b7f41..bd32205 100644 --- a/.gitignore +++ b/.gitignore @@ -134,3 +134,4 @@ clog /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 diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index ee8d26e..4f73743 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -7,14 +7,14 @@ # Please, preserve the changelog entries # -%global gh_commit 3825ffdc69501e1c9230291b79f036a0c0d8749d +%global gh_commit 900389362c43d116fee1ffc51f7878145fa61b57 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2025-03-07 +%global gh_date 2025-03-13 %global gh_owner FriendsOfPHP %global gh_project PHP-CS-Fixer Name: php-cs-fixer -Version: 3.71.0 +Version: 3.72.0 Release: 1%{?dist} Summary: PHP Coding Standards Fixer @@ -67,7 +67,9 @@ projects. This tool does not only detect them, but also fixes them for you. %patch -P0 -p1 -b .rpm # Fix version -sed -e '/VERSION/s/3.68.6-DEV/%{version}/' -i src/Console/Application.php +#sed -e '/VERSION/s/3.68.6-DEV/%{version}/' -i src/Console/Application.php +# check version +grep "'%{version}'" src/Console/Application.php %build @@ -100,6 +102,9 @@ PHP_CS_FIXER_IGNORE_ENV=1 ./%{name} --version | grep %{version} %changelog +* 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 diff --git a/sources b/sources index 841bfef..e7519cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-cs-fixer-3.71.0-3825ffd.tgz) = 8919ba6c63a4ae77a68a96002f351a018903881ef8d93593587a40493557d1455771b3c00a37c40a56ec21e5ecc00005eec0ed0eeb26fb663406def31616f5e9 +SHA512 (php-cs-fixer-3.72.0-9003893.tgz) = 35380579140be4a6e4c56bec5a99915f91d95bd5e32e83d8c49d9e67cac6e3bf61db39e71a16e3e6ceca47282152c595714a5c066bf708808fb5f359067cdeb8 From 3c28ec4f31f21589fb16669e4eb7f881ce404017 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 26 Mar 2025 10:00:44 +0100 Subject: [PATCH 20/21] v3.73.1 (cherry picked from commit 286e2a37659ab8cf91e9a98e4849e651c0b6abce) --- .gitignore | 1 + php-cs-fixer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index bd32205..8494986 100644 --- a/.gitignore +++ b/.gitignore @@ -135,3 +135,4 @@ clog /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 diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index 4f73743..292d5a7 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -7,14 +7,14 @@ # Please, preserve the changelog entries # -%global gh_commit 900389362c43d116fee1ffc51f7878145fa61b57 +%global gh_commit ffcb8200a42045e65049af7910cfd022f631b064 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2025-03-13 +%global gh_date 2025-03-19 %global gh_owner FriendsOfPHP %global gh_project PHP-CS-Fixer Name: php-cs-fixer -Version: 3.72.0 +Version: 3.73.1 Release: 1%{?dist} Summary: PHP Coding Standards Fixer @@ -102,6 +102,9 @@ PHP_CS_FIXER_IGNORE_ENV=1 ./%{name} --version | grep %{version} %changelog +* 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 diff --git a/sources b/sources index e7519cf..471707c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-cs-fixer-3.72.0-9003893.tgz) = 35380579140be4a6e4c56bec5a99915f91d95bd5e32e83d8c49d9e67cac6e3bf61db39e71a16e3e6ceca47282152c595714a5c066bf708808fb5f359067cdeb8 +SHA512 (php-cs-fixer-3.73.1-ffcb820.tgz) = 1011dd0fe3108e4ad72858ee6678c5b4c42e4ff79c5077c269eb3b9a01c8a987281f294ce66e1964dd6a5c5a5db02c4f8af2ee449a5c77044f8bfcfb576bb20b From dccfcfe80b2ad5c1df6b168b4bb4b1c6efc93887 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Apr 2025 10:30:43 +0200 Subject: [PATCH 21/21] update to 3.75.0 re-license spec file to CECILL-2.1 (cherry picked from commit b33d14486d26c14cdc623e88e00e9cc382362af1) --- .gitignore | 1 + php-cs-fixer.spec | 16 ++++++++++------ sources | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 8494986..82ee6f0 100644 --- a/.gitignore +++ b/.gitignore @@ -136,3 +136,4 @@ clog /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/php-cs-fixer.spec b/php-cs-fixer.spec index 292d5a7..acf1753 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -1,20 +1,20 @@ # remirepo/fedora spec file for php-cs-fixer # -# Copyright (c) 2016-2025 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 # -%global gh_commit ffcb8200a42045e65049af7910cfd022f631b064 +%global gh_commit 399a128ff2fdaf4281e4e79b755693286cdf325c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2025-03-19 +%global gh_date 2025-03-31 %global gh_owner FriendsOfPHP %global gh_project PHP-CS-Fixer Name: php-cs-fixer -Version: 3.73.1 +Version: 3.75.0 Release: 1%{?dist} Summary: PHP Coding Standards Fixer @@ -102,6 +102,10 @@ 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 diff --git a/sources b/sources index 471707c..8d2b1f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-cs-fixer-3.73.1-ffcb820.tgz) = 1011dd0fe3108e4ad72858ee6678c5b4c42e4ff79c5077c269eb3b9a01c8a987281f294ce66e1964dd6a5c5a5db02c4f8af2ee449a5c77044f8bfcfb576bb20b +SHA512 (php-cs-fixer-3.75.0-399a128.tgz) = 1a9537b352b7aa9eb1962375988c7577dc4b80b50febaa1846f59ca7bede0d30a1c4b7a56c0b663c465383978c452cbcc50e5a047bbc972b48275b737a26be3b