From 220ef55488a2157f386d4fa869dd078bba480028 Mon Sep 17 00:00:00 2001
From: Mark Scherer <dereuromark@users.noreply.github.com>
Date: Sun, 25 Oct 2026 14:55:32 +0100
Subject: [PATCH] Write multi-catch type separators without spaces

Union and intersection types are enforced without spaces around `|` and
`&`, but the `|` in a multi-catch is tokenized as a bitwise OR, so
PSR12.Operators.OperatorSpacing required `catch (A | B $e)`, the
opposite style.

New PhpCollective.WhiteSpace.CatchTypeSeparatorSpacing reports spaces
around a catch type separator and removes them; a separator next to a
newline is reported but not fixed. PSR12.Operators.OperatorSpacing is
replaced by PhpCollective.Operators.OperatorSpacing, a subclass that
skips catch separators and otherwise behaves the same, including the
skip over declare() statements.
---
 .../Sniffs/Operators/OperatorSpacingSniff.php | 34 +++++++
 .../CatchTypeSeparatorSpacingSniff.php        | 90 +++++++++++++++++++
 PhpCollective/ruleset.xml                     |  1 +
 docs/sniffs.md                                |  9 +-
 .../Operators/OperatorSpacingSniffTest.php    | 26 ++++++
 .../CatchTypeSeparatorSpacingSniffTest.php    | 24 +++++
 .../_data/CatchTypeSeparatorSpacing/after.php | 17 ++++
 .../CatchTypeSeparatorSpacing/before.php      | 17 ++++
 tests/_data/OperatorSpacing/before.php        | 10 +++
 9 files changed, 224 insertions(+), 4 deletions(-)
 create mode 100644 PhpCollective/Sniffs/Operators/OperatorSpacingSniff.php
 create mode 100644 PhpCollective/Sniffs/WhiteSpace/CatchTypeSeparatorSpacingSniff.php
 create mode 100644 tests/PhpCollective/Sniffs/Operators/OperatorSpacingSniffTest.php
 create mode 100644 tests/PhpCollective/Sniffs/WhiteSpace/CatchTypeSeparatorSpacingSniffTest.php
 create mode 100644 tests/_data/CatchTypeSeparatorSpacing/after.php
 create mode 100644 tests/_data/CatchTypeSeparatorSpacing/before.php
 create mode 100644 tests/_data/OperatorSpacing/before.php

