more elegant notation for Domain->stripPort() - thx @lucasmichot

Mathias Bauer · Mathias Bauer · commit fbd7dc6d91a2 · 2015-12-09T14:49:16.000+01:00
diff --git a/src/Http/Validation/Domain.php b/src/Http/Validation/Domain.php
@@ -7,6 +7,7 @@
 
 class Domain implements Validator
 {
+
     const PATTERN_STRIP_PROTOCOL = '/:\d*$/';
 
     /**
@@ -65,13 +66,11 @@ protected function stripProtocol($domain)
      */
     protected function stripPort($domain)
     {
-        $domainStripped = preg_replace(self::PATTERN_STRIP_PROTOCOL, '', $domain);
-
-        if ($domainStripped === null) {
-            return $domain;
+        if ($domainStripped = preg_replace(self::PATTERN_STRIP_PROTOCOL, null, $domain)) {
+            return $domainStripped;
         }
 
-        return $domainStripped;
+        return $domain;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`
`8`	`8`	`class Domain implements Validator`
`9`	`9`	`{`
	`10`	`+`
`10`	`11`	`const PATTERN_STRIP_PROTOCOL = '/:\d*$/';`
`11`	`12`
`12`	`13`	`/**`
`@@ -65,13 +66,11 @@ protected function stripProtocol($domain)`
`65`	`66`	`*/`
`66`	`67`	`protected function stripPort($domain)`
`67`	`68`	`{`
`68`		`- $domainStripped = preg_replace(self::PATTERN_STRIP_PROTOCOL, '', $domain);`
`69`		`-`
`70`		`- if ($domainStripped === null) {`
`71`		`- return $domain;`
	`69`	`+ if ($domainStripped = preg_replace(self::PATTERN_STRIP_PROTOCOL, null, $domain)) {`
	`70`	`+ return $domainStripped;`
`72`	`71`	`}`
`73`	`72`
`74`		`- return $domainStripped;`
	`73`	`+ return $domain;`
`75`	`74`	`}`
`76`	`75`
`77`	`76`	`/**`