Make Address type hints non-nullable again.

This reverts 8b1bcd4.
commerceguys · May 7, 2023 · e68d4b2 · e68d4b2
1 parent e521d23
commit e68d4b2
Showing 1 changed file with 28 additions and 28 deletions.
diff --git a/src/Address.php b/src/Address.php
@@ -126,20 +126,20 @@ class Address implements ImmutableAddressInterface
      * @param string $locale             The locale. Defaults to 'und'.
      */
     public function __construct(
-        ?string $countryCode = '',
-        ?string $administrativeArea = '',
-        ?string $locality = '',
-        ?string $dependentLocality = '',
-        ?string $postalCode = '',
-        ?string $sortingCode = '',
-        ?string $addressLine1 = '',
-        ?string $addressLine2 = '',
-        ?string $addressLine3 = '',
-        ?string $organization = '',
-        ?string $givenName = '',
-        ?string $additionalName = '',
-        ?string $familyName = '',
-        ?string $locale = 'und'
+        string $countryCode = '',
+        string $administrativeArea = '',
+        string $locality = '',
+        string $dependentLocality = '',
+        string $postalCode = '',
+        string $sortingCode = '',
+        string $addressLine1 = '',
+        string $addressLine2 = '',
+        string $addressLine3 = '',
+        string $organization = '',
+        string $givenName = '',
+        string $additionalName = '',
+        string $familyName = '',
+        string $locale = 'und'
     ) {
         $this->countryCode = $countryCode;
         $this->administrativeArea = $administrativeArea;
@@ -160,7 +160,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function getCountryCode(): ?string
+    public function getCountryCode(): string
     {
         return $this->countryCode;
     }
@@ -179,7 +179,7 @@ public function withCountryCode(string $countryCode): ImmutableAddressInterface|
     /**
      * {@inheritdoc}
      */
-    public function getAdministrativeArea(): ?string
+    public function getAdministrativeArea(): string
     {
         return $this->administrativeArea;
     }
@@ -198,7 +198,7 @@ public function withAdministrativeArea(string $administrativeArea): ImmutableAdd
     /**
      * {@inheritdoc}
      */
-    public function getLocality(): ?string
+    public function getLocality(): string
     {
         return $this->locality;
     }
@@ -217,7 +217,7 @@ public function withLocality(string $locality): ImmutableAddressInterface|Addres
     /**
      * {@inheritdoc}
      */
-    public function getDependentLocality(): ?string
+    public function getDependentLocality(): string
     {
         return $this->dependentLocality;
     }
@@ -236,7 +236,7 @@ public function withDependentLocality(string $dependentLocality): ImmutableAddre
     /**
      * {@inheritdoc}
      */
-    public function getPostalCode(): ?string
+    public function getPostalCode(): string
     {
         return $this->postalCode;
     }
@@ -255,7 +255,7 @@ public function withPostalCode(string $postalCode): ImmutableAddressInterface|Ad
     /**
      * {@inheritdoc}
      */
-    public function getSortingCode(): ?string
+    public function getSortingCode(): string
     {
         return $this->sortingCode;
     }
@@ -274,7 +274,7 @@ public function withSortingCode(string $sortingCode): ImmutableAddressInterface|
     /**
      * {@inheritdoc}
      */
-    public function getAddressLine1(): ?string
+    public function getAddressLine1(): string
     {
         return $this->addressLine1;
     }
@@ -293,7 +293,7 @@ public function withAddressLine1(string $addressLine1): ImmutableAddressInterfac
     /**
      * {@inheritdoc}
      */
-    public function getAddressLine2(): ?string
+    public function getAddressLine2(): string
     {
         return $this->addressLine2;
     }
@@ -312,7 +312,7 @@ public function withAddressLine2(string $addressLine2): ImmutableAddressInterfac
     /**
      * {@inheritdoc}
      */
-    public function getAddressLine3(): ?string
+    public function getAddressLine3(): string
     {
         return $this->addressLine3;
     }
@@ -331,7 +331,7 @@ public function withAddressLine3(string $addressLine3): ImmutableAddressInterfac
     /**
      * {@inheritdoc}
      */
-    public function getOrganization(): ?string
+    public function getOrganization(): string
     {
         return $this->organization;
     }
@@ -350,7 +350,7 @@ public function withOrganization(string $organization): ImmutableAddressInterfac
     /**
      * {@inheritdoc}
      */
-    public function getGivenName(): ?string
+    public function getGivenName(): string
     {
         return $this->givenName;
     }
@@ -369,7 +369,7 @@ public function withGivenName(string $givenName): ImmutableAddressInterface|Addr
     /**
      * {@inheritdoc}
      */
-    public function getAdditionalName(): ?string
+    public function getAdditionalName(): string
     {
         return $this->additionalName;
     }
@@ -388,7 +388,7 @@ public function withAdditionalName(string $additionalName): ImmutableAddressInte
     /**
      * {@inheritdoc}
      */
-    public function getFamilyName(): ?string
+    public function getFamilyName(): string
     {
         return $this->familyName;
     }
@@ -407,7 +407,7 @@ public function withFamilyName(string $familyName): ImmutableAddressInterface|Ad
     /**
      * {@inheritdoc}
      */
-    public function getLocale(): ?string
+    public function getLocale(): string
     {
         return $this->locale;
     }