Merge pull request #36 from flyeralarm/FixKeyForYodaSniff

Fix key for yoda sniff

Author: MichelHartmann

.gitattributes

@@ -0,0 +1,2 @@
+*.php text eol=lf
+*.xml text eol=lf

Makefile

@@ -1,5 +1,5 @@
 PHP_IMAGE_TAG=flyeralarm/php-code-valiator-cli:$(PHP_VERSION)
-PHP_VERSION?=8.2
+PHP_VERSION?=8.3
 
 PHP_BIN=$(RUNNER) php
 COMPOSER_BIN=$(RUNNER) /usr/bin/composer
@@ -40,6 +40,7 @@ test:
 
 .PHONY: test-all
 test-all:
+	PHP_VERSION=8.3 $(MAKE) build update sniff test
 	PHP_VERSION=8.2 $(MAKE) build update sniff test
 	PHP_VERSION=8.1 $(MAKE) build update sniff test
 	PHP_VERSION=7.4 $(MAKE) build update sniff test

README.md

@@ -23,6 +23,7 @@ interpreted as described in [RFC 2119](http://www.ietf.org/rfc/rfc2119.txt).
 
 To prepare run command:
 ```bash
+make build
 make install
 ```
 

composer.lock

@@ -2,8 +2,8 @@
 
 namespace Flyeralarm\CodingGuidelines\Flyeralarm\Sniffs\ControlStructures;
 
-use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
 
 class YodaSniff implements Sniff
 {
@@ -15,6 +15,7 @@ public function register()
         return [T_IF, T_ELSEIF, T_WHILE];
     }
 
+
     /**
      * @param File $phpcsFile
      * @param int $stackPtr
@@ -25,7 +26,7 @@ public function process(File $phpcsFile, $stackPtr)
         $tokens = $phpcsFile->getTokens();
 
         $startOfConditionPtr = $stackPtr;
-        $endPtr = $tokens[$startOfConditionPtr]['scope_opener'] + 1;
+        $endPtr = $this->getConditionStartPointerDoWhileStable($tokens[$startOfConditionPtr]);
 
         $logicalOperatorTokenIds = [T_BOOLEAN_AND, T_BOOLEAN_OR, T_LOGICAL_AND, T_LOGICAL_OR, T_LOGICAL_XOR];
         $scopeOpenerTokenIds = [T_OPEN_CURLY_BRACKET];
@@ -37,6 +38,7 @@ public function process(File $phpcsFile, $stackPtr)
         }
     }
 
+
     /**
      * @param File $phpcsFile
      * @param $startOfConditionPtr
@@ -115,4 +117,14 @@ private function checkConditionalOrderForArithmeticExpression(
             'ConditionalOrder'
         );
     }
+
+
+    private function getConditionStartPointerDoWhileStable(array $array): ?int
+    {
+        if (array_key_exists('scope_opener', $array)) {
+            return $array['scope_opener'] + 1;
+        }
+
+        return null;
+    }
 }

custom-standards/Flyeralarm/Sniffs/ControlStructures/YodaSniff.php

@@ -0,0 +1,10 @@
+<?php
+
+// @expectedPass
+
+namespace Flyeralarm\CodingGuidelines;
+
+$i = 0;
+do {
+    echo $i;
+} while ($i > 0);