[6.x] Move elements + rename Addresses namespace to Address (#18124)

* Move elements + rename Addresses namespace to Address

* Fix test

Author: riasvdv

database/Factories/AddressFactory.php

@@ -4,7 +4,7 @@
 
 namespace CraftCms\Cms\Database\Factories;
 
-use CraftCms\Cms\Addresses\Models\Address;
+use CraftCms\Cms\Address\Models\Address;
 use CraftCms\Cms\Element\Models\Element;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Override;
@@ -17,7 +17,7 @@ final class AddressFactory extends Factory
     public function definition(): array
     {
         return [
-            'id' => Element::factory()->set('type', \CraftCms\Cms\Element\Elements\Address::class),
+            'id' => Element::factory()->set('type', \CraftCms\Cms\Address\Elements\Address::class),
             'countryCode' => fake()->countryCode(),
             'dateCreated' => $created = $this->faker->dateTime(),
             'dateUpdated' => $created,

database/Factories/AssetFactory.php

@@ -19,23 +19,23 @@ final class AssetFactory extends Factory
     public function definition(): array
     {
         return [
-            'id' => Element::factory()->set('type', \CraftCms\Cms\Element\Elements\Asset::class),
+            'id' => Element::factory()->set('type', \CraftCms\Cms\Asset\Elements\Asset::class),
             'volumeId' => Volume::factory(),
             'folderId' => VolumeFolder::factory(),
             'filename' => fake()->word().'.jpg',
             'kind' => 'image',
         ];
     }
 
-    #[\Override]
+    #[Override]
     public function configure(): self
     {
         return $this->afterCreating(function (Asset $asset) {
             // For some reason the element factory doesn't get saved properly
             if ($asset->id === 0) {
                 $asset->update([
                     'id' => Element::query()
-                        ->where('type', \CraftCms\Cms\Element\Elements\Asset::class)
+                        ->where('type', \CraftCms\Cms\Asset\Elements\Asset::class)
                         ->latest('id')
                         ->first()
                         ->id,

database/Factories/EntryTypeFactory.php

@@ -1,15 +1,18 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CraftCms\Cms\Database\Factories;
 
-use CraftCms\Cms\Element\Models\EntryType;
+use CraftCms\Cms\Entry\Models\EntryType;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use Override;
 
 final class EntryTypeFactory extends Factory
 {
     protected $model = EntryType::class;
 
-    #[\Override]
+    #[Override]
     public function definition(): array
     {
         return [

src/Addresses/Addresses.php src/Address/Addresses.phpsrc/Addresses/Addresses.php renamed to src/Address/Addresses.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace CraftCms\Cms\Addresses;
+namespace CraftCms\Cms\Address;
 
 use CommerceGuys\Addressing\AddressFormat\AddressField;
 use CommerceGuys\Addressing\AddressFormat\AddressFormatRepository;
@@ -18,12 +18,12 @@
 use craft\elements\Address;
 use craft\models\FieldLayout;
 use craft\models\FieldLayoutTab;
-use CraftCms\Cms\Addresses\Events\DefineAddressCountries;
-use CraftCms\Cms\Addresses\Events\DefineAddressFieldLabel;
-use CraftCms\Cms\Addresses\Events\DefineAddressSubdivisions;
-use CraftCms\Cms\Addresses\Events\DefineAddressUsedFields;
-use CraftCms\Cms\Addresses\Events\DefineAddressUsedSubdivisionFields;
-use CraftCms\Cms\Addresses\Repositories\SubdivisionRepository;
+use CraftCms\Cms\Address\Events\DefineAddressCountries;
+use CraftCms\Cms\Address\Events\DefineAddressFieldLabel;
+use CraftCms\Cms\Address\Events\DefineAddressSubdivisions;
+use CraftCms\Cms\Address\Events\DefineAddressUsedFields;
+use CraftCms\Cms\Address\Events\DefineAddressUsedSubdivisionFields;
+use CraftCms\Cms\Address\Repositories\SubdivisionRepository;
 use CraftCms\Cms\Field\Fields;
 use CraftCms\Cms\ProjectConfig\Events\ConfigEvent;
 use CraftCms\Cms\ProjectConfig\ProjectConfig;

src/Element/Elements/Address.php src/Address/Elements/Address.phpsrc/Element/Elements/Address.php renamed to src/Address/Elements/Address.php

@@ -2,13 +2,14 @@
 
 declare(strict_types=1);
 
-namespace CraftCms\Cms\Element\Elements;
+namespace CraftCms\Cms\Address\Elements;
 
 use CraftCms\Cms\Database\Queries\AddressQuery;
+use Override;
 
 final class Address extends \craft\elements\Address
 {
-    #[\Override]
+    #[Override]
     public static function find(): AddressQuery
     {
         return new AddressQuery;

…resses/Events/DefineAddressCountries.php …ddress/Events/DefineAddressCountries.phpsrc/Addresses/Events/DefineAddressCountries.php renamed to src/Address/Events/DefineAddressCountries.php src/Addresses/Events/DefineAddressCountries.php renamed to src/Address/Events/DefineAddressCountries.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace CraftCms\Cms\Addresses\Events;
+namespace CraftCms\Cms\Address\Events;
 
 final class DefineAddressCountries
 {

…esses/Events/DefineAddressFieldLabel.php …dress/Events/DefineAddressFieldLabel.phpsrc/Addresses/Events/DefineAddressFieldLabel.php renamed to src/Address/Events/DefineAddressFieldLabel.php src/Addresses/Events/DefineAddressFieldLabel.php renamed to src/Address/Events/DefineAddressFieldLabel.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace CraftCms\Cms\Addresses\Events;
+namespace CraftCms\Cms\Address\Events;
 
 final class DefineAddressFieldLabel
 {

…Addresses/Events/DefineAddressFields.php …c/Address/Events/DefineAddressFields.phpsrc/Addresses/Events/DefineAddressFields.php renamed to src/Address/Events/DefineAddressFields.php src/Addresses/Events/DefineAddressFields.php renamed to src/Address/Events/DefineAddressFields.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace CraftCms\Cms\Addresses\Events;
+namespace CraftCms\Cms\Address\Events;
 
 abstract class DefineAddressFields
 {

…ses/Events/DefineAddressSubdivisions.php …ess/Events/DefineAddressSubdivisions.phpsrc/Addresses/Events/DefineAddressSubdivisions.php renamed to src/Address/Events/DefineAddressSubdivisions.php src/Addresses/Events/DefineAddressSubdivisions.php renamed to src/Address/Events/DefineAddressSubdivisions.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace CraftCms\Cms\Addresses\Events;
+namespace CraftCms\Cms\Address\Events;
 
 final class DefineAddressSubdivisions
 {

…esses/Events/DefineAddressUsedFields.php …dress/Events/DefineAddressUsedFields.phpsrc/Addresses/Events/DefineAddressUsedFields.php renamed to src/Address/Events/DefineAddressUsedFields.php src/Addresses/Events/DefineAddressUsedFields.php renamed to src/Address/Events/DefineAddressUsedFields.php

@@ -2,6 +2,6 @@
 
 declare(strict_types=1);
 
-namespace CraftCms\Cms\Addresses\Events;
+namespace CraftCms\Cms\Address\Events;
 
 final class DefineAddressUsedFields extends DefineAddressFields {}