Merge pull request #1610 from getsentry/4.x

Merge 4.x into master

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Update PHPCS (#1599)
+f8b64d330d03cbf809795beb5846b2c48175cd62

.github/workflows/static-analysis.yaml

@@ -18,13 +18,13 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.1'
+          php-version: '8.2'
 
       - name: Install dependencies
         run: composer update --no-progress --no-interaction --prefer-dist
 
       - name: Run script
-        run: composer phpcs
+        run: vendor/bin/php-cs-fixer fix --verbose --diff --dry-run
 
   phpstan:
     name: PHPStan
@@ -42,7 +42,7 @@ jobs:
         run: composer update --no-progress --no-interaction --prefer-dist
 
       - name: Run script
-        run: composer phpstan
+        run: vendor/bin/phpstan analyse
 
   psalm:
     name: Psalm
@@ -62,4 +62,4 @@ jobs:
         run: composer update --no-progress --no-interaction --prefer-dist
 
       - name: Run script
-        run: composer psalm
+        run: vendor/bin/psalm

.php-cs-fixer.dist.php

@@ -10,9 +10,20 @@
             'imports_order' => ['class', 'function', 'const'],
         ],
         'declare_strict_types' => true,
-        'yoda_style' => true,
+        'get_class_to_class_keyword' => false,
+        'yoda_style' => [
+            'equal' => false,
+            'identical' => false,
+            'less_and_greater' => false,
+        ],
         'self_accessor' => false,
-        'phpdoc_no_useless_inheritdoc' => false,
+        'modernize_strpos' => false,
+        'nullable_type_declaration_for_default_null_value' => [
+            'use_nullable_type_declaration' => true,
+        ],
+        'no_superfluous_phpdoc_tags' => [
+            'allow_mixed' => true,
+        ],
         'phpdoc_to_comment' => false,
         'phpdoc_align' => [
             'tags' => ['param', 'return', 'throws', 'type', 'var'],