diff --git a/PhpCollective/Sniffs/Operators/OperatorSpacingSniff.php b/PhpCollective/Sniffs/Operators/OperatorSpacingSniff.php
new file mode 100644
index 0000000..071ff70
--- /dev/null
+++ b/PhpCollective/Sniffs/Operators/OperatorSpacingSniff.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * MIT License
+ * For full license information, please view the LICENSE file that was distributed with this source code.
+ */
+
+namespace PhpCollective\Sniffs\Operators;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Standards\PSR12\Sniffs\Operators\OperatorSpacingSniff as Psr12OperatorSpacingSniff;
+use PhpCollective\Sniffs\WhiteSpace\CatchTypeSeparatorSpacingSniff;
+
+/**
+ * Applies PSR12 operator spacing outside catch type lists.
+ */
+class OperatorSpacingSniff extends Psr12OperatorSpacingSniff
+{
+    /**
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile
+     * @param int $stackPtr
+     *
+     * @return int|null
+     */
+    public function process(File $phpcsFile, int $stackPtr): ?int
+    {
+        if (CatchTypeSeparatorSpacingSniff::isCatchTypeSeparator($phpcsFile, $stackPtr)) {
+            return null;
+        }
+
+        // The parent returns a pointer to skip over declare() statements
+        return parent::process($phpcsFile, $stackPtr);
+    }
+}
diff --git a/PhpCollective/Sniffs/WhiteSpace/CatchTypeSeparatorSpacingSniff.php b/PhpCollective/Sniffs/WhiteSpace/CatchTypeSeparatorSpacingSniff.php
new file mode 100644
index 0000000..c922775
--- /dev/null
+++ b/PhpCollective/Sniffs/WhiteSpace/CatchTypeSeparatorSpacingSniff.php
@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * MIT License
+ * For full license information, please view the LICENSE file that was distributed with this source code.
+ */
+
+namespace PhpCollective\Sniffs\WhiteSpace;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Util\Tokens;
+
+/**
+ * Requires catch type separators to have no surrounding whitespace.
+ */
+class CatchTypeSeparatorSpacingSniff implements Sniff
+{
+    public function register(): array
+    {
+        return [T_BITWISE_OR];
+    }
+
+    /**
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile
+     * @param int $stackPtr
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, int $stackPtr): void
+    {
+        if (!self::isCatchTypeSeparator($phpcsFile, $stackPtr)) {
+            return;
+        }
+
+        $tokens = $phpcsFile->getTokens();
+        $before = $phpcsFile->findPrevious(Tokens::$emptyTokens, $stackPtr - 1, null, true);
+        $after = $phpcsFile->findNext(Tokens::$emptyTokens, $stackPtr + 1, null, true);
+
+        if ($before === false || $after === false) {
+            return;
+        }
+
+        $newline = $tokens[$before]['line'] !== $tokens[$stackPtr]['line']
+            || $tokens[$after]['line'] !== $tokens[$stackPtr]['line'];
+        $spacing = false;
+        for ($i = $before + 1; $i < $after; $i++) {
+            if ($tokens[$i]['code'] === T_WHITESPACE) {
+                $spacing = true;
+
+                break;
+            }
+        }
+        if (!$newline && !$spacing) {
+            return;
+        }
+
+        $message = 'Expected no whitespace around the catch type separator';
+        if ($newline) {
+            $phpcsFile->addError($message, $stackPtr, 'SpacesAround');
+
+            return;
+        }
+
+        $fix = $phpcsFile->addFixableError($message, $stackPtr, 'SpacesAround');
+        if ($fix) {
+            $phpcsFile->fixer->beginChangeset();
+            for ($i = $before + 1; $i < $after; $i++) {
+                if ($i !== $stackPtr && $tokens[$i]['code'] === T_WHITESPACE) {
+                    $phpcsFile->fixer->replaceToken($i, '');
+                }
+            }
+            $phpcsFile->fixer->endChangeset();
+        }
+    }
+
+    public static function isCatchTypeSeparator(File $phpcsFile, int $stackPtr): bool
+    {
+        $tokens = $phpcsFile->getTokens();
+        if ($tokens[$stackPtr]['code'] !== T_BITWISE_OR || empty($tokens[$stackPtr]['nested_parenthesis'])) {
+            return false;
+        }
+
+        $openers = array_keys($tokens[$stackPtr]['nested_parenthesis']);
+        $opener = end($openers);
+
+        return isset($tokens[$opener]['parenthesis_owner'])
+            && $tokens[$tokens[$opener]['parenthesis_owner']]['code'] === T_CATCH;
+    }
+}
diff --git a/PhpCollective/ruleset.xml b/PhpCollective/ruleset.xml
index e5a84ee..fa271fd 100644
--- a/PhpCollective/ruleset.xml
+++ b/PhpCollective/ruleset.xml
@@ -237,6 +237,7 @@
         <exclude name="PSR12.Files.OpenTag"/>
         <!-- Long casts are covered by SlevomatCodingStandard.PHP.TypeCast, which catches more. -->
         <exclude name="PSR12.Keywords.ShortFormTypeKeywords"/>
+        <exclude name="PSR12.Operators.OperatorSpacing"/>
     </rule>
 
     <!--
diff --git a/docs/sniffs.md b/docs/sniffs.md
index d9dd83c..e85df3c 100644
--- a/docs/sniffs.md
+++ b/docs/sniffs.md
@@ -1,7 +1,7 @@
 # PhpCollective Code Sniffer
 
 
-The PhpCollectiveStrict standard contains 250 sniffs
+The PhpCollectiveStrict standard contains 251 sniffs
 
 Generic (27 sniffs)
 -------------------
@@ -48,7 +48,7 @@ PEAR (4 sniffs)
 - PEAR.Functions.ValidDefaultValue
 - PEAR.NamingConventions.ValidClassName
 
-PhpCollective (85 sniffs)
+PhpCollective (87 sniffs)
 -------------------------
 - PhpCollective.Arrays.ArrayBracketSpacing
 - PhpCollective.Arrays.DisallowImplicitArrayCreation
@@ -107,6 +107,7 @@ PhpCollective (85 sniffs)
 - PhpCollective.Namespaces.FunctionNamespace
 - PhpCollective.Namespaces.UseStatement
 - PhpCollective.Namespaces.UseWithAliasing
+- PhpCollective.Operators.OperatorSpacing
 - PhpCollective.PHP.DeclareStrictTypes
 - PhpCollective.PHP.DisallowFunctions
 - PhpCollective.PHP.DisallowTrailingCommaInSingleLine
@@ -122,6 +123,7 @@ PhpCollective (85 sniffs)
 - PhpCollective.Testing.AssertPrimitives
 - PhpCollective.Testing.ExpectException
 - PhpCollective.Testing.Mock
+- PhpCollective.WhiteSpace.CatchTypeSeparatorSpacing
 - PhpCollective.WhiteSpace.ConcatenationSpacing
 - PhpCollective.WhiteSpace.ConsistentIndent
 - PhpCollective.WhiteSpace.DocBlockSpacing
@@ -163,7 +165,7 @@ PSR2 (12 sniffs)
 - PSR2.Namespaces.NamespaceDeclaration
 - PSR2.Namespaces.UseDeclaration
 
-PSR12 (13 sniffs)
+PSR12 (12 sniffs)
 -----------------
 - PSR12.Classes.AnonClassDeclaration
 - PSR12.Classes.ClassInstantiation
@@ -175,7 +177,6 @@ PSR12 (13 sniffs)
 - PSR12.Functions.NullableTypeDeclaration
 - PSR12.Functions.ReturnTypeDeclaration
 - PSR12.Namespaces.CompoundNamespaceDepth
-- PSR12.Operators.OperatorSpacing
 - PSR12.Properties.ConstantVisibility
 - PSR12.Traits.UseDeclaration
 
diff --git a/tests/PhpCollective/Sniffs/Operators/OperatorSpacingSniffTest.php b/tests/PhpCollective/Sniffs/Operators/OperatorSpacingSniffTest.php
new file mode 100644
index 0000000..ff375d1
--- /dev/null
+++ b/tests/PhpCollective/Sniffs/Operators/OperatorSpacingSniffTest.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * MIT License
+ * For full license information, please view the LICENSE file that was distributed with this source code.
+ */
+
+namespace PhpCollective\Test\PhpCollective\Sniffs\Operators;
+
+use PhpCollective\Sniffs\Operators\OperatorSpacingSniff;
+use PhpCollective\Test\TestCase;
+
+class OperatorSpacingSniffTest extends TestCase
+{
+    public function testBitwiseOperator(): void
+    {
+        $errors = $this->assertSnifferFindsFixableErrors(new OperatorSpacingSniff(), 2, 2);
+        $sources = array_merge(...array_map(static function (array $line): array {
+            return array_merge(...array_map(static function (array $column): array {
+                return array_column($column, 'source');
+            }, $line));
+        }, $errors));
+        $this->assertContains('PhpCollective.Operators.OperatorSpacing.NoSpaceBefore', $sources);
+        $this->assertContains('PhpCollective.Operators.OperatorSpacing.NoSpaceAfter', $sources);
+    }
+}
diff --git a/tests/PhpCollective/Sniffs/WhiteSpace/CatchTypeSeparatorSpacingSniffTest.php b/tests/PhpCollective/Sniffs/WhiteSpace/CatchTypeSeparatorSpacingSniffTest.php
new file mode 100644
index 0000000..dbd5d3a
--- /dev/null
+++ b/tests/PhpCollective/Sniffs/WhiteSpace/CatchTypeSeparatorSpacingSniffTest.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * MIT License
+ * For full license information, please view the LICENSE file that was distributed with this source code.
+ */
+
+namespace PhpCollective\Test\PhpCollective\Sniffs\WhiteSpace;
+
+use PhpCollective\Sniffs\WhiteSpace\CatchTypeSeparatorSpacingSniff;
+use PhpCollective\Test\TestCase;
+
+class CatchTypeSeparatorSpacingSniffTest extends TestCase
+{
+    public function testSpacing(): void
+    {
+        $this->assertSnifferFindsFixableErrors(new CatchTypeSeparatorSpacingSniff(), 7, 5);
+    }
+
+    public function testFixer(): void
+    {
+        $this->assertSnifferCanFixErrors(new CatchTypeSeparatorSpacingSniff(), 5);
+    }
+}
diff --git a/tests/_data/CatchTypeSeparatorSpacing/after.php b/tests/_data/CatchTypeSeparatorSpacing/after.php
new file mode 100644
index 0000000..a70763f
--- /dev/null
+++ b/tests/_data/CatchTypeSeparatorSpacing/after.php
@@ -0,0 +1,17 @@
+<?php
+
+try {
+    risky();
+} catch (A|B $e) {
+} catch (A|B|C) {
+} catch (A|B $e) {
+} catch (\Example\A|\Example\B $e) {
+} catch (A/* note */|B $e) {
+} catch (A/* note */|B $e) {
+} catch (A
+    | B $e) {
+} catch (A |
+    B $e) {
+}
+
+$value = $a|$b;
diff --git a/tests/_data/CatchTypeSeparatorSpacing/before.php b/tests/_data/CatchTypeSeparatorSpacing/before.php
new file mode 100644
index 0000000..8119d40
--- /dev/null
+++ b/tests/_data/CatchTypeSeparatorSpacing/before.php
@@ -0,0 +1,17 @@
+<?php
+
+try {
+    risky();
+} catch (A | B $e) {
+} catch (A | B | C) {
+} catch (A|B $e) {
+} catch (\Example\A | \Example\B $e) {
+} catch (A /* note */ | B $e) {
+} catch (A/* note */|B $e) {
+} catch (A
+    | B $e) {
+} catch (A |
+    B $e) {
+}
+
+$value = $a|$b;
diff --git a/tests/_data/OperatorSpacing/before.php b/tests/_data/OperatorSpacing/before.php
new file mode 100644
index 0000000..07b5dd9
--- /dev/null
+++ b/tests/_data/OperatorSpacing/before.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+try {
+    risky();
+} catch (A|B $e) {
+}
+
+$value = $a|$b;