fix: update default value for 'separate' option to 'none' and improve DocBlock spacing compatibility

Author: jackd248

src/Rules/DocBlockHeaderFixer.php

@@ -79,7 +79,7 @@ public function getConfigurationDefinition(): FixerConfigurationResolverInterfac
                 ->getOption(),
             (new FixerOptionBuilder('separate', 'Separate the comment'))
                 ->setAllowedValues(Separate::getList())
-                ->setDefault(Separate::Both->value)
+                ->setDefault(Separate::None->value)
                 ->getOption(),
             (new FixerOptionBuilder('add_class_name', 'Add class name before annotations'))
                 ->setAllowedTypes(['bool'])
@@ -202,7 +202,7 @@ private function replaceDocBlock(Tokens $tokens, int $docBlockIndex, array $anno
      */
     private function insertNewDocBlock(Tokens $tokens, int $classIndex, array $annotations, string $className): void
     {
-        $separate = $this->resolvedConfiguration['separate'] ?? 'both';
+        $separate = $this->resolvedConfiguration['separate'] ?? 'none';
         $insertIndex = $this->findInsertPosition($tokens, $classIndex);
 
         $tokensToInsert = [];
@@ -216,9 +216,14 @@ private function insertNewDocBlock(Tokens $tokens, int $classIndex, array $annot
         $docBlock = $this->buildDocBlock($annotations, $className);
         $tokensToInsert[] = new Token([T_DOC_COMMENT, $docBlock]);
 
-        // Add separation after comment if needed
+        // For compatibility with no_blank_lines_after_phpdoc, only add bottom separation when 'separate' is not 'none'
+        // This prevents conflicts with PHP-CS-Fixer rules that manage DocBlock spacing
         if (in_array($separate, ['bottom', 'both'], true)) {
-            $tokensToInsert[] = new Token([T_WHITESPACE, "\n"]);
+            // Check if there's already whitespace after the class declaration
+            $nextToken = $tokens[$classIndex] ?? null;
+            if (null !== $nextToken && !$nextToken->isWhitespace()) {
+                $tokensToInsert[] = new Token([T_WHITESPACE, "\n"]);
+            }
         }
 
         $tokens->insertAt($insertIndex, $tokensToInsert);
@@ -296,7 +301,7 @@ private function buildDocBlock(array $annotations, string $className): string
         if ($addClassName && !empty($className)) {
             $docBlock .= " * {$className}.\n";
 
-            // Add empty line after class name if there are annotations
+            // Add empty line after class name if there are annotations - compatible with phpdoc_separation
             if (!empty($annotations)) {
                 $docBlock .= " *\n";
             }