Refactoring yii\web\Request::getMethod

9 years ago · 8b9514fd5f
1 changed files with 9 additions and 3 deletions
--- a/framework/web/Request.php
+++ b/framework/web/Request.php
@ -231,11 +231,17 @@ class Request extends \yii\base\Request
    {
        if (isset($_POST[$this->methodParam])) {
            return strtoupper($_POST[$this->methodParam]);
-        } elseif (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])) {
+        }
+        
+        if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])) {
            return strtoupper($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']);
-        } else {
-            return isset($_SERVER['REQUEST_METHOD']) ? strtoupper($_SERVER['REQUEST_METHOD']) : 'GET';
        }
+        
+        if (isset($_SERVER['REQUEST_METHOD'])) {
+            return strtoupper($_SERVER['REQUEST_METHOD']);
+        }
+        
+        return 'GET';
    }

    /**