Merge pull request #123 from andig/php74556

WyriHaximus · web-flow · commit e621ea2695b2 · 2017-10-07T21:55:45.000+02:00
Fix Unix domain socket (UDS) paths for Mac OS X
diff --git a/src/Connection.php b/src/Connection.php
@@ -156,9 +156,9 @@ private function parseAddress($address)
                 $address = (string)substr($address, 0, -1);
             }
 
-            // work around unknown addresses should return null value: https://3v4l.org/5C1lo
+            // work around unknown addresses should return null value: https://3v4l.org/5C1lo and https://bugs.php.net/bug.php?id=74556
             // PHP uses "\0" string and HHVM uses empty string (colon removed above)
-            if ($address === "\x00" || $address === '') {
+            if ($address === '' || $address[0] === "\x00" ) {
                 return null;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -156,9 +156,9 @@ private function parseAddress($address)`
`156`	`156`	`$address = (string)substr($address, 0, -1);`
`157`	`157`	`}`
`158`	`158`
`159`		`- // work around unknown addresses should return null value: https://3v4l.org/5C1lo`
	`159`	`+ // work around unknown addresses should return null value: https://3v4l.org/5C1lo and https://bugs.php.net/bug.php?id=74556`
`160`	`160`	`// PHP uses "\0" string and HHVM uses empty string (colon removed above)`
`161`		`- if ($address === "\x00" \|\| $address === '') {`
	`161`	`+ if ($address === '' \|\| $address[0] === "\x00" ) {`
`162`	`162`	`return null;`
`163`	`163`	`}`
`164`	`164`