wip

Author: mmoll

MO4/Sniffs/Formatting/AlphabeticalUseStatementsSniff.php

@@ -177,7 +177,8 @@ public function process(File $phpcsFile, $stackPtr): void
     private function getUseImport(File $phpcsFile, int $stackPtr)
     {
         $importTokens = [
-            T_NS_SEPARATOR,
+            T_NAME_FULLY_QUALIFIED,
+            T_NAME_QUALIFIED,
             T_STRING,
         ];
 

MO4/Sniffs/Formatting/UnnecessaryNamespaceUsageSniff.php

@@ -45,8 +45,9 @@ class UnnecessaryNamespaceUsageSniff implements Sniff
      * @var array<int, int>
      */
     private $classNameTokens = [
-        T_NS_SEPARATOR,
-        T_STRING,
+        T_NAME_FULLY_QUALIFIED,
+        T_NAME_QUALIFIED,
+        T_NAME_RELATIVE,
     ];
 
     /**
@@ -88,7 +89,9 @@ public function process(File $phpcsFile, $stackPtr): void
             '@var'    => 2,
         ];
         $scanTokens     = [
-            T_NS_SEPARATOR,
+            T_NAME_FULLY_QUALIFIED,
+            T_NAME_QUALIFIED,
+            T_NAME_RELATIVE,
             T_DOC_COMMENT_OPEN_TAG,
         ];
 
@@ -106,11 +109,7 @@ public function process(File $phpcsFile, $stackPtr): void
                 true
             );
 
-            if (T_NS_SEPARATOR === $tokens[$nsSep]['code']) {
-                if (T_STRING === $tokens[($nsSep - 1)]['code']) {
-                    --$nsSep;
-                }
-
+            if (\in_array($tokens[$nsSep]['code'], [T_NAME_FULLY_QUALIFIED, T_NAME_QUALIFIED, T_NAME_RELATIVE], true)) {
                 $className = $phpcsFile->getTokensAsString(
                     $nsSep,
                     ($classNameEnd - $nsSep)
@@ -264,8 +263,15 @@ protected function getUseStatements(File $phpcsFile, int $start, int $end): arra
             $length    = ($classNameEnd - $classNameStart);
             $className = $phpcsFile->getTokensAsString($classNameStart, $length);
 
-            $className                 = $this->getFullyQualifiedClassName($className);
-            $useStatements[$className] = $tokens[$aliasNamePtr]['content'];
+            $className    = $this->getFullyQualifiedClassName($className);
+            $tokenContent = $tokens[$aliasNamePtr]['content'];
+
+            if (\str_contains($tokenContent, '\\')) {
+                $path         = \explode('\\', $tokenContent);
+                $tokenContent = $path[\array_key_last($path)];
+            }
+
+            $useStatements[$className] = $tokenContent;
             $i                         = ($useEnd + 1);
 
             $useTokenPtr = T_COMMA === $tokens[$useEnd]['code'] ? $i : $phpcsFile->findNext(T_USE, $i, $end);

MO4/Tests/AbstractMo4SniffUnitTest.php

@@ -15,7 +15,7 @@
 namespace MO4\Tests;
 
 use PHP_CodeSniffer\Exceptions\RuntimeException;
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffTestCase;
 
 /**
  * Abstract class to make the writing of tests more convenient.
@@ -34,11 +34,11 @@
  *
  * @link      https://github.com/mayflower/mo4-coding-standard
  */
-abstract class AbstractMo4SniffUnitTest extends AbstractSniffUnitTest
+abstract class AbstractMo4SniffUnitTest extends AbstractSniffTestCase
 {
     /**
      * Array or Array containing the test file as key and as value the key-value pairs with line number and number of#
-     * errors as describe in @see AbstractSniffUnitTest::getErrorList
+     * errors as describe in @see AbstractSniffTestCase::getErrorList
      *
      * When the array is empty, the test will pass.
      *
@@ -48,7 +48,7 @@ abstract class AbstractMo4SniffUnitTest extends AbstractSniffUnitTest
 
     /**
      * Array or Array containing the test file as key and as value the key-value pairs with line number and number of#
-     * errors as describe in @see AbstractSniffUnitTest::getWarningList
+     * errors as describe in @see AbstractSniffTestCase::getWarningList
      *
      * When the array is empty, the test will pass.
      *

MO4/ruleset.xml

@@ -47,9 +47,7 @@
     <rule ref="Generic.Formatting.SpaceAfterCast"/>
     <!-- Align corresponding assignment statement tokens -->
     <rule ref="Generic.Formatting.MultipleStatementAlignment">
-        <properties>
-            <property name="error" value="true"/>
-        </properties>
+        <type>error</type>
     </rule>
     <!-- Forbid useless inline string concatenation -->
     <rule ref="Generic.Strings.UnnecessaryStringConcat">

composer.json

@@ -25,14 +25,15 @@
     "require": {
         "php": "^8.1",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7 || ^1.0",
-        "escapestudios/symfony2-coding-standard": "^3.16.0",
-        "slevomat/coding-standard": "^8.14",
-        "squizlabs/php_codesniffer": "^3.8.0"
+        "escapestudios/symfony2-coding-standard": "dev-phpcs4",
+        "slevomat/coding-standard": "dev-phpcs4",
+        "squizlabs/php_codesniffer": "4.x-dev"
     },
     "require-dev": {
         "ergebnis/composer-normalize": "^2.45",
         "nikic/php-parser": "< 5.0.1",
         "phan/phan": "^5.4.5",
+        "phpcsstandards/phpcsdevtools": "^1.2",
         "phpstan/phpstan": "^2.0",
         "phpstan/phpstan-strict-rules": "^2.0",
         "phpunit/phpunit": "^9.6.15",
@@ -42,6 +43,12 @@
         "symfony/polyfill-php83": "^1.32",
         "vimeo/psalm": "^6.0.0"
     },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "git@github.com:mmoll/Symfony-coding-standard.git"
+        }
+    ],
     "config": {
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true,

phpunit.xml.dist

@@ -8,7 +8,7 @@
 >
     <testsuites>
         <testsuite name="MO4 Ruleset Test Suite">
-            <file>vendor/squizlabs/php_codesniffer/tests/Standards/AllSniffs.php</file>
+            <directory>MO4/Tests</directory>
         </testsuite>
     </testsuites>
     <coverage processUncoveredFiles="false">

tests/bootstrap.php

@@ -22,7 +22,7 @@
 require_once __DIR__.'/../vendor/squizlabs/php_codesniffer/tests/bootstrap.php';
 
 // Add this Standard.
-Config::setConfigData(
+(new Config())->setConfigData(
     'installed_paths',
     __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.$myStandardName,
     true