Improve performance of InterfaceValidator

Author: lbajsarowicz

lib/internal/Magento/Framework/Interception/Code/InterfaceValidator.php

@@ -5,30 +5,29 @@
  */
 namespace Magento\Framework\Interception\Code;
 
+use Magento\Framework\Code\Reader\ArgumentsReader;
 use Magento\Framework\Exception\ValidatorException;
 use Magento\Framework\Phrase;
 
 class InterfaceValidator
 {
-    const METHOD_BEFORE = 'before';
-
-    const METHOD_AROUND = 'around';
-
-    const METHOD_AFTER = 'after';
+    public const METHOD_BEFORE = 'before';
+    public const METHOD_AROUND = 'around';
+    public const METHOD_AFTER = 'after';
 
     /**
      * Arguments reader model
      *
-     * @var \Magento\Framework\Code\Reader\ArgumentsReader
+     * @var ArgumentsReader
      */
     protected $_argumentsReader;
 
     /**
-     * @param \Magento\Framework\Code\Reader\ArgumentsReader $argumentsReader
+     * @param ArgumentsReader $argumentsReader
      */
-    public function __construct(\Magento\Framework\Code\Reader\ArgumentsReader $argumentsReader = null)
+    public function __construct(ArgumentsReader $argumentsReader = null)
     {
-        $this->_argumentsReader = $argumentsReader ?: new \Magento\Framework\Code\Reader\ArgumentsReader();
+        $this->_argumentsReader = $argumentsReader ?? new ArgumentsReader();
     }
 
     /**
@@ -50,7 +49,7 @@ public function validate($pluginClass, $interceptedType)
         $type = new \ReflectionClass($interceptedType);
 
         foreach ($plugin->getMethods(\ReflectionMethod::IS_PUBLIC) as $pluginMethod) {
-            /** @var  $pluginMethod \ReflectionMethod */
+            /** @var \ReflectionMethod $pluginMethod */
             $originMethodName = $this->getOriginMethodName($pluginMethod->getName());
             if ($originMethodName === null) {
                 continue;
@@ -71,11 +70,8 @@ public function validate($pluginClass, $interceptedType)
             $methodType = $this->getMethodType($pluginMethod->getName());
 
             $subject = array_shift($pluginMethodParameters);
-            if (!$this->_argumentsReader->isCompatibleType(
-                $subject['type'],
-                $interceptedType
-            ) || $subject['type'] === null
-            ) {
+            if ($subject['type'] === null
+                || !$this->_argumentsReader->isCompatibleType($subject['type'], $interceptedType)) {
                 throw new ValidatorException(
                     new Phrase(
                         'Invalid [%1] $%2 type in %3::%4. It must be compatible with %5',
@@ -85,6 +81,19 @@ public function validate($pluginClass, $interceptedType)
             }
 
             switch ($methodType) {
+                case self::METHOD_AFTER:
+                    if (count($pluginMethodParameters) > 1) {
+                        // remove result
+                        array_shift($pluginMethodParameters);
+                        $matchedParameters = array_intersect_key($originMethodParameters, $pluginMethodParameters);
+                        $this->validateMethodsParameters(
+                            $pluginMethodParameters,
+                            $matchedParameters,
+                            $pluginClass,
+                            $pluginMethod->getName()
+                        );
+                    }
+                    break;
                 case self::METHOD_BEFORE:
                     $this->validateMethodsParameters(
                         $pluginMethodParameters,
@@ -110,19 +119,6 @@ public function validate($pluginClass, $interceptedType)
                         $pluginMethod->getName()
                     );
                     break;
-                case self::METHOD_AFTER:
-                    if (count($pluginMethodParameters) > 1) {
-                        // remove result
-                        array_shift($pluginMethodParameters);
-                        $matchedParameters = array_intersect_key($originMethodParameters, $pluginMethodParameters);
-                        $this->validateMethodsParameters(
-                            $pluginMethodParameters,
-                            $matchedParameters,
-                            $pluginClass,
-                            $pluginMethod->getName()
-                        );
-                    }
-                    break;
             }
         }
     }
@@ -184,13 +180,13 @@ protected function getParametersType(\ReflectionParameter $parameter)
     protected function getOriginMethodName($pluginMethodName)
     {
         switch ($this->getMethodType($pluginMethodName)) {
+            case self::METHOD_AFTER:
+                return lcfirst(substr($pluginMethodName, 5));
+
             case self::METHOD_BEFORE:
             case self::METHOD_AROUND:
                 return lcfirst(substr($pluginMethodName, 6));
 
-            case self::METHOD_AFTER:
-                return lcfirst(substr($pluginMethodName, 5));
-
             default:
                 return null;
         }
@@ -205,12 +201,14 @@ protected function getOriginMethodName($pluginMethodName)
      */
     protected function getMethodType($pluginMethodName)
     {
-        if (substr($pluginMethodName, 0, 6) == self::METHOD_BEFORE) {
+        if (0 === strpos($pluginMethodName, self::METHOD_AFTER)) {
+            return self::METHOD_AFTER;
+        }
+        if (0 === strpos($pluginMethodName, self::METHOD_BEFORE)) {
             return self::METHOD_BEFORE;
-        } elseif (substr($pluginMethodName, 0, 6) == self::METHOD_AROUND) {
+        }
+        if (0 === strpos($pluginMethodName, self::METHOD_AROUND)) {
             return self::METHOD_AROUND;
-        } elseif (substr($pluginMethodName, 0, 5) == self::METHOD_AFTER) {
-            return self::METHOD_AFTER;
         }
 
         return null;