From c889057e0f14ad18ed0d9cc0fdcd14a6c372f7b3 Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Tue, 21 May 2024 16:44:55 +0200 Subject: [PATCH 1/2] Dropped class_alias BC layer from production code --- src/bundle/Command/MigrateLegacyMatrixCommand.php | 2 -- .../DependencyInjection/IbexaFieldTypeMatrixExtension.php | 2 -- src/bundle/IbexaFieldTypeMatrixBundle.php | 2 -- src/lib/FieldType/Converter/MatrixConverter.php | 2 -- src/lib/FieldType/Indexable.php | 2 -- src/lib/FieldType/Mapper/MatrixFormMapper.php | 2 -- src/lib/FieldType/Type.php | 2 -- src/lib/FieldType/Value.php | 2 -- src/lib/FieldType/Value/Row.php | 2 -- src/lib/FieldType/Value/RowsCollection.php | 2 -- src/lib/Form/Transformer/FieldTypeModelTransformer.php | 2 -- src/lib/Form/Type/ColumnType.php | 2 -- src/lib/Form/Type/FieldType/MatrixCollectionType.php | 2 -- src/lib/Form/Type/FieldType/MatrixEntryType.php | 2 -- src/lib/Form/Type/FieldType/MatrixFieldType.php | 2 -- src/lib/GraphQL/FieldValueResolver.php | 2 -- src/lib/GraphQL/InputHandler.php | 2 -- .../GraphQL/Schema/MatrixFieldDefinitionInputSchemaWorker.php | 2 -- src/lib/GraphQL/Schema/MatrixFieldDefinitionMapper.php | 2 -- src/lib/GraphQL/Schema/MatrixFieldDefinitionSchemaWorker.php | 2 -- src/lib/GraphQL/Schema/NameHelper.php | 2 -- src/lib/GraphQL/SilentRow.php | 2 -- 22 files changed, 44 deletions(-) diff --git a/src/bundle/Command/MigrateLegacyMatrixCommand.php b/src/bundle/Command/MigrateLegacyMatrixCommand.php index 377682b..7367d0c 100644 --- a/src/bundle/Command/MigrateLegacyMatrixCommand.php +++ b/src/bundle/Command/MigrateLegacyMatrixCommand.php @@ -355,5 +355,3 @@ public function getDeprecatedAliases(): array return ['ezplatform:migrate:legacy_matrix']; } } - -class_alias(MigrateLegacyMatrixCommand::class, 'EzSystems\EzPlatformMatrixFieldtypeBundle\Command\MigrateLegacyMatrixCommand'); diff --git a/src/bundle/DependencyInjection/IbexaFieldTypeMatrixExtension.php b/src/bundle/DependencyInjection/IbexaFieldTypeMatrixExtension.php index da681aa..e0ce70b 100644 --- a/src/bundle/DependencyInjection/IbexaFieldTypeMatrixExtension.php +++ b/src/bundle/DependencyInjection/IbexaFieldTypeMatrixExtension.php @@ -94,5 +94,3 @@ private function prependGraphQL(ContainerBuilder $container) ]); } } - -class_alias(IbexaFieldTypeMatrixExtension::class, 'EzSystems\EzPlatformMatrixFieldtypeBundle\DependencyInjection\EzPlatformMatrixFieldtypeExtension'); diff --git a/src/bundle/IbexaFieldTypeMatrixBundle.php b/src/bundle/IbexaFieldTypeMatrixBundle.php index e72611a..fc81c57 100644 --- a/src/bundle/IbexaFieldTypeMatrixBundle.php +++ b/src/bundle/IbexaFieldTypeMatrixBundle.php @@ -13,5 +13,3 @@ class IbexaFieldTypeMatrixBundle extends Bundle { } - -class_alias(IbexaFieldTypeMatrixBundle::class, 'EzSystems\EzPlatformMatrixFieldtypeBundle\EzPlatformMatrixFieldtypeBundle'); diff --git a/src/lib/FieldType/Converter/MatrixConverter.php b/src/lib/FieldType/Converter/MatrixConverter.php index 394380d..71dd5d7 100644 --- a/src/lib/FieldType/Converter/MatrixConverter.php +++ b/src/lib/FieldType/Converter/MatrixConverter.php @@ -102,5 +102,3 @@ public function getIndexColumn() return false; } } - -class_alias(MatrixConverter::class, 'EzSystems\EzPlatformMatrixFieldtype\FieldType\Converter\MatrixConverter'); diff --git a/src/lib/FieldType/Indexable.php b/src/lib/FieldType/Indexable.php index 44f0419..3a3d22b 100644 --- a/src/lib/FieldType/Indexable.php +++ b/src/lib/FieldType/Indexable.php @@ -50,5 +50,3 @@ public function getDefaultSortField(): ?string return null; } } - -class_alias(Indexable::class, 'EzSystems\EzPlatformMatrixFieldtype\FieldType\Indexable'); diff --git a/src/lib/FieldType/Mapper/MatrixFormMapper.php b/src/lib/FieldType/Mapper/MatrixFormMapper.php index f3335dd..5feafec 100644 --- a/src/lib/FieldType/Mapper/MatrixFormMapper.php +++ b/src/lib/FieldType/Mapper/MatrixFormMapper.php @@ -87,5 +87,3 @@ public function mapFieldValueForm(FormInterface $fieldForm, FieldData $data): vo ); } } - -class_alias(MatrixFormMapper::class, 'EzSystems\EzPlatformMatrixFieldtype\FieldType\Mapper\MatrixFormMapper'); diff --git a/src/lib/FieldType/Type.php b/src/lib/FieldType/Type.php index f6be935..60fb534 100644 --- a/src/lib/FieldType/Type.php +++ b/src/lib/FieldType/Type.php @@ -216,5 +216,3 @@ public function isSearchable(): bool return true; } } - -class_alias(Type::class, 'EzSystems\EzPlatformMatrixFieldtype\FieldType\Type'); diff --git a/src/lib/FieldType/Value.php b/src/lib/FieldType/Value.php index 02f0c3d..a166a29 100644 --- a/src/lib/FieldType/Value.php +++ b/src/lib/FieldType/Value.php @@ -50,5 +50,3 @@ public function __toString(): string return ''; } } - -class_alias(Value::class, 'EzSystems\EzPlatformMatrixFieldtype\FieldType\Value'); diff --git a/src/lib/FieldType/Value/Row.php b/src/lib/FieldType/Value/Row.php index f111563..0e39977 100644 --- a/src/lib/FieldType/Value/Row.php +++ b/src/lib/FieldType/Value/Row.php @@ -61,5 +61,3 @@ public function __isset($name): bool return isset($this->cells[$name]); } } - -class_alias(Row::class, 'EzSystems\EzPlatformMatrixFieldtype\FieldType\Value\Row'); diff --git a/src/lib/FieldType/Value/RowsCollection.php b/src/lib/FieldType/Value/RowsCollection.php index 0322560..97f4a0c 100644 --- a/src/lib/FieldType/Value/RowsCollection.php +++ b/src/lib/FieldType/Value/RowsCollection.php @@ -46,5 +46,3 @@ public function offsetSet($offset, $value): void parent::offsetSet($offset, $value); } } - -class_alias(RowsCollection::class, 'EzSystems\EzPlatformMatrixFieldtype\FieldType\Value\RowsCollection'); diff --git a/src/lib/Form/Transformer/FieldTypeModelTransformer.php b/src/lib/Form/Transformer/FieldTypeModelTransformer.php index aa94e65..61a97b2 100644 --- a/src/lib/Form/Transformer/FieldTypeModelTransformer.php +++ b/src/lib/Form/Transformer/FieldTypeModelTransformer.php @@ -59,5 +59,3 @@ public function reverseTransform($value) return new Value($rows ?? []); } } - -class_alias(FieldTypeModelTransformer::class, 'EzSystems\EzPlatformMatrixFieldtype\Form\Transformer\FieldTypeModelTransformer'); diff --git a/src/lib/Form/Type/ColumnType.php b/src/lib/Form/Type/ColumnType.php index 06118ae..6183f83 100644 --- a/src/lib/Form/Type/ColumnType.php +++ b/src/lib/Form/Type/ColumnType.php @@ -38,5 +38,3 @@ public function configureOptions(OptionsResolver $resolver): void $resolver->setDefault('translation_domain', 'ibexa_matrix_fieldtype'); } } - -class_alias(ColumnType::class, 'EzSystems\EzPlatformMatrixFieldtype\Form\Type\ColumnType'); diff --git a/src/lib/Form/Type/FieldType/MatrixCollectionType.php b/src/lib/Form/Type/FieldType/MatrixCollectionType.php index 78ee3ee..8eebe51 100644 --- a/src/lib/Form/Type/FieldType/MatrixCollectionType.php +++ b/src/lib/Form/Type/FieldType/MatrixCollectionType.php @@ -72,5 +72,3 @@ public function getParent(): string return CollectionType::class; } } - -class_alias(MatrixCollectionType::class, 'EzSystems\EzPlatformMatrixFieldtype\Form\Type\FieldType\MatrixCollectionType'); diff --git a/src/lib/Form/Type/FieldType/MatrixEntryType.php b/src/lib/Form/Type/FieldType/MatrixEntryType.php index f22f8d4..dda3dc5 100644 --- a/src/lib/Form/Type/FieldType/MatrixEntryType.php +++ b/src/lib/Form/Type/FieldType/MatrixEntryType.php @@ -74,5 +74,3 @@ public function buildForm(FormBuilderInterface $builder, array $options): void parent::buildForm($builder, $options); } } - -class_alias(MatrixEntryType::class, 'EzSystems\EzPlatformMatrixFieldtype\Form\Type\FieldType\MatrixEntryType'); diff --git a/src/lib/Form/Type/FieldType/MatrixFieldType.php b/src/lib/Form/Type/FieldType/MatrixFieldType.php index 7fb3558..2701d89 100644 --- a/src/lib/Form/Type/FieldType/MatrixFieldType.php +++ b/src/lib/Form/Type/FieldType/MatrixFieldType.php @@ -92,5 +92,3 @@ public function buildForm(FormBuilderInterface $builder, array $options): void $builder->addModelTransformer(new FieldTypeModelTransformer()); } } - -class_alias(MatrixFieldType::class, 'EzSystems\EzPlatformMatrixFieldtype\Form\Type\FieldType\MatrixFieldType'); diff --git a/src/lib/GraphQL/FieldValueResolver.php b/src/lib/GraphQL/FieldValueResolver.php index 1495515..aa83cb5 100644 --- a/src/lib/GraphQL/FieldValueResolver.php +++ b/src/lib/GraphQL/FieldValueResolver.php @@ -57,5 +57,3 @@ public function resolveMatrixFieldValue(object $item, string $fieldDefIdentifier return new RowsCollection($silentRows); } } - -class_alias(FieldValueResolver::class, 'EzSystems\EzPlatformMatrixFieldtype\GraphQL\FieldValueResolver'); diff --git a/src/lib/GraphQL/InputHandler.php b/src/lib/GraphQL/InputHandler.php index f37bcf4..793cb8c 100644 --- a/src/lib/GraphQL/InputHandler.php +++ b/src/lib/GraphQL/InputHandler.php @@ -26,5 +26,3 @@ static function (array $row) { ); } } - -class_alias(InputHandler::class, 'EzSystems\EzPlatformMatrixFieldtype\GraphQL\InputHandler'); diff --git a/src/lib/GraphQL/Schema/MatrixFieldDefinitionInputSchemaWorker.php b/src/lib/GraphQL/Schema/MatrixFieldDefinitionInputSchemaWorker.php index 1fcde5d..150468f 100644 --- a/src/lib/GraphQL/Schema/MatrixFieldDefinitionInputSchemaWorker.php +++ b/src/lib/GraphQL/Schema/MatrixFieldDefinitionInputSchemaWorker.php @@ -58,5 +58,3 @@ private function typeName(array $args) return $this->nameHelper->matrixFieldDefinitionInputType($args['ContentType'], $args['FieldDefinition']); } } - -class_alias(MatrixFieldDefinitionInputSchemaWorker::class, 'EzSystems\EzPlatformMatrixFieldtype\GraphQL\Schema\MatrixFieldDefinitionInputSchemaWorker'); diff --git a/src/lib/GraphQL/Schema/MatrixFieldDefinitionMapper.php b/src/lib/GraphQL/Schema/MatrixFieldDefinitionMapper.php index 034d94d..dfd5513 100644 --- a/src/lib/GraphQL/Schema/MatrixFieldDefinitionMapper.php +++ b/src/lib/GraphQL/Schema/MatrixFieldDefinitionMapper.php @@ -101,5 +101,3 @@ public function mapToFieldValueResolver(FieldDefinition $fieldDefinition): ?stri ); } } - -class_alias(MatrixFieldDefinitionMapper::class, 'EzSystems\EzPlatformMatrixFieldtype\GraphQL\Schema\MatrixFieldDefinitionMapper'); diff --git a/src/lib/GraphQL/Schema/MatrixFieldDefinitionSchemaWorker.php b/src/lib/GraphQL/Schema/MatrixFieldDefinitionSchemaWorker.php index 99c491b..812c03e 100644 --- a/src/lib/GraphQL/Schema/MatrixFieldDefinitionSchemaWorker.php +++ b/src/lib/GraphQL/Schema/MatrixFieldDefinitionSchemaWorker.php @@ -58,5 +58,3 @@ private function typeName(array $args) return $this->nameHelper->matrixFieldDefinitionType($args['ContentType'], $args['FieldDefinition']); } } - -class_alias(MatrixFieldDefinitionSchemaWorker::class, 'EzSystems\EzPlatformMatrixFieldtype\GraphQL\Schema\MatrixFieldDefinitionSchemaWorker'); diff --git a/src/lib/GraphQL/Schema/NameHelper.php b/src/lib/GraphQL/Schema/NameHelper.php index 226b782..126461d 100644 --- a/src/lib/GraphQL/Schema/NameHelper.php +++ b/src/lib/GraphQL/Schema/NameHelper.php @@ -36,5 +36,3 @@ public function matrixFieldDefinitionInputType(ContentType $contentType, FieldDe ); } } - -class_alias(NameHelper::class, 'EzSystems\EzPlatformMatrixFieldtype\GraphQL\Schema\NameHelper'); diff --git a/src/lib/GraphQL/SilentRow.php b/src/lib/GraphQL/SilentRow.php index 3d9061c..d169474 100644 --- a/src/lib/GraphQL/SilentRow.php +++ b/src/lib/GraphQL/SilentRow.php @@ -17,5 +17,3 @@ public function __get($name) return $this->cells[$name] ?? ''; } } - -class_alias(SilentRow::class, 'EzSystems\EzPlatformMatrixFieldtype\GraphQL\SilentRow'); From 3f0951386ad4fad9748561c5c09be565ce1fa7e1 Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Wed, 22 May 2024 01:22:41 +0200 Subject: [PATCH 2/2] [Composer] Dropped legacy namespaces from autoload section --- composer.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 714cbc8..7ea92d9 100644 --- a/composer.json +++ b/composer.json @@ -9,9 +9,7 @@ "autoload": { "psr-4": { "Ibexa\\FieldTypeMatrix\\": "src/lib/", - "Ibexa\\Bundle\\FieldTypeMatrix\\": "src/bundle/", - "EzSystems\\EzPlatformMatrixFieldtypeBundle\\": "src/bundle/", - "EzSystems\\EzPlatformMatrixFieldtype\\": "src/lib/" + "Ibexa\\Bundle\\FieldTypeMatrix\\": "src/bundle/" } }, "autoload-dev": {