Merge remote-tracking branch 'origin/cleanup'

Author: lkrms

.php-cs-fixer.dist.php

@@ -48,14 +48,17 @@
         'phpdoc_no_useless_inheritdoc' => true,
         'phpdoc_order' => ['order' => [
             'todo',
-            'method',
             'property',
+            'property-read',
+            'property-write',
+            'method',
             'api',
             'internal',
             'requires',
             'dataProvider',
             'backupGlobals',
             'template',
+            'template-covariant',
             'extends',
             'implements',
             'use',
@@ -64,18 +67,20 @@
             'readonly',
             'var',
             'param',
+            'param-out',
             'return',
             'throws',
         ]],
         // 'phpdoc_param_order' => true,
         'phpdoc_separation' => ['groups' => [
             ['see', 'link'],
-            ['property', 'phpstan-property', 'property-read', 'phpstan-property-read'],
+            ['property', 'property-read', 'property-write', 'phpstan-property', 'phpstan-property-read', 'phpstan-property-write'],
+            ['method', 'phpstan-method'],
             ['requires', 'dataProvider', 'backupGlobals'],
             ['template', 'template-covariant'],
             ['extends', 'implements', 'use'],
             ['phpstan-require-extends', 'phpstan-require-implements'],
-            ['readonly', 'var', 'phpstan-var', 'param', 'param-out', 'phpstan-param', 'return', 'phpstan-return', 'throws', 'phpstan-assert*', 'phpstan-ignore*', 'disregard'],
+            ['readonly', 'var', 'param', 'param-out', 'return', 'throws', 'phpstan-var', 'phpstan-param', 'phpstan-return', 'phpstan-assert*', 'phpstan-ignore*', 'disregard'],
             ['phpstan-*'],
         ]],
         'phpdoc_tag_casing' => true,

phpstan-baseline-7.4.neon

@@ -802,15 +802,19 @@ public function exception(
                 $message = $this->escape($ex->getMessage());
             }
 
-            $file = $this->escape($ex->getFile());
-            $line = $ex->getLine();
-            $msg2 .= sprintf('%s ~~in %s:%d~~', $message, $file, $line);
+            if ($level <= Level::ERROR || ($debug ??= Env::getDebug())) {
+                $file = $this->escape($ex->getFile());
+                $line = $ex->getLine();
+                $msg2 .= sprintf('%s ~~in %s:%d~~', $message, $file, $line);
+            } else {
+                $msg2 .= $message;
+            }
         } while ($ex = $ex->getPrevious());
 
         $class = $this->escape(Get::basename(get_class($exception)));
         $this->count($level)->write(
             $level,
-            sprintf('__%s__:', $class),
+            "{$class}:",
             $msg2,
             MessageType::STANDARD,
             $exception,
@@ -821,13 +825,13 @@ public function exception(
         }
         $this->write(
             $traceLevel,
-            '__Stack trace:__',
+            'Stack trace:',
             "\n" . $exception->getTraceAsString()
         );
         if ($exception instanceof ExceptionInterface) {
             foreach ($exception->getMetadata() as $key => $value) {
                 $value = rtrim((string) $value, "\n");
-                $this->write($traceLevel, "__{$key}:__", "\n{$value}");
+                $this->write($traceLevel, "{$key}:", "\n{$value}");
             }
         }
 

phpstan-baseline-8.3.neon

@@ -95,8 +95,8 @@ private static function loadServiceList(): void
 
     /**
      * @param class-string<TService> $serviceName
-     * @param-out class-string<TService> $serviceName
      * @param array<class-string<TService>> $serviceList
+     * @param-out class-string<TService> $serviceName
      * @param-out array<class-string<TService>> $serviceList
      */
     private static function doLoadServiceList(?string &$serviceName, ?array &$serviceList): void