From d0273febf9870f00884f03504d6ae88f5c7d2cb8 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Sun, 24 Jan 2021 17:34:58 +0200 Subject: [PATCH] Rename Address class --- .../Espo/Classes/AddressFormatters/Formatter1.php | 4 ++-- .../Espo/Classes/AddressFormatters/Formatter2.php | 4 ++-- .../Espo/Classes/AddressFormatters/Formatter3.php | 4 ++-- .../Espo/Classes/AddressFormatters/Formatter4.php | 4 ++-- .../Core/FieldUtils/Address/AddressBuilder.php | 6 +++--- .../Core/FieldUtils/Address/AddressFormatter.php | 2 +- .../Address/{Address.php => AddressValue.php} | 4 ++-- application/Espo/Tools/Export/Formats/Xlsx.php | 4 ++-- .../FieldUtils/Address/AddressFormatterTest.php | 4 ++-- .../FieldUtils/Address/AddressFormattersTest.php | 12 ++++++------ .../{AddressTest.php => AddressValueTest.php} | 14 +++++++------- 11 files changed, 31 insertions(+), 31 deletions(-) rename application/Espo/Core/FieldUtils/Address/{Address.php => AddressValue.php} (99%) rename tests/unit/Espo/Core/FieldUtils/Address/{AddressTest.php => AddressValueTest.php} (91%) diff --git a/application/Espo/Classes/AddressFormatters/Formatter1.php b/application/Espo/Classes/AddressFormatters/Formatter1.php index 2a1050e15e..96faf311cf 100644 --- a/application/Espo/Classes/AddressFormatters/Formatter1.php +++ b/application/Espo/Classes/AddressFormatters/Formatter1.php @@ -31,12 +31,12 @@ namespace Espo\Classes\AddressFormatters; use Espo\Core\FieldUtils\Address\{ AddressFormatter, - Address, + AddressValue, }; class Formatter1 implements AddressFormatter { - public function format(Address $address) : string + public function format(AddressValue $address) : string { $result = ''; diff --git a/application/Espo/Classes/AddressFormatters/Formatter2.php b/application/Espo/Classes/AddressFormatters/Formatter2.php index e9093c9a63..6cc9bc2e8d 100644 --- a/application/Espo/Classes/AddressFormatters/Formatter2.php +++ b/application/Espo/Classes/AddressFormatters/Formatter2.php @@ -31,12 +31,12 @@ namespace Espo\Classes\AddressFormatters; use Espo\Core\FieldUtils\Address\{ AddressFormatter, - Address, + AddressValue, }; class Formatter2 implements AddressFormatter { - public function format(Address $address) : string + public function format(AddressValue $address) : string { $result = ''; diff --git a/application/Espo/Classes/AddressFormatters/Formatter3.php b/application/Espo/Classes/AddressFormatters/Formatter3.php index 0514a03ac7..30e70ec71f 100644 --- a/application/Espo/Classes/AddressFormatters/Formatter3.php +++ b/application/Espo/Classes/AddressFormatters/Formatter3.php @@ -31,12 +31,12 @@ namespace Espo\Classes\AddressFormatters; use Espo\Core\FieldUtils\Address\{ AddressFormatter, - Address, + AddressValue, }; class Formatter3 implements AddressFormatter { - public function format(Address $address) : string + public function format(AddressValue $address) : string { $result = ''; diff --git a/application/Espo/Classes/AddressFormatters/Formatter4.php b/application/Espo/Classes/AddressFormatters/Formatter4.php index 9282179012..f5e0ba12b2 100644 --- a/application/Espo/Classes/AddressFormatters/Formatter4.php +++ b/application/Espo/Classes/AddressFormatters/Formatter4.php @@ -31,12 +31,12 @@ namespace Espo\Classes\AddressFormatters; use Espo\Core\FieldUtils\Address\{ AddressFormatter, - Address, + AddressValue, }; class Formatter4 implements AddressFormatter { - public function format(Address $address) : string + public function format(AddressValue $address) : string { $result = ''; diff --git a/application/Espo/Core/FieldUtils/Address/AddressBuilder.php b/application/Espo/Core/FieldUtils/Address/AddressBuilder.php index f3b59a4880..d9f8de6012 100644 --- a/application/Espo/Core/FieldUtils/Address/AddressBuilder.php +++ b/application/Espo/Core/FieldUtils/Address/AddressBuilder.php @@ -44,7 +44,7 @@ class AddressBuilder protected $portalCode; - public function clone(Address $address) : self + public function clone(AddressValue $address) : self { $this->setStreet($address->getStreet()); $this->setCity($address->getCity()); @@ -90,9 +90,9 @@ class AddressBuilder return $this; } - public function build() : Address + public function build() : AddressValue { - return Address::fromRaw([ + return AddressValue::fromRaw([ 'street' => $this->street, 'city' => $this->city, 'country' => $this->country, diff --git a/application/Espo/Core/FieldUtils/Address/AddressFormatter.php b/application/Espo/Core/FieldUtils/Address/AddressFormatter.php index afcfc8e104..cacaf24c92 100644 --- a/application/Espo/Core/FieldUtils/Address/AddressFormatter.php +++ b/application/Espo/Core/FieldUtils/Address/AddressFormatter.php @@ -34,5 +34,5 @@ namespace Espo\Core\FieldUtils\Address; */ interface AddressFormatter { - public function format(Address $address) : string; + public function format(AddressValue $address) : string; } diff --git a/application/Espo/Core/FieldUtils/Address/Address.php b/application/Espo/Core/FieldUtils/Address/AddressValue.php similarity index 99% rename from application/Espo/Core/FieldUtils/Address/Address.php rename to application/Espo/Core/FieldUtils/Address/AddressValue.php index 433ddb4b18..30b1e07a69 100644 --- a/application/Espo/Core/FieldUtils/Address/Address.php +++ b/application/Espo/Core/FieldUtils/Address/AddressValue.php @@ -34,9 +34,9 @@ use Espo\{ }; /** - * An address. + * An address value. */ -class Address +class AddressValue { protected $street = null; diff --git a/application/Espo/Tools/Export/Formats/Xlsx.php b/application/Espo/Tools/Export/Formats/Xlsx.php index e8a841649e..5e74f3617f 100644 --- a/application/Espo/Tools/Export/Formats/Xlsx.php +++ b/application/Espo/Tools/Export/Formats/Xlsx.php @@ -40,7 +40,7 @@ use Espo\Core\{ FileStorage\Manager as FileStorageManager, Utils\File\Manager as FileManager, ORM\EntityManager, - FieldUtils\Address\Address, + FieldUtils\Address\AddressValue, FieldUtils\Address\AddressFormatterFactory, }; @@ -523,7 +523,7 @@ class Xlsx } } else if ($type == 'address') { - $address = Address::createBuilder() + $address = AddressValue::createBuilder() ->setStreet($row[$name . 'Street'] ?? null) ->setCity($row[$name . 'City'] ?? null) ->setState($row[$name . 'State'] ?? null) diff --git a/tests/integration/Espo/Core/FieldUtils/Address/AddressFormatterTest.php b/tests/integration/Espo/Core/FieldUtils/Address/AddressFormatterTest.php index fed9def420..d814eb2789 100644 --- a/tests/integration/Espo/Core/FieldUtils/Address/AddressFormatterTest.php +++ b/tests/integration/Espo/Core/FieldUtils/Address/AddressFormatterTest.php @@ -31,7 +31,7 @@ namespace tests\integration\Espo\Core\FieldUtils\Address; use Espo\Core\FieldUtils\Address\{ AddressFormatterFactory, - Address, + AddressValue, }; class AddressFormatterTest extends \tests\integration\Core\BaseTestCase @@ -42,7 +42,7 @@ class AddressFormatterTest extends \tests\integration\Core\BaseTestCase $formatter = $formatterFactory->create(1); - $address = Address::createBuilder() + $address = AddressValue::createBuilder() ->setStreet('street') ->setCity('city') ->setCountry('country') diff --git a/tests/unit/Espo/Core/FieldUtils/Address/AddressFormattersTest.php b/tests/unit/Espo/Core/FieldUtils/Address/AddressFormattersTest.php index ee436c9134..92bbf2fa4b 100644 --- a/tests/unit/Espo/Core/FieldUtils/Address/AddressFormattersTest.php +++ b/tests/unit/Espo/Core/FieldUtils/Address/AddressFormattersTest.php @@ -30,7 +30,7 @@ namespace tests\unit\Espo\Core\FieldUtils\Address; use Espo\Core\{ - FieldUtils\Address\Address, + FieldUtils\Address\AddressValue, }; use Espo\Classes\{ @@ -49,7 +49,7 @@ class AddressFormattersTest extends \PHPUnit\Framework\TestCase public function testFormat1All() { - $address = Address::createBuilder() + $address = AddressValue::createBuilder() ->setStreet('street') ->setCity('city') ->setCountry('country') @@ -71,7 +71,7 @@ class AddressFormattersTest extends \PHPUnit\Framework\TestCase public function testFormat1NoState() { - $address = Address::createBuilder() + $address = AddressValue::createBuilder() ->setStreet('street') ->setCity('city') ->setCountry('country') @@ -93,7 +93,7 @@ class AddressFormattersTest extends \PHPUnit\Framework\TestCase public function testFormat2All() { - $address = Address::createBuilder() + $address = AddressValue::createBuilder() ->setStreet('street') ->setCity('city') ->setCountry('country') @@ -115,7 +115,7 @@ class AddressFormattersTest extends \PHPUnit\Framework\TestCase public function testFormat3All() { - $address = Address::createBuilder() + $address = AddressValue::createBuilder() ->setStreet('street') ->setCity('city') ->setCountry('country') @@ -137,7 +137,7 @@ class AddressFormattersTest extends \PHPUnit\Framework\TestCase public function testFormat4All() { - $address = Address::createBuilder() + $address = AddressValue::createBuilder() ->setStreet('street') ->setCity('city') ->setCountry('country') diff --git a/tests/unit/Espo/Core/FieldUtils/Address/AddressTest.php b/tests/unit/Espo/Core/FieldUtils/Address/AddressValueTest.php similarity index 91% rename from tests/unit/Espo/Core/FieldUtils/Address/AddressTest.php rename to tests/unit/Espo/Core/FieldUtils/Address/AddressValueTest.php index 7694dcc070..f1ae8eddc2 100644 --- a/tests/unit/Espo/Core/FieldUtils/Address/AddressTest.php +++ b/tests/unit/Espo/Core/FieldUtils/Address/AddressValueTest.php @@ -30,12 +30,12 @@ namespace tests\unit\Espo\Core\FieldUtils\Address; use Espo\Core\{ - FieldUtils\Address\Address, + FieldUtils\Address\AddressValue, }; use Espo\ORM\Entity; -class AddressTest extends \PHPUnit\Framework\TestCase +class AddressValueTest extends \PHPUnit\Framework\TestCase { protected function setUp() : void { @@ -44,7 +44,7 @@ class AddressTest extends \PHPUnit\Framework\TestCase public function testAddress1() { - $address = Address::createBuilder() + $address = AddressValue::createBuilder() ->setStreet('street') ->setCity('city') ->setCountry('country') @@ -61,7 +61,7 @@ class AddressTest extends \PHPUnit\Framework\TestCase public function testBuilderClone() { - $addressOriginal = Address::createBuilder() + $addressOriginal = AddressValue::createBuilder() ->setStreet('street') ->setCity('city') ->setCountry('country') @@ -69,7 +69,7 @@ class AddressTest extends \PHPUnit\Framework\TestCase ->setPostalCode('postalCode') ->build(); - $address = Address::createBuilder() + $address = AddressValue::createBuilder() ->clone($addressOriginal) ->build(); @@ -82,7 +82,7 @@ class AddressTest extends \PHPUnit\Framework\TestCase public function testAddressWith() { - $addressOriginal = Address::createBuilder() + $addressOriginal = AddressValue::createBuilder() ->setStreet('street') ->setCity('city') ->setCountry('country') @@ -111,7 +111,7 @@ class AddressTest extends \PHPUnit\Framework\TestCase ['addressPostalCode', null], ]); - $address = Address::fromEntity($entity, 'address'); + $address = AddressValue::fromEntity($entity, 'address'); $this->assertEquals('street', $address->getStreet()); $this->assertEquals('city', $address->getCity());