@@ -151,7 +151,7 @@ if ($user->access & User::ACCESS_UPDATE) {
151151
152152``` php
153153$address = 'One Infinite Loop, Cupertino 95014';
154- $cityZipCodeRegex = '/^[^,\\]+[,\\\s]+ (.+?)\s*(\d{5})$/';
154+ $cityZipCodeRegex = '/^[^,]+,\s* (.+?)\s*(\d{5})$/';
155155preg_match($cityZipCodeRegex, $address, $matches);
156156
157157saveCityZipCode($matches[1], $matches[2]);
@@ -163,7 +163,7 @@ It's better, but we are still heavily dependent on regex.
163163
164164``` php
165165$address = 'One Infinite Loop, Cupertino 95014';
166- $cityZipCodeRegex = '/^[^,\\]+[,\\\s]+ (.+?)\s*(\d{5})$/';
166+ $cityZipCodeRegex = '/^[^,]+,\s* (.+?)\s*(\d{5})$/';
167167preg_match($cityZipCodeRegex, $address, $matches);
168168
169169[, $city, $zipCode] = $matches;
@@ -176,7 +176,7 @@ Decrease dependence on regex by naming subpatterns.
176176
177177``` php
178178$address = 'One Infinite Loop, Cupertino 95014';
179- $cityZipCodeRegex = '/^[^,\\]+[,\\\s]+ (?<city >.+?)\s*(?<zipCode >\d{5})$/';
179+ $cityZipCodeRegex = '/^[^,]+,\s* (?<city >.+?)\s*(?<zipCode >\d{5})$/';
180180preg_match($cityZipCodeRegex, $address, $matches);
181181
182182saveCityZipCode($matches['city'], $matches['zipCode']);
0 commit comments