Merge pull request #192 from PHPCSStandards/feature/psr12-controlstructurespacing-minor-tweak

PSR12/ControlStructureSpacing: small tweak

Author: jrfnl

src/Standards/PSR12/Sniffs/ControlStructures/ControlStructureSpacingSniff.php

@@ -11,7 +11,7 @@
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Standards\PSR2\Sniffs\ControlStructures\ControlStructureSpacingSniff as PSR2Spacing;
+use PHP_CodeSniffer\Standards\PSR2\Sniffs\ControlStructures\ControlStructureSpacingSniff as PSR2ControlStructureSpacing;
 use PHP_CodeSniffer\Util\Tokens;
 
 class ControlStructureSpacingSniff implements Sniff
@@ -24,6 +24,23 @@ class ControlStructureSpacingSniff implements Sniff
      */
     public $indent = 4;
 
+    /**
+     * Instance of the PSR2 ControlStructureSpacingSniff sniff.
+     *
+     * @var \PHP_CodeSniffer\Standards\PSR2\Sniffs\ControlStructures\ControlStructureSpacingSniff
+     */
+    private $psr2ControlStructureSpacing;
+
+
+    /**
+     * Constructor.
+     */
+    public function __construct()
+    {
+        $this->psr2ControlStructureSpacing = new PSR2ControlStructureSpacing();
+
+    }//end __construct()
+
 
     /**
      * Returns an array of tokens this test wants to listen for.
@@ -70,8 +87,7 @@ public function process(File $phpcsFile, $stackPtr)
 
         if ($tokens[$parenOpener]['line'] === $tokens[$parenCloser]['line']) {
             // Conditions are all on the same line, so follow PSR2.
-            $sniff = new PSR2Spacing();
-            return $sniff->process($phpcsFile, $stackPtr);
+            return $this->psr2ControlStructureSpacing->process($phpcsFile, $stackPtr);
         }
 
         $next = $phpcsFile->findNext(T_WHITESPACE, ($parenOpener + 1), $parenCloser, true);