Преглед изворни кода

return early if rule is * and remove one level of nesting

radnan пре 11 година
родитељ
комит
7e584de9e8
1 измењених фајлова са 26 додато и 26 уклоњено
  1. 26 26
      src/Composer/Util/NoProxyPattern.php

+ 26 - 26
src/Composer/Util/NoProxyPattern.php

@@ -54,40 +54,40 @@ class NoProxyPattern
         }
 
         foreach ($this->rules as $rule) {
+            if ($rule == '*') {
+                return true;
+            }
+
             $match = false;
 
-            if ($rule == '*') {
-                $match = true;
-            } else {
-                list($ruleHost) = explode(':', $rule);
-                list($base) = explode('/', $ruleHost);
+            list($ruleHost) = explode(':', $rule);
+            list($base) = explode('/', $ruleHost);
 
-                if (filter_var($base, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-                    // ip or cidr match
+            if (filter_var($base, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+                // ip or cidr match
 
-                    if (!isset($ip)) {
-                        $ip = gethostbyname($host);
-                    }
+                if (!isset($ip)) {
+                    $ip = gethostbyname($host);
+                }
 
-                    if (strpos($ruleHost, '/') === false) {
-                        $match = $ip === $ruleHost;
-                    } else {
-                        $match = self::inCIDRBlock($ruleHost, $ip);
-                    }
+                if (strpos($ruleHost, '/') === false) {
+                    $match = $ip === $ruleHost;
                 } else {
-                    // match end of domain
-
-                    $haystack = '.' . trim($host, '.') . '.';
-                    $needle = '.'. trim($ruleHost, '.') .'.';
-                    $match = stripos(strrev($haystack), strrev($needle)) === 0;
+                    $match = self::inCIDRBlock($ruleHost, $ip);
                 }
+            } else {
+                // match end of domain
+
+                $haystack = '.' . trim($host, '.') . '.';
+                $needle = '.'. trim($ruleHost, '.') .'.';
+                $match = stripos(strrev($haystack), strrev($needle)) === 0;
+            }
 
-                // final port check
-                if ($match && strpos($rule, ':') !== false) {
-                    list(, $rulePort) = explode(':', $rule);
-                    if (!empty($rulePort) && $port != $rulePort) {
-                        $match = false;
-                    }
+            // final port check
+            if ($match && strpos($rule, ':') !== false) {
+                list(, $rulePort) = explode(':', $rule);
+                if (!empty($rulePort) && $port != $rulePort) {
+                    $match = false;
                 }
             }