Merge pull request #18282 from craftcms/feature/elements

[6.x] Alias legacy elements to new namespace

Author: brandonkelly

CHANGELOG-WIP.md

@@ -196,13 +196,13 @@ Craft's Mutex classes have been deprecated. [Laravel's atomic locking](https://l
 
 ## Element Queries
 
-- Deprecated `\craft\elements\db\AddressQuery`. `\CraftCms\Cms\Database\Queries\AddressQuery` should be used instead.
-- Deprecated `\craft\elements\db\AssetQuery` `\CraftCms\Cms\Database\Queries\AssetQuery` should be used instead.
-- Deprecated `\craft\elements\db\ContentBlockQuery` `\CraftCms\Cms\Database\Queries\ContentBlockQuery` should be used instead.
-- Deprecated `\craft\elements\db\ElementQuery` `\CraftCms\Cms\Database\Queries\ElementQuery` should be used instead.
+- Deprecated `\craft\elements\db\AddressQuery`. `\CraftCms\Cms\Element\Queries\AddressQuery` should be used instead.
+- Deprecated `\craft\elements\db\AssetQuery` `\CraftCms\Cms\Element\Queries\AssetQuery` should be used instead.
+- Deprecated `\craft\elements\db\ContentBlockQuery` `\CraftCms\Cms\Element\Queries\ContentBlockQuery` should be used instead.
+- Deprecated `\craft\elements\db\ElementQuery` `\CraftCms\Cms\Element\Queries\ElementQuery` should be used instead.
 - Deprecated `\craft\elements\db\ElementQueryInterface`
-- Deprecated `\craft\elements\db\EntryQuery` `\CraftCms\Cms\Database\Queries\EntryQuery` should be used instead.
-- Deprecated `\craft\elements\db\UserQuery` `\CraftCms\Cms\Database\Queries\UserQuery` should be used instead.
+- Deprecated `\craft\elements\db\EntryQuery` `\CraftCms\Cms\Element\Queries\EntryQuery` should be used instead.
+- Deprecated `\craft\elements\db\UserQuery` `\CraftCms\Cms\Element\Queries\UserQuery` should be used instead.
 
 ## Entries & Entry Types
 

database/Factories/DraftFactory.php

@@ -4,17 +4,18 @@
 
 namespace CraftCms\Cms\Database\Factories;
 
-use craft\elements\Entry;
 use CraftCms\Cms\Element\Models\Draft;
 use CraftCms\Cms\Element\Models\Element;
+use CraftCms\Cms\Entry\Elements\Entry;
 use CraftCms\Cms\User\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use Override;
 
 final class DraftFactory extends Factory
 {
     protected $model = Draft::class;
 
-    #[\Override]
+    #[Override]
     public function definition(): array
     {
         return [
@@ -28,7 +29,7 @@ public function definition(): array
         ];
     }
 
-    #[\Override]
+    #[Override]
     public function configure(): self
     {
         return $this->afterCreating(function (Draft $draft) {

database/Factories/ElementFactory.php

@@ -4,9 +4,9 @@
 
 namespace CraftCms\Cms\Database\Factories;
 
-use craft\elements\Entry;
 use CraftCms\Cms\Database\Table;
 use CraftCms\Cms\Element\Models\Element;
+use CraftCms\Cms\Entry\Elements\Entry;
 use CraftCms\Cms\Site\Models\Site;
 use CraftCms\Cms\Support\Str;
 use Illuminate\Database\Eloquent\Factories\Factory;

database/Factories/EntryFactory.php

@@ -19,10 +19,10 @@ final class EntryFactory extends Factory
     public function definition(): array
     {
         return [
-            'id' => Element::factory()->set('type', \craft\elements\Entry::class),
+            'id' => Element::factory()->set('type', \CraftCms\Cms\Entry\Elements\Entry::class),
             'sectionId' => Section::factory(),
             'typeId' => EntryType::factory(),
-            'status' => \craft\elements\Entry::STATUS_LIVE,
+            'status' => \CraftCms\Cms\Entry\Elements\Entry::STATUS_LIVE,
             'postDate' => $created = $this->faker->dateTime(),
             'dateCreated' => $created,
             'dateUpdated' => $created,

src/Address/Addresses.php

@@ -15,9 +15,9 @@
 use CommerceGuys\Addressing\Formatter\FormatterInterface;
 use Craft;
 use craft\base\FieldLayoutProviderInterface;
-use craft\elements\Address;
 use craft\models\FieldLayout;
 use craft\models\FieldLayoutTab;
+use CraftCms\Cms\Address\Elements\Address;
 use CraftCms\Cms\Address\Events\DefineAddressCountries;
 use CraftCms\Cms\Address\Events\DefineAddressFieldLabel;
 use CraftCms\Cms\Address\Events\DefineAddressSubdivisions;