Merge pull request #18091 from craftcms/feature/user-query

[6.x] UserQuery, AddressQuery & ContentBlockQuery

Author: brandonkelly

CHANGELOG-WIP.md

@@ -1,10 +1,10 @@
 # Release Notes for Craft CMS 6.0 (WIP)
 
-### Development
+## Development
 - Reference tags now support fallback values when no attribute is specified. ([#17688](https://github.com/craftcms/cms/pull/17688))
 - Deprecated support for categories, global sets, and tags. ([#18009](https://github.com/craftcms/cms/pull/18009))
 
-### Extensibility
+## Extensibility
 - Added `CraftCms\Cms\Support\Arr`.
 - Added `CraftCms\Cms\Support\Str`.
 - `craft\services\Elements::stopCollectingCacheInfo()` no longer sets the returned duration to the `cacheDuration` config setting if a duration wasn’t explicitly declared. ([#16796](https://github.com/craftcms/cms/pull/16796))
@@ -140,6 +140,16 @@ Craft's Mutex classes have been deprecated. [Laravel's atomic locking](https://l
 - Deprecated `craft\events\DefineSourceSortOptionsEvent`. `CraftCms\Cms\Element\Events\DefineSourceSortOptions` should be used instead.
 - Deprecated `craft\events\DefineSourceTableAttributesEvent`. `CraftCms\Cms\Element\Events\DefineSourceTableAttributes` should be used instead.
 
+## 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\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.
+
 ## Entries & Entry Types
 
 - Deprecated `craft\services\Entries`. `CraftCms\Cms\Entry\Entries` and `CraftCms\Cms\Entry\EntryTypes` should be used instead.
@@ -156,31 +166,48 @@ Craft's Mutex classes have been deprecated. [Laravel's atomic locking](https://l
 - Removed `craft\console\controllers\EntryTypesController` in favor of:
   - `CraftCms\Cms\Entry\Commands\MergeEntryTypesCommand`
 
-### Plugins
+## Migrations
+
+Craft and Yii's migrations have been removed in favor of [Laravel migrations](https://laravel.com/docs/12.x/migrations).
+
+The `php craft fields:merge` and `php craft entry-types:merge` commands will now generate Laravel migrations.
 
-#### Added
+- Deprecated `craft\db\Migration`. `CraftCms\Cms\Database\Migration` should be used instead.
+- Deprecated `craft\db\MigrationManager`
+- Removed `craft\helpers\MigrationHelper` as it was deprecated since 4.0.0.
+- Removed `craft\console\controllers\InstallController` in favor of:
+  - `CraftCms\Cms\Console\Commands\InstallCommand`
+  - `CraftCms\Cms\Console\Commands\InstallCheckCommand`
+- Removed `craft\console\controllers\MigrateController` in favor of:
+  - `CraftCms\Cms\Database\Commands\MigrateCommand` 
+- Removed `craft\console\controllers\UpController` in favor of:
+  - `CraftCms\Cms\Console\Commands\UpCommand` 
+
+## Plugins
+
+### Added
 - The base `CraftCms\Cms\Plugin\Plugin` class is now a [Laravel ServiceProvider](https://laravel.com/docs/12.x/providers) which provides a new way to register components for your plugins.
 
-#### Deprecations
+### Deprecations
 
 - Deprecated `craft\services\Plugins`. `CraftCms\Cms\Plugin\Plugins` should be used instead.
 - Deprecated `craft\base\Plugin`. `CraftCms\Cms\Plugin\Plugin` should be used instead.
 - Deprecated `craft\base\PluginTrait`.
 - Deprecated `craft\base\PluginInterface`. `CraftCms\Cms\Plugin\Contracts\PluginInterface` should be used instead.
 - Deprecated `craft\errors\InvalidPluginException`. `CraftCms\Cms\Plugin\Exceptions\InvalidPluginException` should be used instead.
 
-#### Controllers
+### Controllers
 - Removed `craft\controllers\PluginsController`. Use `CraftCms\Cms\Http\Controllers\PluginsController` instead.
 
-#### Commands
+### Commands
 - Removed `craft\console\controllers\PluginController` in favor of:
-  - `CraftCms\Cms\Plugin\Commands\DisableCommand` -> `php craft plugin:disable` 
-  - `CraftCms\Cms\Plugin\Commands\EnableCommand` -> `php craft plugin:enable` 
-  - `CraftCms\Cms\Plugin\Commands\InstallCommand` -> `php craft plugin:install` 
-  - `CraftCms\Cms\Plugin\Commands\UninstallCommand` -> `php craft plugin:uninstall` 
-  - `CraftCms\Cms\Plugin\Commands\ListCommand` -> `php craft plugin:list` 
- 
-#### Events
+  - `CraftCms\Cms\Plugin\Commands\DisableCommand` -> `php craft plugin:disable`
+  - `CraftCms\Cms\Plugin\Commands\EnableCommand` -> `php craft plugin:enable`
+  - `CraftCms\Cms\Plugin\Commands\InstallCommand` -> `php craft plugin:install`
+  - `CraftCms\Cms\Plugin\Commands\UninstallCommand` -> `php craft plugin:uninstall`
+  - `CraftCms\Cms\Plugin\Commands\ListCommand` -> `php craft plugin:list`
+
+### Events
 - Deprecated `craft\events\PluginEvent` in favor of the following new events:
   - `craft\base\Plugin::EVENT_BEFORE_SAVE_SETTINGS` => `CraftCms\Cms\Component\Events\ComponentEvent`
   - `craft\base\Plugin::EVENT_AFTER_SAVE_SETTINGS` => `CraftCms\Cms\Component\Events\ComponentEvent`
@@ -197,24 +224,7 @@ Craft's Mutex classes have been deprecated. [Laravel's atomic locking](https://l
   - `craft\services\Plugins::EVENT_AFTER_SAVE_PLUGIN_SETTINGS` => `CraftCms\Cms\Plugin\Events\PluginSettingsSaved`;
   - `craft\services\Plugins::EVENT_AFTER_UNINSTALL_PLUGIN` => `CraftCms\Cms\Plugin\Events\PluginUninstalled`;
 
-### Migrations
-
-Craft and Yii's migrations have been removed in favor of [Laravel migrations](https://laravel.com/docs/12.x/migrations).
-
-The `php craft fields:merge` and `php craft entry-types:merge` commands will now generate Laravel migrations.
-
-- Deprecated `craft\db\Migration`. `CraftCms\Cms\Database\Migration` should be used instead.
-- Deprecated `craft\db\MigrationManager`
-- Removed `craft\helpers\MigrationHelper` as it was deprecated since 4.0.0.
-- Removed `craft\console\controllers\InstallController` in favor of:
-  - `CraftCms\Cms\Console\Commands\InstallCommand`
-  - `CraftCms\Cms\Console\Commands\InstallCheckCommand`
-- Removed `craft\console\controllers\MigrateController` in favor of:
-  - `CraftCms\Cms\Database\Commands\MigrateCommand` 
-- Removed `craft\console\controllers\UpController` in favor of:
-  - `CraftCms\Cms\Console\Commands\UpCommand` 
-
-### (Plugin) Updates
+## Updates
 
 The `craft\services\Updates` internal service has been removed. `CraftCms\Cms\Updates\Updates` should be used instead.
 

database/Factories/AddressFactory.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Database\Factories;
+
+use CraftCms\Cms\Addresses\Models\Address;
+use CraftCms\Cms\Element\Models\Element;
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Override;
+
+final class AddressFactory extends Factory
+{
+    protected $model = Address::class;
+
+    #[Override]
+    public function definition(): array
+    {
+        return [
+            'id' => Element::factory()->set('type', \CraftCms\Cms\Element\Elements\Address::class),
+            'countryCode' => fake()->countryCode(),
+            'dateCreated' => $created = $this->faker->dateTime(),
+            'dateUpdated' => $created,
+        ];
+    }
+}

database/Factories/UserPermissionFactory.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Database\Factories;
+
+use CraftCms\Cms\User\Models\UserPermission;
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Override;
+
+final class UserPermissionFactory extends Factory
+{
+    protected $model = UserPermission::class;
+
+    #[Override]
+    public function definition(): array
+    {
+        return [
+            'name' => $this->faker->word(),
+        ];
+    }
+}

src/Addresses/Models/Address.php

@@ -7,10 +7,13 @@
 use CraftCms\Cms\Database\Table;
 use CraftCms\Cms\Shared\BaseModel;
 use CraftCms\Cms\User\Models\User;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 final class Address extends BaseModel
 {
+    use HasFactory;
+
     protected $table = Table::ADDRESSES;
 
     /** @return BelongsTo<User, $this> */