1
0
mirror of https://github.com/jupeter/clean-code-php.git synced 2025-09-25 21:49:04 +02:00

Merge pull request #20 from jupeter/master

Update from jupeter master
This commit is contained in:
Peter Gribanov
2017-10-23 10:30:04 +03:00
committed by GitHub

View File

@@ -151,7 +151,7 @@ if ($user->access & User::ACCESS_UPDATE) {
```php
$address = 'One Infinite Loop, Cupertino 95014';
$cityZipCodeRegex = '/^[^,\\]+[,\\\s]+(.+?)\s*(\d{5})?$/';
$cityZipCodeRegex = '/^[^,]+,\s*(.+?)\s*(\d{5})$/';
preg_match($cityZipCodeRegex, $address, $matches);
saveCityZipCode($matches[1], $matches[2]);
@@ -163,7 +163,7 @@ It's better, but we are still heavily dependent on regex.
```php
$address = 'One Infinite Loop, Cupertino 95014';
$cityZipCodeRegex = '/^[^,\\]+[,\\\s]+(.+?)\s*(\d{5})?$/';
$cityZipCodeRegex = '/^[^,]+,\s*(.+?)\s*(\d{5})$/';
preg_match($cityZipCodeRegex, $address, $matches);
[, $city, $zipCode] = $matches;
@@ -176,7 +176,7 @@ Decrease dependence on regex by naming subpatterns.
```php
$address = 'One Infinite Loop, Cupertino 95014';
$cityZipCodeRegex = '/^[^,\\]+[,\\\s]+(?<city>.+?)\s*(?<zipCode>\d{5})?$/';
$cityZipCodeRegex = '/^[^,]+,\s*(?<city>.+?)\s*(?<zipCode>\d{5})$/';
preg_match($cityZipCodeRegex, $address, $matches);
saveCityZipCode($matches['city'], $matches['zipCode']);
@@ -1129,7 +1129,7 @@ class BankAccount
$this->balance = $balance;
}
public function withdrawBalance(int $amount): void
public function withdraw(int $amount): void
{
if ($amount > $this->balance) {
throw new \Exception('Amount greater than available balance.');
@@ -1138,12 +1138,12 @@ class BankAccount
$this->balance -= $amount;
}
public function depositBalance(int $amount): void
public function deposit(int $amount): void
{
$this->balance += $amount;
}
public function getBalance(): int
   public function getBalance(): int
{
return $this->balance;
}
@@ -1152,7 +1152,7 @@ class BankAccount
$bankAccount = new BankAccount();
// Buy shoes...
$bankAccount->withdrawBalance($shoesPrice);
$bankAccount->withdraw($shoesPrice);
// Get balance
$balance = $bankAccount->getBalance();