From 0d7a88abf9de85065730c5e0d451613dbf3cc73e Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 7 Nov 2023 10:33:08 +0100
Subject: update to 3.38.0

---
 composer.json     | 36 +++++++++++++++++++++++++++++-------
 php-cs-fixer.spec |  7 +++++--
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index ae1b0ea..ec122c6 100644
--- a/composer.json
+++ b/composer.json
@@ -74,12 +74,17 @@
             "ergebnis/composer-normalize": true,
             "infection/extension-installer": false
         },
+        "prefer-stable": true,
         "sort-packages": true
     },
     "scripts": {
         "post-autoload-dump": [
             "@install-tools"
         ],
+        "auto-review": [
+            "Composer\\Config::disableProcessTimeout",
+            "paraunit run --testsuite auto-review"
+        ],
         "cs:check": "@php php-cs-fixer check --diff",
         "cs:fix": "@php php-cs-fixer fix",
         "cs:fix:parallel": "echo '🔍 Will run in batches of 50 files.'; if [[ -f .php-cs-fixer.php ]]; then FIXER_CONFIG=.php-cs-fixer.php; else FIXER_CONFIG=.php-cs-fixer.dist.php; fi; php php-cs-fixer list-files --config=$FIXER_CONFIG | xargs -n 50 -P 8 php php-cs-fixer fix --config=$FIXER_CONFIG --path-mode intersection 2> /dev/null",
@@ -97,7 +102,7 @@
             "Composer\\Config::disableProcessTimeout",
             "@install-tools --quiet",
             "@self-check",
-            "@sa",
+            "@static-analysis",
             "@test"
         ],
         "require-checker": "@php dev-tools/vendor/bin/composer-require-checker check composer.json --config-file .composer-require-checker.json",
@@ -106,7 +111,8 @@
             "./dev-tools/check_file_permissions.sh",
             "./dev-tools/check_trailing_spaces.sh",
             "@normalize",
-            "@require-checker"
+            "@require-checker",
+            "@auto-review"
         ],
         "static-analysis": [
             "@cs:check",
@@ -115,15 +121,28 @@
         ],
         "test": "@test:all",
         "test:all": [
-            "Composer\\Config::disableProcessTimeout",
-            "paraunit run --testsuite all"
+            "@test:unit",
+            "@test:integration"
         ],
         "test:coverage": [
             "Composer\\Config::disableProcessTimeout",
-            "paraunit run --testsuite coverage"
+            "paraunit coverage --testsuite unit --exclude-group covers-nothing"
+        ],
+        "test:integration": [
+            "Composer\\Config::disableProcessTimeout",
+            "paraunit run --testsuite integration"
+        ],
+        "test:smoke": [
+            "Composer\\Config::disableProcessTimeout",
+            "paraunit run --testsuite smoke"
+        ],
+        "test:unit": [
+            "Composer\\Config::disableProcessTimeout",
+            "paraunit run --testsuite unit"
         ]
     },
     "scripts-descriptions": {
+        "auto-review": "Execute Auto-review",
         "cs:check": "Check coding standards",
         "cs:fix": "Fix coding standards",
         "cs:fix:parallel": "Fix coding standards in naive parallel mode (using xargs)",
@@ -141,7 +160,10 @@
         "self-check": "Run set of self-checks ensuring repository's validity",
         "static-analysis": "Run static analysis",
         "test": "Alias for 'test:all'",
-        "test:all": "Run all tests",
-        "test:coverage": "Run tool-related tests"
+        "test:all": "Run Unit and Integration tests (but *NOT* Smoke tests)",
+        "test:coverage": "Run tests that provide code coverage",
+        "test:integration": "Run Integration tests",
+        "test:smoke": "Run Smoke tests",
+        "test:unit": "Run Unit tests"
     }
 }
diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec
index c620c55..92cd230 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    c3fe76976081ab871aa654e872da588077e19679
+%global gh_commit    7e6070026e76aa09d77a47519625c86593fb8e31
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 #global gh_date      20150717
 %global gh_owner     FriendsOfPHP
 %global gh_project   PHP-CS-Fixer
 
 Name:           php-cs-fixer
-Version:        3.37.1
+Version:        3.38.0
 Release:        1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}
 Summary:        PHP Coding Standards Fixer
 
@@ -150,6 +150,9 @@ PHP_CS_FIXER_IGNORE_ENV=1 ./%{name} --version | grep %{version}
 
 
 %changelog
+* Tue Nov  7 2023 Remi Collet <remi@remirepo.net> - 3.38.0-1
+- update to 3.38.0
+
 * Mon Oct 30 2023 Remi Collet <remi@remirepo.net> - 3.37.1-1
 - update to 3.37.1
 
-- 
cgit