code review fixes

Author: milindsingh

Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php

@@ -14,6 +14,8 @@
  */
 class DeprecatedModelMethodSniff implements Sniff
 {
+    const RESOURCE_METHOD = "getResource";
+
     /**
      * String representation of warning.
      *
@@ -48,8 +50,7 @@ class DeprecatedModelMethodSniff implements Sniff
     public function register()
     {
         return [
-            T_OBJECT_OPERATOR,
-            T_DOUBLE_COLON
+            T_OBJECT_OPERATOR
         ];
     }
     /**
@@ -58,21 +59,22 @@ public function register()
     public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
-        $methodPosition = $phpcsFile->findNext(T_STRING, $stackPtr + 1);
-
-        if ($methodPosition !== false &&
-            in_array($tokens[$methodPosition]['content'], $this->methods)
-        ) {
-            $resourcePosition = $phpcsFile->findPrevious([T_STRING, T_VARIABLE], $stackPtr - 1);
-            if ($resourcePosition !== false) {
-                $methodName = $tokens[$resourcePosition]['content'];
-                if ($methodName === "getResource") {
-                    $phpcsFile->addWarning(
-                        sprintf($this->warningMessage, $tokens[$methodPosition]['content']),
-                        $stackPtr,
-                        $this->warningCode
-                    );
-                }
+        $endOfStatement = $phpcsFile->findEndOfStatement($stackPtr);
+        $resourcePosition = $phpcsFile->findNext(
+            T_STRING,
+            $stackPtr + 1,
+            $endOfStatement,
+            false,
+            self::RESOURCE_METHOD
+        );
+        if ($resourcePosition !== false) {
+            $methodPosition = $phpcsFile->findNext([T_STRING, T_VARIABLE], $resourcePosition + 1, $endOfStatement);
+            if ($methodPosition !== false && in_array($tokens[$methodPosition]['content'], $this->methods)) {
+                $phpcsFile->addWarning(
+                    sprintf($this->warningMessage, $tokens[$methodPosition]['content']),
+                    $stackPtr,
+                    $this->warningCode
+                );
             }
         }
     }

Magento2/Tests/Methods/DeprecatedModelMethodUnitTest.inc

@@ -1,4 +1,7 @@
 <?php
-$model->getResource()->save();
-$model->getResource()->load();
-$model->getResource()->delete();
+
+$model->getResource()->save($model);
+
+$model->getResource()->load($model, $id);
+
+$model->getResource()->delete($model);

Magento2/Tests/Methods/DeprecatedModelMethodUnitTest.php

@@ -23,9 +23,9 @@ public function getErrorList()
     public function getWarningList()
     {
         return [
-            2 => 1,
             3 => 1,
-            4 => 1
+            5 => 1,
+            7 => 1,
         ];
     }
 }