{folder} folder.' => 'Save the loaded project config data to YAML files in your {folder} folder.',
'Save the “{section}” entry' => 'Save the “{section}” entry',
'Save {type}' => 'Save {type}',
@@ -1679,11 +1634,6 @@
'Table Columns' => 'Table Columns',
'Table' => 'Table',
'Tablet' => 'Tablet',
- 'Tag Group' => 'Tag Group',
- 'Tag Groups' => 'Tag Groups',
- 'Tag group saved.' => 'Tag group saved.',
- 'Tag' => 'Tag',
- 'Tags' => 'Tags',
'Target' => 'Target',
'Teal' => 'Teal',
'Team permissions can be managed from {link}.' => 'Team permissions can be managed from {link}.',
@@ -1751,7 +1701,6 @@
'The maximum length (in bytes) the field can hold.' => 'The maximum length (in bytes) the field can hold.',
'The maximum number of authors that entries in this section can have.' => 'The maximum number of authors that entries in this section can have.',
'The maximum number of characters or bytes the field is allowed to have.' => 'The maximum number of characters or bytes the field is allowed to have.',
- 'The maximum number of levels this category group can have.' => 'The maximum number of levels this category group can have.',
'The maximum number of levels this section can have.' => 'The maximum number of levels this section can have.',
'The maximum number of rows the field is allowed to have.' => 'The maximum number of rows the field is allowed to have.',
'The maximum number of {type} that may be selected.' => 'The maximum number of {type} that may be selected.',
@@ -1826,7 +1775,6 @@
'This field has been modified.' => 'This field has been modified.',
'This field is conditional' => 'This field is conditional',
'This field is included in element cards' => 'This field is included in element cards',
- 'This field is not set to a valid category group.' => 'This field is not set to a valid category group.',
'This field is not set to a valid source.' => 'This field is not set to a valid source.',
'This field is required' => 'This field is required',
'This field is translatable.' => 'This field is translatable.',
@@ -1839,7 +1787,6 @@
'This field’s values are used as search keywords.' => 'This field’s values are used as search keywords.',
'This field’s {attributes} {totalAttributes, plural, =1{has} other{have}} been overridden.' => 'This field’s {attributes} {totalAttributes, plural, =1{has} other{have}} been overridden.',
'This filesystem has been reserved for temporary asset uploads. Please choose a different one for your volume.' => 'This filesystem has been reserved for temporary asset uploads. Please choose a different one for your volume.',
- 'This global set doesn’t have any fields assigned to it in its field layout.' => 'This global set doesn’t have any fields assigned to it in its field layout.',
'This is a new {type}.' => 'This is a new {type}.',
'This is being overridden by the {setting} config setting.' => 'This is being overridden by the {setting} config setting.',
'This license is for the {name} edition.' => 'This license is for the {name} edition.',
@@ -2070,22 +2017,18 @@
'Website' => 'Website',
'Week Start Day' => 'Week Start Day',
'What auto-generated entry titles should look like. You can include tags that output entry properties, such as {ex}.' => 'What auto-generated entry titles should look like. You can include tags that output entry properties, such as {ex}.',
- 'What category URIs should look like for the site.' => 'What category URIs should look like for the site.',
'What do you want to do with any content that is only available in {language}?' => 'What do you want to do with any content that is only available in {language}?',
'What do you want to do with their content?' => 'What do you want to do with their content?',
'What do you want to do?' => 'What do you want to do?',
'What do you want to name the group?' => 'What do you want to name the group?',
'What entry URIs should look like for the site. Leave blank if entries don’t have URLs.' => 'What entry URIs should look like for the site. Leave blank if entries don’t have URLs.',
'What the entry URI should be for the site. Leave blank if the entry doesn’t have a URL.' => 'What the entry URI should be for the site. Leave blank if the entry doesn’t have a URL.',
- 'What this category group will be called in the control panel.' => 'What this category group will be called in the control panel.',
'What this entry type will be called in the control panel.' => 'What this entry type will be called in the control panel.',
'What this field will be called in the control panel.' => 'What this field will be called in the control panel.',
- 'What this global set will be called in the control panel.' => 'What this global set will be called in the control panel.',
'What this group will be called in the control panel.' => 'What this group will be called in the control panel.',
'What this schema will be called in the control panel.' => 'What this schema will be called in the control panel.',
'What this section will be called in the control panel.' => 'What this section will be called in the control panel.',
'What this site will be called in the control panel.' => 'What this site will be called in the control panel.',
- 'What this tag group will be called in the control panel.' => 'What this tag group will be called in the control panel.',
'What this token will be called in the control panel.' => 'What this token will be called in the control panel.',
'What type of field is this?' => 'What type of field is this?',
'What type of filesystem is this?' => 'What type of filesystem is this?',
@@ -2125,7 +2068,6 @@
'Which sites should entries be saved to?' => 'Which sites should entries be saved to?',
'Which source do you want to select {type} from?' => 'Which source do you want to select {type} from?',
'Which sources do you want to select {type} from?' => 'Which sources do you want to select {type} from?',
- 'Which template should be loaded when a category’s URL is requested.' => 'Which template should be loaded when a category’s URL is requested.',
'Which template should be loaded when an entry’s URL is requested.' => 'Which template should be loaded when an entry’s URL is requested.',
'Which type of entries do you want to create?' => 'Which type of entries do you want to create?',
'Widget Title' => 'Widget Title',
@@ -2194,8 +2136,6 @@
'begins with' => 'begins with',
'by {author}' => 'by {author}',
'by {creator}' => 'by {creator}',
- 'categories' => 'categories',
- 'category' => 'category',
'contains' => 'contains',
'content block' => 'content block',
'content blocks' => 'content blocks',
@@ -2220,8 +2160,6 @@
'forgot_password_heading' => 'When someone forgets their password:',
'forgot_password_subject' => 'Reset your password',
'four' => 'four',
- 'global set' => 'global set',
- 'global sets' => 'global sets',
'has a value' => 'has a value',
'hour' => 'hour',
'hours ago' => 'hours ago',
@@ -2267,8 +2205,6 @@
'seconds' => 'seconds',
'seven' => 'seven',
'six' => 'six',
- 'tag' => 'tag',
- 'tags' => 'tags',
'test_email_body' => "Hey {{user.friendlyName|e}},\n\nCongratulations! Craft was successfully able to send an email.\n\nHere are the settings you used:\n\n{{ settings }}",
'test_email_heading' => 'When you are testing your email settings:',
'test_email_subject' => 'This is a test email from Craft',
diff --git a/src/Database/Migrations/0000_00_00_000004_migrate_field_types.php b/src/Database/Migrations/0000_00_00_000004_migrate_field_types.php
index f9488e17258..08b36240a53 100644
--- a/src/Database/Migrations/0000_00_00_000004_migrate_field_types.php
+++ b/src/Database/Migrations/0000_00_00_000004_migrate_field_types.php
@@ -13,7 +13,6 @@
\craft\fields\Addresses::class => \CraftCms\Cms\Field\Addresses::class,
\craft\fields\Assets::class => \CraftCms\Cms\Field\Assets::class,
\craft\fields\ButtonGroup::class => \CraftCms\Cms\Field\ButtonGroup::class,
- \craft\fields\Categories::class => \CraftCms\Cms\Field\Categories::class,
\craft\fields\Checkboxes::class => \CraftCms\Cms\Field\Checkboxes::class,
\craft\fields\Color::class => \CraftCms\Cms\Field\Color::class,
\craft\fields\ContentBlock::class => \CraftCms\Cms\Field\ContentBlock::class,
@@ -35,7 +34,6 @@
\craft\fields\RadioButtons::class => \CraftCms\Cms\Field\RadioButtons::class,
\craft\fields\Range::class => \CraftCms\Cms\Field\Range::class,
\craft\fields\Table::class => \CraftCms\Cms\Field\Table::class,
- \craft\fields\Tags::class => \CraftCms\Cms\Field\Tags::class,
\craft\fields\Time::class => \CraftCms\Cms\Field\Time::class,
\craft\fields\Users::class => \CraftCms\Cms\Field\Users::class,
];
diff --git a/src/Database/Migrations/0000_00_00_000005_drop_old_tables.php b/src/Database/Migrations/0000_00_00_000005_drop_old_tables.php
new file mode 100644
index 00000000000..9dabcd5f0b0
--- /dev/null
+++ b/src/Database/Migrations/0000_00_00_000005_drop_old_tables.php
@@ -0,0 +1,30 @@
+tables as $table) {
+ Schema::dropIfExists($table);
+ }
+ }
+
+ public function down(): void
+ {
+ $this->output->writeln('0000_00_00_000005_drop_old_tables migration cannot be reverted.');
+ }
+};
diff --git a/src/Database/Migrations/Install.php b/src/Database/Migrations/Install.php
index c46f7bf11ae..e4b11300300 100644
--- a/src/Database/Migrations/Install.php
+++ b/src/Database/Migrations/Install.php
@@ -12,7 +12,6 @@
use craft\elements\User;
use craft\helpers\DateTimeHelper;
use craft\mail\transportadapters\Sendmail;
-use craft\models\CategoryGroup;
use craft\web\Response;
use CraftCms\Cms\Cms;
use CraftCms\Cms\Database\Migration;
@@ -221,41 +220,6 @@ public function createTables(): void
$table->primary(['key', 'senderClass', 'eventName']);
});
- Schema::create(Table::CATEGORIES, function (Blueprint $table) {
- $table->integer('id');
- $table->integer('groupId');
- $table->integer('parentId')->nullable();
- $table->boolean('deletedWithGroup')->nullable();
- $table->dateTime('dateCreated');
- $table->dateTime('dateUpdated');
- $table->primary('id');
- });
-
- Schema::create(Table::CATEGORYGROUPS, function (Blueprint $table) {
- $table->integer('id', true);
- $table->integer('structureId');
- $table->integer('fieldLayoutId')->nullable();
- $table->string('name');
- $table->string('handle');
- $table->enum('defaultPlacement', [CategoryGroup::DEFAULT_PLACEMENT_BEGINNING, CategoryGroup::DEFAULT_PLACEMENT_END])->default('end');
- $table->dateTime('dateCreated');
- $table->dateTime('dateUpdated');
- $table->dateTime('dateDeleted')->nullable()->default(null);
- $table->char('uid', 36)->default('0');
- });
-
- Schema::create(Table::CATEGORYGROUPS_SITES, function (Blueprint $table) {
- $table->integer('id', true);
- $table->integer('groupId');
- $table->integer('siteId');
- $table->boolean('hasUrls')->default(true);
- $table->text('uriFormat')->nullable();
- $table->string('template', 500)->nullable();
- $table->dateTime('dateCreated');
- $table->dateTime('dateUpdated');
- $table->char('uid', 36)->default('0');
- });
-
Schema::create(Table::CHANGEDATTRIBUTES, function (Blueprint $table) {
$table->integer('elementId');
$table->integer('siteId');
@@ -475,17 +439,6 @@ public function createTables(): void
$table->char('uid', 36)->default('0');
});
- Schema::create(Table::GLOBALSETS, function (Blueprint $table) {
- $table->integer('id', true);
- $table->string('name');
- $table->string('handle');
- $table->integer('fieldLayoutId')->nullable();
- $table->unsignedSmallInteger('sortOrder')->nullable();
- $table->dateTime('dateCreated');
- $table->dateTime('dateUpdated');
- $table->char('uid', 36)->default('0');
- });
-
Schema::create(Table::GQLTOKENS, function (Blueprint $table) {
$table->integer('id', true);
$table->string('name');
@@ -720,25 +673,6 @@ public function createTables(): void
$table->char('uid', 36)->default('0');
});
- Schema::create(Table::TAGGROUPS, function (Blueprint $table) {
- $table->integer('id', true);
- $table->string('name');
- $table->string('handle');
- $table->integer('fieldLayoutId')->nullable();
- $table->dateTime('dateCreated');
- $table->dateTime('dateUpdated');
- $table->dateTime('dateDeleted')->nullable()->default(null);
- $table->char('uid', 36)->default('0');
- });
-
- Schema::create(Table::TAGS, function (Blueprint $table) {
- $table->integer('id');
- $table->integer('groupId');
- $table->boolean('deletedWithGroup')->nullable();
- $table->dateTime('dateCreated');
- $table->dateTime('dateUpdated');
- });
-
Schema::create(Table::TOKENS, function (Blueprint $table) {
$table->integer('id', true);
$table->char('token', 32);
@@ -902,14 +836,6 @@ public function createIndexes(): void
Schema::createIndex(Table::ASSETS, ['folderId']);
Schema::createIndex(Table::ASSETS, ['volumeId']);
Schema::createIndex(Table::BULKOPEVENTS, ['timestamp']);
- Schema::createIndex(Table::CATEGORIES, ['groupId']);
- Schema::createIndex(Table::CATEGORYGROUPS, ['name']);
- Schema::createIndex(Table::CATEGORYGROUPS, ['handle']);
- Schema::createIndex(Table::CATEGORYGROUPS, ['structureId']);
- Schema::createIndex(Table::CATEGORYGROUPS, ['fieldLayoutId']);
- Schema::createIndex(Table::CATEGORYGROUPS, ['dateDeleted']);
- Schema::createIndex(Table::CATEGORYGROUPS_SITES, ['groupId', 'siteId'], unique: true);
- Schema::createIndex(Table::CATEGORYGROUPS_SITES, ['siteId']);
Schema::createIndex(Table::CHANGEDATTRIBUTES, ['elementId', 'siteId', 'dateUpdated']);
Schema::createIndex(Table::CHANGEDFIELDS, ['elementId', 'siteId', 'dateUpdated']);
Schema::createIndex(Table::CONTENTBLOCKS, ['primaryOwnerId']);
@@ -951,10 +877,6 @@ public function createIndexes(): void
Schema::createIndex(Table::FIELDS, ['handle', 'context']);
Schema::createIndex(Table::FIELDS, ['context']);
Schema::createIndex(Table::FIELDS, ['dateDeleted']);
- Schema::createIndex(Table::GLOBALSETS, ['name']);
- Schema::createIndex(Table::GLOBALSETS, ['handle']);
- Schema::createIndex(Table::GLOBALSETS, ['fieldLayoutId']);
- Schema::createIndex(Table::GLOBALSETS, ['sortOrder']);
Schema::createIndex(Table::GQLTOKENS, ['accessToken'], unique: true);
Schema::createIndex(Table::GQLTOKENS, ['name'], unique: true);
Schema::createIndex(Table::IMAGETRANSFORMINDEX, ['assetId', 'transformString']);
@@ -992,10 +914,6 @@ public function createIndexes(): void
Schema::createIndex(Table::STRUCTUREELEMENTS, ['level']);
Schema::createIndex(Table::STRUCTUREELEMENTS, ['elementId']);
Schema::createIndex(Table::STRUCTURES, ['dateDeleted']);
- Schema::createIndex(Table::TAGGROUPS, ['name']);
- Schema::createIndex(Table::TAGGROUPS, ['handle']);
- Schema::createIndex(Table::TAGGROUPS, ['dateDeleted']);
- Schema::createIndex(Table::TAGS, ['groupId']);
Schema::createIndex(Table::TOKENS, ['token'], unique: true);
Schema::createIndex(Table::TOKENS, ['expiryDate']);
Schema::createIndex(Table::USERGROUPS, ['handle']);
@@ -1069,13 +987,6 @@ public function addForeignKeys(): void
Schema::table(Table::ASSETS_SITES, fn (Blueprint $table) => $table->foreign('assetId')->references('id')->on(Table::ASSETS)->cascadeOnDelete());
Schema::table(Table::ASSETS_SITES, fn (Blueprint $table) => $table->foreign('siteId')->references('id')->on(Table::SITES)->cascadeOnDelete()->cascadeOnUpdate());
Schema::table(Table::AUTHENTICATOR, fn (Blueprint $table) => $table->foreign('userId')->references('id')->on(Table::USERS)->cascadeOnDelete());
- Schema::table(Table::CATEGORIES, fn (Blueprint $table) => $table->foreign('groupId')->references('id')->on(Table::CATEGORYGROUPS)->cascadeOnDelete());
- Schema::table(Table::CATEGORIES, fn (Blueprint $table) => $table->foreign('id')->references('id')->on(Table::ELEMENTS)->cascadeOnDelete());
- Schema::table(Table::CATEGORIES, fn (Blueprint $table) => $table->foreign('parentId')->references('id')->on(Table::CATEGORIES)->nullOnDelete());
- Schema::table(Table::CATEGORYGROUPS, fn (Blueprint $table) => $table->foreign('fieldLayoutId')->references('id')->on(Table::FIELDLAYOUTS)->nullOnDelete());
- Schema::table(Table::CATEGORYGROUPS, fn (Blueprint $table) => $table->foreign('structureId')->references('id')->on(Table::STRUCTURES)->cascadeOnDelete());
- Schema::table(Table::CATEGORYGROUPS_SITES, fn (Blueprint $table) => $table->foreign('groupId')->references('id')->on(Table::CATEGORYGROUPS)->cascadeOnDelete());
- Schema::table(Table::CATEGORYGROUPS_SITES, fn (Blueprint $table) => $table->foreign('siteId')->references('id')->on(Table::SITES)->cascadeOnDelete()->cascadeOnUpdate());
Schema::table(Table::CHANGEDATTRIBUTES, fn (Blueprint $table) => $table->foreign('elementId')->references('id')->on(Table::ELEMENTS)->cascadeOnDelete()->cascadeOnUpdate());
Schema::table(Table::CHANGEDATTRIBUTES, fn (Blueprint $table) => $table->foreign('siteId')->references('id')->on(Table::SITES)->cascadeOnDelete()->cascadeOnUpdate());
Schema::table(Table::CHANGEDATTRIBUTES, fn (Blueprint $table) => $table->foreign('userId')->references('id')->on(Table::USERS)->nullOnDelete()->cascadeOnUpdate());
@@ -1109,8 +1020,6 @@ public function addForeignKeys(): void
Schema::table(Table::ENTRIES, fn (Blueprint $table) => $table->foreign('fieldId')->references('id')->on(Table::FIELDS)->cascadeOnDelete());
Schema::table(Table::ENTRIES, fn (Blueprint $table) => $table->foreign('primaryOwnerId')->references('id')->on(Table::ELEMENTS)->cascadeOnDelete());
Schema::table(Table::ENTRYTYPES, fn (Blueprint $table) => $table->foreign('fieldLayoutId')->references('id')->on(Table::FIELDLAYOUTS)->nullOnDelete());
- Schema::table(Table::GLOBALSETS, fn (Blueprint $table) => $table->foreign('fieldLayoutId')->references('id')->on(Table::FIELDLAYOUTS)->nullOnDelete());
- Schema::table(Table::GLOBALSETS, fn (Blueprint $table) => $table->foreign('id')->references('id')->on(Table::ELEMENTS)->cascadeOnDelete());
Schema::table(Table::GQLTOKENS, fn (Blueprint $table) => $table->foreign('schemaId')->references('id')->on(Table::GQLSCHEMAS)->nullOnDelete());
Schema::table(Table::RELATIONS, fn (Blueprint $table) => $table->foreign('fieldId')->references('id')->on(Table::FIELDS)->cascadeOnDelete());
Schema::table(Table::RELATIONS, fn (Blueprint $table) => $table->foreign('sourceId')->references('id')->on(Table::ELEMENTS)->cascadeOnDelete());
@@ -1129,9 +1038,6 @@ public function addForeignKeys(): void
Schema::table(Table::SITES, fn (Blueprint $table) => $table->foreign('groupId')->references('id')->on(Table::SITEGROUPS)->cascadeOnDelete());
Schema::table(Table::SSO_IDENTITIES, fn (Blueprint $table) => $table->foreign('userId')->references('id')->on(Table::USERS)->cascadeOnDelete());
Schema::table(Table::STRUCTUREELEMENTS, fn (Blueprint $table) => $table->foreign('structureId')->references('id')->on(Table::STRUCTURES)->cascadeOnDelete());
- Schema::table(Table::TAGGROUPS, fn (Blueprint $table) => $table->foreign('fieldLayoutId')->references('id')->on(Table::FIELDLAYOUTS)->nullOnDelete());
- Schema::table(Table::TAGS, fn (Blueprint $table) => $table->foreign('groupId')->references('id')->on(Table::TAGGROUPS)->cascadeOnDelete());
- Schema::table(Table::TAGS, fn (Blueprint $table) => $table->foreign('id')->references('id')->on(Table::ELEMENTS)->cascadeOnDelete());
Schema::table(Table::USERGROUPS_USERS, fn (Blueprint $table) => $table->foreign('groupId')->references('id')->on(Table::USERGROUPS)->cascadeOnDelete());
Schema::table(Table::USERGROUPS_USERS, fn (Blueprint $table) => $table->foreign('userId')->references('id')->on(Table::USERS)->cascadeOnDelete());
Schema::table(Table::USERPERMISSIONS_USERGROUPS, fn (Blueprint $table) => $table->foreign('groupId')->references('id')->on(Table::USERGROUPS)->cascadeOnDelete());
diff --git a/src/Database/Table.php b/src/Database/Table.php
index 7c1af4f49e4..4db27fee9c9 100644
--- a/src/Database/Table.php
+++ b/src/Database/Table.php
@@ -27,12 +27,6 @@
public const string CACHE = 'cache';
- public const string CATEGORIES = 'categories';
-
- public const string CATEGORYGROUPS = 'categorygroups';
-
- public const string CATEGORYGROUPS_SITES = 'categorygroups_sites';
-
public const string CHANGEDATTRIBUTES = 'changedattributes';
public const string CHANGEDFIELDS = 'changedfields';
@@ -63,8 +57,6 @@
public const string FIELDS = 'fields';
- public const string GLOBALSETS = 'globalsets';
-
public const string GQLSCHEMAS = 'gqlschemas';
public const string GQLTOKENS = 'gqltokens';
@@ -123,10 +115,6 @@
public const string SYSTEMMESSAGES = 'systemmessages';
- public const string TAGGROUPS = 'taggroups';
-
- public const string TAGS = 'tags';
-
public const string TOKENS = 'tokens';
public const string USERGROUPS = 'usergroups';
diff --git a/src/Field/Categories.php b/src/Field/Categories.php
deleted file mode 100644
index 0b8564db16f..00000000000
--- a/src/Field/Categories.php
+++ /dev/null
@@ -1,199 +0,0 @@
-', CategoryQuery::class, ElementCollection::class, Category::class);
- }
-
- /**
- * {@inheritdoc}
- */
- public bool $allowMultipleSources = false;
-
- /**
- * {@inheritdoc}
- */
- public function __construct(array $config = [])
- {
- // allow categories to limit selection if `maintainHierarchy` isn't checked
- $config['allowLimit'] = true;
-
- // Default maintainHierarchy to true for existing Assets fields
- if (isset($config['id']) && ! isset($config['maintainHierarchy'])) {
- $config['maintainHierarchy'] = true;
- }
-
- parent::__construct($config);
- }
-
- /**
- * {@inheritdoc}
- */
- #[\Override]
- public function normalizeValue(mixed $value, ?ElementInterface $element): mixed
- {
- if (is_array($value) && $this->maintainHierarchy) {
- /** @var Category[] $categories */
- $categories = Category::find()
- ->siteId($this->targetSiteId($element))
- ->id(array_values(array_filter($value)))
- ->status(null)
- ->all();
-
- // Fill in any gaps
- Structures::fillGapsInElements($categories);
-
- // Enforce the branch limit
- if ($this->branchLimit) {
- Structures::applyBranchLimitToElements($categories, $this->branchLimit);
- }
-
- $value = array_map(fn (Category $category) => $category->id, $categories);
- }
-
- return parent::normalizeValue($value, $element);
- }
-
- /**
- * {@inheritdoc}
- */
- #[\Override]
- protected function inputHtml(mixed $value, ?ElementInterface $element, bool $inline): string
- {
- // Make sure the field is set to a valid category group
- if ($this->source) {
- $source = ElementHelper::findSource(self::elementType(), $this->source, ElementSources::CONTEXT_FIELD);
- }
-
- if (empty($source)) {
- return ''.t('This field is not set to a valid category group.').'
'; - } - - return parent::inputHtml($value, $element, $inline); - } - - /** - * {@inheritdoc} - */ - #[\Override] - public function includeInGqlSchema(GqlSchema $schema): bool - { - return Gql::canQueryCategories($schema); - } - - /** - * {@inheritdoc} - */ - #[\Override] - public function getContentGqlType(): array - { - return [ - 'name' => $this->handle, - 'type' => Type::nonNull(Type::listOf(CategoryInterface::getType())), - 'args' => CategoryArguments::getArguments(), - 'resolve' => CategoryResolver::class.'::resolve', - 'complexity' => GqlHelper::relatedArgumentComplexity(GqlService::GRAPHQL_COMPLEXITY_EAGER_LOAD), - ]; - } - - /** - * {@inheritdoc} - */ - #[\Override] - public function getEagerLoadingGqlConditions(): ?array - { - $allowedEntities = Gql::extractAllowedEntitiesFromSchema(); - $categoryGroupUids = $allowedEntities['categorygroups'] ?? []; - - if (empty($categoryGroupUids)) { - return null; - } - - $categoriesService = Craft::$app->getCategories(); - $groupIds = array_filter(array_map(function (string $uid) use ($categoriesService) { - $group = $categoriesService->getGroupByUid($uid); - - return $group->id ?? null; - }, $categoryGroupUids)); - - return [ - 'groupId' => $groupIds, - ]; - } -} diff --git a/src/Field/Field.php b/src/Field/Field.php index 624b17bc064..01dacabfde7 100644 --- a/src/Field/Field.php +++ b/src/Field/Field.php @@ -291,9 +291,7 @@ abstract class Field implements \Stringable, Actionable, Arrayable, FieldInterfa 'propagating', 'ref', 'relatedToAssets', - 'relatedToCategories', 'relatedToEntries', - 'relatedToTags', 'relatedToUsers', 'resaving', 'revisionId', diff --git a/src/Field/Fields.php b/src/Field/Fields.php index 17a0dfce64e..80acd36558d 100644 --- a/src/Field/Fields.php +++ b/src/Field/Fields.php @@ -22,7 +22,6 @@ use CraftCms\Cms\Database\Table; use CraftCms\Cms\Field\Addresses as AddressesField; use CraftCms\Cms\Field\Assets as AssetsField; -use CraftCms\Cms\Field\Categories as CategoriesField; use CraftCms\Cms\Field\Contracts\ElementContainerFieldInterface; use CraftCms\Cms\Field\Contracts\FieldInterface; use CraftCms\Cms\Field\Entries as EntriesField; @@ -41,7 +40,6 @@ use CraftCms\Cms\Field\Events\RegisterNestedEntryFieldTypes; use CraftCms\Cms\Field\Matrix as MatrixField; use CraftCms\Cms\Field\Table as TableField; -use CraftCms\Cms\Field\Tags as TagsField; use CraftCms\Cms\Field\Users as UsersField; use CraftCms\Cms\ProjectConfig\Events\ConfigEvent; use CraftCms\Cms\ProjectConfig\ProjectConfig; @@ -114,7 +112,6 @@ public function getAllFieldTypes(): Collection AddressesField::class, AssetsField::class, ButtonGroup::class, - CategoriesField::class, Checkboxes::class, Color::class, ContentBlock::class, @@ -135,7 +132,6 @@ public function getAllFieldTypes(): Collection RadioButtons::class, Range::class, TableField::class, - TagsField::class, Time::class, UsersField::class, ]); diff --git a/src/Field/Link.php b/src/Field/Link.php index e4fcdfd20c9..8fd349090fa 100644 --- a/src/Field/Link.php +++ b/src/Field/Link.php @@ -26,7 +26,6 @@ use CraftCms\Cms\Field\LinkTypes\Asset; use CraftCms\Cms\Field\LinkTypes\BaseLinkType; use CraftCms\Cms\Field\LinkTypes\BaseTextLinkType; -use CraftCms\Cms\Field\LinkTypes\Category; use CraftCms\Cms\Field\LinkTypes\Email as EmailType; use CraftCms\Cms\Field\LinkTypes\Entry; use CraftCms\Cms\Field\LinkTypes\Phone; @@ -112,7 +111,6 @@ private static function types(): array /** @var class-string'.t('This field is not set to a valid source.').'
'; - } - - /** - * {@inheritdoc} - */ - #[\Override] - protected function supportedViewModes(): array - { - return [ - 'list' => t('List'), - ]; - } - - /** - * {@inheritdoc} - */ - #[\Override] - public function includeInGqlSchema(GqlSchema $schema): bool - { - return Gql::canQueryTags($schema); - } - - /** - * {@inheritdoc} - */ - #[\Override] - public function getContentGqlType(): array - { - return [ - 'name' => $this->handle, - 'type' => Type::nonNull(Type::listOf(TagInterface::getType())), - 'args' => TagArguments::getArguments(), - 'resolve' => TagResolver::class.'::resolve', - 'complexity' => GqlHelper::relatedArgumentComplexity(GqlService::GRAPHQL_COMPLEXITY_EAGER_LOAD), - ]; - } - - /** - * {@inheritdoc} - */ - #[\Override] - public function getEagerLoadingGqlConditions(): ?array - { - $allowedEntities = Gql::extractAllowedEntitiesFromSchema(); - $tagGroupUids = $allowedEntities['taggroups'] ?? []; - - if (empty($tagGroupUids)) { - return null; - } - - $tagsService = Craft::$app->getTags(); - $tagGroupIds = array_filter(array_map(function (string $uid) use ($tagsService) { - $tagGroup = $tagsService->getTagGroupByUid($uid); - - return $tagGroup->id ?? null; - }, $tagGroupUids)); - - return [ - 'groupId' => $tagGroupIds, - ]; - } - - /** - * Returns the tag group associated with this field. - */ - private function _getTagGroup(): ?TagGroup - { - $groupUid = $this->_getTagGroupUid(); - - return $groupUid ? Craft::$app->getTags()->getTagGroupByUid($groupUid) : null; - } - - /** - * Returns the tag group ID this field is associated with. - */ - private function _getTagGroupUid(): ?string - { - if (! isset($this->_tagGroupUid)) { - if (preg_match('/^taggroup:([0-9a-f\-]+)$/', (string) $this->source, $matches)) { - $this->_tagGroupUid = $matches[1]; - } else { - $this->_tagGroupUid = false; - } - } - - return $this->_tagGroupUid ?: null; - } -} diff --git a/src/GarbageCollection/Actions/DeleteUnsupportedSiteEntries.php b/src/GarbageCollection/Actions/DeleteUnsupportedSiteEntries.php index 66102714a08..a62e9604571 100644 --- a/src/GarbageCollection/Actions/DeleteUnsupportedSiteEntries.php +++ b/src/GarbageCollection/Actions/DeleteUnsupportedSiteEntries.php @@ -4,7 +4,6 @@ namespace CraftCms\Cms\GarbageCollection\Actions; -use craft\elements\Category; use CraftCms\Cms\Config\GeneralConfig; use CraftCms\Cms\Database\Table; use CraftCms\Cms\GarbageCollection\GarbageCollection; diff --git a/src/GarbageCollection/GarbageCollection.php b/src/GarbageCollection/GarbageCollection.php index 01a0626fe36..185a3b681b9 100644 --- a/src/GarbageCollection/GarbageCollection.php +++ b/src/GarbageCollection/GarbageCollection.php @@ -6,11 +6,8 @@ use craft\elements\Address; use craft\elements\Asset; -use craft\elements\Category; use craft\elements\ContentBlock; use craft\elements\Entry; -use craft\elements\GlobalSet; -use craft\elements\Tag; use craft\elements\User; use CraftCms\Cms\Database\Table; use CraftCms\Cms\GarbageCollection\Actions\DeleteOrphanedDraftsAndRevisions; @@ -89,26 +86,18 @@ public function run(bool $force = false): void [HardDelete::class, [ 'tables' => [ - Table::CATEGORYGROUPS, Table::ENTRYTYPES, Table::FIELDS, Table::SECTIONS, - Table::TAGGROUPS, ], ]], [DeletePartialElements::class, ['elementType' => Address::class, 'table' => Table::ADDRESSES]], [DeletePartialElements::class, ['elementType' => Asset::class, 'table' => Table::ASSETS]], - [DeletePartialElements::class, ['elementType' => Category::class, 'table' => Table::CATEGORIES]], [DeletePartialElements::class, ['elementType' => ContentBlock::class, 'table' => Table::CONTENTBLOCKS]], [DeletePartialElements::class, ['elementType' => Entry::class, 'table' => Table::ENTRIES]], - [DeletePartialElements::class, ['elementType' => GlobalSet::class, 'table' => Table::GLOBALSETS]], - [DeletePartialElements::class, ['elementType' => Tag::class, 'table' => Table::TAGS]], [DeletePartialElements::class, ['elementType' => User::class, 'table' => Table::USERS]], [DeleteOrphanedFieldLayouts::class, ['elementType' => Asset::class, 'table' => Table::VOLUMES]], - [DeleteOrphanedFieldLayouts::class, ['elementType' => Category::class, 'table' => Table::CATEGORYGROUPS]], [DeleteOrphanedFieldLayouts::class, ['elementType' => Entry::class, 'table' => Table::ENTRYTYPES]], - [DeleteOrphanedFieldLayouts::class, ['elementType' => GlobalSet::class, 'table' => Table::GLOBALSETS]], - [DeleteOrphanedFieldLayouts::class, ['elementType' => Tag::class, 'table' => Table::TAGGROUPS]], DeleteUnsupportedSiteEntries::class, [DeleteOrphanedNestedElements::class, ['elementType' => Address::class, 'table' => Table::ADDRESSES]], [DeleteOrphanedNestedElements::class, ['elementType' => ContentBlock::class, 'table' => Table::CONTENTBLOCKS]], diff --git a/src/Http/Controllers/FieldsController.php b/src/Http/Controllers/FieldsController.php index 4458a211900..6cb8cc24d29 100644 --- a/src/Http/Controllers/FieldsController.php +++ b/src/Http/Controllers/FieldsController.php @@ -9,7 +9,6 @@ use craft\base\FieldLayoutComponent; use craft\base\FieldLayoutElement; use craft\base\FieldLayoutProviderInterface; -use craft\elements\GlobalSet; use craft\fieldlayoutelements\CustomField; use craft\helpers\Component; use craft\helpers\Cp; @@ -261,12 +260,7 @@ public function edit(Request $request, ?FieldInterface $field = null, ?int $fiel /** @var FieldLayoutProviderInterface&Chippable $provider */ $provider = $layout->provider; $label = $labels[] = $provider->getUiLabel(); - // special case for global sets, where we should link to the settings rather than the edit page - if ($provider instanceof GlobalSet) { - $url = "settings/globals/$provider->id"; - } else { - $url = $provider instanceof CpEditable ? $provider->getCpEditUrl() : null; - } + $url = $provider instanceof CpEditable ? $provider->getCpEditUrl() : null; $icon = $provider instanceof Iconic ? $provider->getIcon() : null; $labelHtml = Html::beginTag('span', [ diff --git a/src/ProjectConfig/ProjectConfig.php b/src/ProjectConfig/ProjectConfig.php index 81bb6ef6a3b..30fb9820bfc 100644 --- a/src/ProjectConfig/ProjectConfig.php +++ b/src/ProjectConfig/ProjectConfig.php @@ -7,14 +7,11 @@ use Craft; use craft\base\FsInterface; use craft\elements\Address; -use craft\elements\GlobalSet; use craft\elements\User; use craft\helpers\App; use craft\helpers\DateTimeHelper; use craft\helpers\FileHelper; -use craft\models\CategoryGroup; use craft\models\ImageTransform; -use craft\models\TagGroup; use craft\models\Volume; use craft\services\ElementSources; use CraftCms\Cms\Cms; @@ -118,8 +115,6 @@ final class ProjectConfig public const string PATH_ADDRESS_FIELD_LAYOUTS = self::PATH_ADDRESSES.'.'.'fieldLayouts'; - public const string PATH_CATEGORY_GROUPS = 'categoryGroups'; - public const string PATH_DATE_MODIFIED = 'dateModified'; public const string PATH_ELEMENT_SOURCES = 'elementSources'; @@ -130,8 +125,6 @@ final class ProjectConfig public const string PATH_FIELDS = 'fields'; - public const string PATH_GLOBAL_SETS = 'globalSets'; - public const string PATH_FS = 'fs'; public const string PATH_GRAPHQL = 'graphql'; @@ -160,8 +153,6 @@ final class ProjectConfig public const string PATH_SYSTEM = 'system'; - public const string PATH_TAG_GROUPS = 'tagGroups'; - public const string PATH_USERS = 'users'; public const string PATH_USER_FIELD_LAYOUTS = self::PATH_USERS.'.'.'fieldLayouts'; @@ -1128,13 +1119,11 @@ public function rebuild(): void unset($config[self::PATH_META]); $config[self::PATH_ADDRESSES] = $this->_getAddressesData(); - $config[self::PATH_CATEGORY_GROUPS] = $this->_getCategoryGroupData(); $config[self::PATH_DATE_MODIFIED] = DateTimeHelper::currentTimeStamp(); $config[self::PATH_ELEMENT_SOURCES] = $this->_getElementSourceData($config[self::PATH_ELEMENT_SOURCES] ?? []); $config[self::PATH_ENTRY_TYPES] = $this->_getEntryTypeData(); $config[self::PATH_FIELDS] = $this->_getFieldData(); $config[self::PATH_FS] = $this->_getFsData(); - $config[self::PATH_GLOBAL_SETS] = $this->_getGlobalSetData(); $config[self::PATH_GRAPHQL] = $this->_getGqlData(); $config[self::PATH_IMAGE_TRANSFORMS] = $this->_getTransformData(); $config[self::PATH_PLUGINS] = $this->_getPluginData($config[self::PATH_PLUGINS] ?? []); @@ -1142,7 +1131,6 @@ public function rebuild(): void $config[self::PATH_SITES] = $this->_getSiteData(); $config[self::PATH_SITE_GROUPS] = $this->_getSiteGroupData(); $config[self::PATH_SYSTEM] = $this->_systemConfig($config[self::PATH_SYSTEM] ?? []); - $config[self::PATH_TAG_GROUPS] = $this->_getTagGroupData(); $config[self::PATH_USERS] = $this->_getUserData($config[self::PATH_USERS] ?? []); $config[self::PATH_VOLUMES] = $this->_getVolumeData(); @@ -1882,36 +1870,6 @@ private function _getAddressesData(): array return $data; } - /** - * Return category group data config array. - */ - private function _getCategoryGroupData(): array - { - return collect(Craft::$app->getCategories()->getAllGroups()) - ->mapWithKeys(fn (CategoryGroup $group) => [$group->uid => $group->getConfig()]) - ->all(); - } - - /** - * Return tag group data config array. - */ - private function _getTagGroupData(): array - { - return collect(Craft::$app->getTags()->getAllTagGroups()) - ->mapWithKeys(fn (TagGroup $group) => [$group->uid => $group->getConfig()]) - ->all(); - } - - /** - * Return global set data config array. - */ - private function _getGlobalSetData(): array - { - return collect(Craft::$app->getGlobals()->getAllSets()) - ->mapWithKeys(fn (GlobalSet $globalSet) => [$globalSet->uid => $globalSet->getConfig()]) - ->all(); - } - /** * Return plugin data config array */ diff --git a/src/ProjectConfig/ProjectConfigServiceProvider.php b/src/ProjectConfig/ProjectConfigServiceProvider.php index e44bae288b9..34a3b348703 100644 --- a/src/ProjectConfig/ProjectConfigServiceProvider.php +++ b/src/ProjectConfig/ProjectConfigServiceProvider.php @@ -79,14 +79,6 @@ public function boot(ProjectConfig $projectConfig): void ->onAdd(ProjectConfig::PATH_SITES.'.{uid}', fn (ConfigEvent $event) => Sites::handleChangedSite($event)) ->onUpdate(ProjectConfig::PATH_SITES.'.{uid}', fn (ConfigEvent $event) => Sites::handleChangedSite($event)) ->onRemove(ProjectConfig::PATH_SITES.'.{uid}', fn (ConfigEvent $event) => Sites::handleDeletedSite($event)) - // Tags - ->onAdd(ProjectConfig::PATH_TAG_GROUPS.'.{uid}', $this->proxy('tags', 'handleChangedTagGroup')) - ->onUpdate(ProjectConfig::PATH_TAG_GROUPS.'.{uid}', $this->proxy('tags', 'handleChangedTagGroup')) - ->onRemove(ProjectConfig::PATH_TAG_GROUPS.'.{uid}', $this->proxy('tags', 'handleDeletedTagGroup')) - // Categories - ->onAdd(ProjectConfig::PATH_CATEGORY_GROUPS.'.{uid}', $this->proxy('categories', 'handleChangedCategoryGroup')) - ->onUpdate(ProjectConfig::PATH_CATEGORY_GROUPS.'.{uid}', $this->proxy('categories', 'handleChangedCategoryGroup')) - ->onRemove(ProjectConfig::PATH_CATEGORY_GROUPS.'.{uid}', $this->proxy('categories', 'handleDeletedCategoryGroup')) // User group permissions ->onAdd(ProjectConfig::PATH_USER_GROUPS.'.{uid}.permissions', $this->proxy('userPermissions', 'handleChangedGroupPermissions')) ->onUpdate(ProjectConfig::PATH_USER_GROUPS.'.{uid}.permissions', $this->proxy('userPermissions', 'handleChangedGroupPermissions')) @@ -99,10 +91,6 @@ public function boot(ProjectConfig $projectConfig): void ->onAdd(ProjectConfig::PATH_USER_FIELD_LAYOUTS, $this->proxy('users', 'handleChangedUserFieldLayout')) ->onUpdate(ProjectConfig::PATH_USER_FIELD_LAYOUTS, $this->proxy('users', 'handleChangedUserFieldLayout')) ->onRemove(ProjectConfig::PATH_USER_FIELD_LAYOUTS, $this->proxy('users', 'handleChangedUserFieldLayout')) - // Global sets - ->onAdd(ProjectConfig::PATH_GLOBAL_SETS.'.{uid}', $this->proxy('globals', 'handleChangedGlobalSet')) - ->onUpdate(ProjectConfig::PATH_GLOBAL_SETS.'.{uid}', $this->proxy('globals', 'handleChangedGlobalSet')) - ->onRemove(ProjectConfig::PATH_GLOBAL_SETS.'.{uid}', $this->proxy('globals', 'handleDeletedGlobalSet')) // Sections ->onAdd(ProjectConfig::PATH_SECTIONS.'.{uid}', fn (ConfigEvent $event) => Sections::handleChangedSection($event)) ->onUpdate(ProjectConfig::PATH_SECTIONS.'.{uid}', fn (ConfigEvent $event) => Sections::handleChangedSection($event)) diff --git a/src/Site/Sites.php b/src/Site/Sites.php index 64b0813ebda..02245e1c488 100644 --- a/src/Site/Sites.php +++ b/src/Site/Sites.php @@ -6,9 +6,6 @@ use craft\base\ElementInterface; use craft\elements\Asset; -use craft\elements\Category; -use craft\elements\GlobalSet; -use craft\elements\Tag; use craft\helpers\Queue; use craft\queue\jobs\PropagateElements; use CraftCms\Cms\Database\Table; @@ -508,27 +505,11 @@ public function handleChangedSite(ConfigEvent $event): void } if ($isNewSite && $oldPrimarySiteId) { - $oldPrimarySiteUid = DB::table(Table::SITES)->uidById($oldPrimarySiteId); - $existingCategorySettings = $this->projectConfig->get(ProjectConfig::PATH_CATEGORY_GROUPS); - - if (! $this->projectConfig->isApplyingExternalChanges && is_array($existingCategorySettings)) { - foreach ($existingCategorySettings as $categoryUid => $settings) { - $this->projectConfig->set( - path: ProjectConfig::PATH_CATEGORY_GROUPS.'.'.$categoryUid.'.siteSettings.'.$site->uid, - value: $settings['siteSettings'][$oldPrimarySiteUid], - message: 'Copy site settings for category groups', - ); - } - } - // Re-save most localizable element types // (skip entries because they only support specific sites) // (skip Matrix blocks because they will be re-saved when their owners are re-saved). $elementTypes = [ - GlobalSet::class, Asset::class, - Category::class, - Tag::class, ]; foreach ($elementTypes as $elementType) { diff --git a/src/Structure/Commands/RepairCategoryGroupStructureCommand.php b/src/Structure/Commands/RepairCategoryGroupStructureCommand.php deleted file mode 100644 index 5629ac4a4b3..00000000000 --- a/src/Structure/Commands/RepairCategoryGroupStructureCommand.php +++ /dev/null @@ -1,33 +0,0 @@ -getCategories()->getGroupByHandle($handle = $this->argument('handle')); - - if (! $group) { - $this->components->error("Invalid category group handle: $handle"); - - return self::FAILURE; - } - - return $this->repairStructure($group->structureId, Category::find()->group($group)); - } -} diff --git a/src/Structure/StructureServiceProvider.php b/src/Structure/StructureServiceProvider.php index e6d84b9d48d..0e10ec89c81 100644 --- a/src/Structure/StructureServiceProvider.php +++ b/src/Structure/StructureServiceProvider.php @@ -4,7 +4,6 @@ namespace CraftCms\Cms\Structure; -use CraftCms\Cms\Structure\Commands\RepairCategoryGroupStructureCommand; use CraftCms\Cms\Structure\Commands\RepairSectionStructureCommand; use Illuminate\Support\ServiceProvider; @@ -14,7 +13,6 @@ public function boot(): void { $this->commands([ RepairSectionStructureCommand::class, - RepairCategoryGroupStructureCommand::class, ]); } } diff --git a/tests/GarbageCollection/GarbageCollectionTest.php b/tests/GarbageCollection/GarbageCollectionTest.php index 239444f4713..f2f16dd2cd5 100644 --- a/tests/GarbageCollection/GarbageCollectionTest.php +++ b/tests/GarbageCollection/GarbageCollectionTest.php @@ -4,11 +4,8 @@ use craft\elements\Address; use craft\elements\Asset; -use craft\elements\Category; use craft\elements\ContentBlock; use craft\elements\Entry; -use craft\elements\GlobalSet; -use craft\elements\Tag; use craft\elements\User; use CraftCms\Cms\Database\Table; use CraftCms\Cms\GarbageCollection\Actions\DeleteOrphanedFieldLayouts; @@ -76,11 +73,8 @@ })->with([ [Address::class, Table::ADDRESSES], [Asset::class, Table::ASSETS], - [Category::class, Table::CATEGORIES], [ContentBlock::class, Table::CONTENTBLOCKS], [Entry::class, Table::ENTRIES], - [GlobalSet::class, Table::GLOBALSETS], - [Tag::class, Table::TAGS], [User::class, Table::USERS], ]); @@ -98,10 +92,7 @@ app(GarbageCollection::class)->run(force: true); })->with([ [Asset::class, Table::VOLUMES], - [Category::class, Table::CATEGORYGROUPS], [Entry::class, Table::ENTRYTYPES], - [GlobalSet::class, Table::GLOBALSETS], - [Tag::class, Table::TAGGROUPS], ]); test('it deletes orphaned nested elements', function (string $elementType, string $table) { @@ -136,11 +127,9 @@ app(GarbageCollection::class)->run(force: true); })->with([ [[ - Table::CATEGORYGROUPS, Table::ENTRYTYPES, Table::FIELDS, Table::SECTIONS, - Table::TAGGROUPS, ]], [[ Table::FIELDLAYOUTS, diff --git a/yii2-adapter/legacy/base/ApplicationTrait.php b/yii2-adapter/legacy/base/ApplicationTrait.php index 295c26988bd..02adbb16536 100644 --- a/yii2-adapter/legacy/base/ApplicationTrait.php +++ b/yii2-adapter/legacy/base/ApplicationTrait.php @@ -13,9 +13,7 @@ use craft\db\mysql\Schema; use craft\elements\Address; use craft\elements\Asset; -use craft\elements\Category; use craft\elements\Entry; -use craft\elements\Tag; use craft\elements\User; use craft\errors\DbConnectException; use craft\events\DefineFieldLayoutFieldsEvent; @@ -52,7 +50,6 @@ use craft\services\AssetIndexer; use craft\services\Assets; use craft\services\Auth; -use craft\services\Categories; use craft\services\Conditions; use craft\services\Config; use craft\services\Dashboard; @@ -64,7 +61,6 @@ use craft\services\Fields; use craft\services\Fs; use craft\services\Gc; -use craft\services\Globals; use craft\services\Gql; use craft\services\Images; use craft\services\ImageTransforms; @@ -79,7 +75,6 @@ use craft\services\Sso; use craft\services\Structures; use craft\services\SystemMessages; -use craft\services\Tags; use craft\services\TemplateCaches; use craft\services\Tokens; use craft\services\UserGroups; @@ -129,7 +124,6 @@ * @property-read AssetManager $assetManager The asset manager component * @property-read Assets $assets The assets service * @property-read Auth $auth The user authentication service - * @property-read Categories $categories The categories service * @property-read Conditions $conditions The conditions service * @property-read Config $config The config service * @property-read Connection $db The database connection component @@ -144,7 +138,6 @@ * @property-read Formatter $formatter The formatter component * @property-read Fs $fs The filesystems service * @property-read Gc $gc The garbage collection service - * @property-read Globals $globals The globals service * @property-read Gql $gql The GraphQl service * @property-read I18N $i18n The internationalization (i18n) component * @property-read Images $images The images service @@ -166,7 +159,6 @@ * @property-read Sso $sso The SSO service * @property-read Structures $structures The structures service * @property-read SystemMessages $systemMessages The system email messages service - * @property-read Tags $tags The tags service * @property-read TemplateCaches $templateCaches The template caches service * @property-read Tokens $tokens The tokens service * @property-read UrlManager $urlManager The URL manager for this application @@ -854,16 +846,6 @@ public function getImageTransforms(): ImageTransforms return $this->get('imageTransforms'); } - /** - * Returns the categories service. - * - * @return Categories The categories service - */ - public function getCategories(): Categories - { - return $this->get('categories'); - } - /** * Returns the conditions service. * @@ -1036,16 +1018,6 @@ public function getGc(): Gc return $this->get('gc'); } - /** - * Returns the globals service. - * - * @return Globals The globals service - */ - public function getGlobals(): Globals - { - return $this->get('globals'); - } - /** * Returns the GraphQL service. * @@ -1221,16 +1193,6 @@ public function getStructures(): Structures return $this->get('structures'); } - /** - * Returns the tags service. - * - * @return Tags The tags service - */ - public function getTags(): Tags - { - return $this->get('tags'); - } - /** * Returns the template cache service. * @@ -1357,9 +1319,6 @@ private function _postInit(): void // Register field layout listeners $this->_registerFieldLayoutListener(); - // Register all the listeners for config items - $this->_registerConfigListeners(); - $this->_isInitialized = true; // Fire an 'init' event @@ -1413,10 +1372,6 @@ private function _registerFieldLayoutListener(): void $fieldLayout = $event->sender; switch ($fieldLayout->type) { - case Category::class: - case Tag::class: - $event->fields[] = TitleField::class; - break; case Address::class: $event->fields[] = LabelField::class; $event->fields[] = OrganizationField::class; @@ -1447,17 +1402,4 @@ private function _registerFieldLayoutListener(): void } }); } - - /** - * Register event listeners for config changes. - */ - private function _registerConfigListeners(): void - { - // Prune deleted sites from site settings - Event::on(Sites::class, Sites::EVENT_AFTER_DELETE_SITE, function(DeleteSiteEvent $event) { - if (!app(ProjectConfig::class)->isApplyingExternalChanges) { - $this->getCategories()->pruneDeletedSite($event); - } - }); - } } diff --git a/yii2-adapter/legacy/config/app.php b/yii2-adapter/legacy/config/app.php index 2819634e42d..ad39ebc77a6 100644 --- a/yii2-adapter/legacy/config/app.php +++ b/yii2-adapter/legacy/config/app.php @@ -10,7 +10,6 @@ use craft\services\AssetIndexer; use craft\services\Assets; use craft\services\Auth; -use craft\services\Categories; use craft\services\Conditions; use craft\services\Dashboard; use craft\services\Deprecator; @@ -21,7 +20,6 @@ use craft\services\Fields; use craft\services\Fs; use craft\services\Gc; -use craft\services\Globals; use craft\services\Gql; use craft\services\Images; use craft\services\ImageTransforms; @@ -36,7 +34,6 @@ use craft\services\Sso; use craft\services\Structures; use craft\services\SystemMessages; -use craft\services\Tags; use craft\services\TemplateCaches; use craft\services\Tokens; use craft\services\UserGroups; @@ -76,9 +73,6 @@ 'auth' => [ 'class' => Auth::class, ], - 'categories' => [ - 'class' => Categories::class, - ], 'conditions' => [ 'class' => Conditions::class, ], @@ -109,9 +103,6 @@ 'gc' => [ 'class' => Gc::class, ], - 'globals' => [ - 'class' => Globals::class, - ], 'gql' => [ 'class' => Gql::class, ], @@ -172,9 +163,6 @@ 'systemMessages' => [ 'class' => SystemMessages::class, ], - 'tags' => [ - 'class' => Tags::class, - ], 'templateCaches' => [ 'class' => TemplateCaches::class, ], diff --git a/yii2-adapter/legacy/config/cproutes/common.php b/yii2-adapter/legacy/config/cproutes/common.php index 2959f39eaf4..28e7b2639b2 100644 --- a/yii2-adapter/legacy/config/cproutes/common.php +++ b/yii2-adapter/legacy/config/cproutes/common.php @@ -6,10 +6,6 @@ 'assets/edit/