Lorem Ipsum dolor sit amet
', 'blocks' => [ [ - 'type' => 'heading', - 'heading' => 'heading-1', + 'type' => 'editor', + 'text_editor' => 'Block Level 0: Lorem Ipsum dolor sit amet
', ], [ - 'type' => 'text', - 'text' => 'text-1', + 'type' => 'media', + 'media_selection' => [ + 'ids' => [$media1->getId()], + ], ], + [ + 'type' => 'block', + 'blocks' => [ + [ + 'type' => 'editor', + 'text_editor' => 'Block Level 1: Lorem Ipsum dolor sit amet
', + ], + [ + 'type' => 'media', + 'media_selection' => [ + 'ids' => [$media2->getId()], + ], + ], + ] + ] + ], + 'text_line' => 'Lorem Ipsum dolor sit amet', + 'number' => 1337, + 'phone' => '+49 123 456 789', +// 'tag_selection' => [$tag1->getName()], + 'single_select' => 'value-2', + 'select' => [ + 'value-2', + 'value-3', + ], + 'checkbox' => true, + 'color' => '#ff0000', + 'time' => '13:37', + 'date' => '2020-01-01', + 'datetime' => '2020-01-01 13:37:00', + 'email' => 'example@sulu.io', + 'external_url' => 'https://sulu.io', + 'category_selection' => [$category1->getId(), $category2->getId()], + 'single_category_selection' => $category1->getId(), + 'collection_selection' => [$collection1->getId()], + 'single_collection_selection' => $collection1->getId(), + 'media_selection' => [ + 'ids' => [$media1->getId(), $media2->getId()], + 'displayOption' => 'left', + ], + 'single_media_selection' => [ + 'id' => $media1->getId(), + 'displayOption' => 'left', + ], +// 'account_selection' => [ +// $account1->getId(), +// $account2->getId(), +// ], +// 'single_account_selection' => $account1->getId(), +// 'contact_selection' => [ +// $contact1->getId(), +// $contact2->getId(), +// ], +// 'single_contact_selection' => $contact1->getId(), +// 'contact_account_selection' => [ +// 'c'.$contact1->getId(), +// 'a'.$account1->getId(), +// ], + 'text_area' => 'Lorem Ipsum dolor sit amet', +// 'image_map' => //TODO + 'blocks2' => [ + [ + 'type' => 'editor', + 'text_editor' => 'Block2 Level 0: Lorem Ipsum dolor sit amet
', + ], + [ + 'type' => 'media', + 'media_selection' => [ + 'ids' => [$media1->getId()], + ], + ], + [ + 'type' => 'block', + 'blocks' => [ + [ + 'type' => 'editor', + 'text_editor' => 'Block2 Level 1: Lorem Ipsum dolor sit amet
', + ], + [ + 'type' => 'media', + 'media_selection' => [ + 'ids' => [$media2->getId()], + ], + ], + ] + ] ], 'excerptTitle' => 'excerpt-title-1', + 'excerptMore' => 'excerpt-more-1', 'excerptDescription' => 'excerpt-description-1', - 'excerptCategories' => [$category->getId()], + 'excerptCategories' => [$category1->getId()], +// 'excerptTags' => [$tag1->getName()], + 'excerptIcon' => [ + 'id' => $media1->getId(), + ], + 'excerptImage' => [ + 'id' => $media2->getId(), + ], + 'seoTitle' => 'seo-title-1', + 'seoDescription' => 'seo-description-1', + 'seoKeywords' => 'seo-keywords-1', + 'seoCanonicalUrl' => 'https://sulu.io', + 'seoNoIndex' => true, + 'seoNoFollow' => true, + 'seoHideInSitemap' => true, ], ], ], @@ -78,18 +194,72 @@ public function testResolveContent(): void /** @var mixed[] $content */ $content = $result['content']; - self::assertSame('example-1', $content['title']); - self::assertSame('text-area-1', $content['description']); - self::assertSame('editor-1', $content['article']); - self::assertCount(2, $content['blocks']); - self::assertSame('heading-1', $content['blocks'][0]['heading']); - self::assertSame('heading', $content['blocks'][0]['type']); - self::assertSame('text-1', $content['blocks'][1]['text']); - self::assertSame('text', $content['blocks'][1]['type']); + self::assertSame('Lorem Ipsum', $content['title']); + self::assertSame('/lorem-ipsum', $content['url']); + self::assertSame('Lorem Ipsum dolor sit amet
', $content['text_editor']); + + // block 0 + self::assertSame('editor', $content['blocks'][0]['type']); + self::assertSame('Block Level 0: Lorem Ipsum dolor sit amet
', $content['blocks'][0]['text_editor']); + + // block 1 + self::assertSame('media', $content['blocks'][1]['type']); + $mediaApi1 = $content['blocks'][1]['media_selection'][0]; + self::assertInstanceOf(Media::class, $mediaApi1); + self::assertSame($media1->getId(), $mediaApi1->getId()); + $mediaApi2 = $content['blocks'][1]['media_selection'][1]; + self::assertInstanceOf(Media::class, $mediaApi2); + self::assertSame($media2->getId(), $mediaApi2->getId()); + + // block 2 + self::assertSame('block', $content['blocks'][2]['type']); + self::assertSame('Block Level 1: Lorem Ipsum dolor sit amet
', $content['blocks'][2]['blocks'][0]['text_editor']); + self::assertSame('editor', $content['blocks'][2]['blocks'][0]['type']); + + self::assertSame('media', $content['blocks'][2]['blocks'][1]['type']); + $mediaApi1 = $content['blocks'][2]['blocks'][1]['media_selection'][0]; + self::assertInstanceOf(Media::class, $mediaApi1); + self::assertSame($media1->getId(), $mediaApi1->getId()); + $mediaApi2 = $content['blocks'][2]['blocks'][1]['media_selection'][1]; + self::assertInstanceOf(Media::class, $mediaApi2); + self::assertSame($media2->getId(), $mediaApi2->getId()); + + self::assertSame('Lorem Ipsum dolor sit amet', $content['text_line']); + self::assertSame(1337, $content['number']); + self::assertSame('+49 123 456 789', $content['phone']); + self::assertSame('value-2', $content['single_select']); + self::assertSame(['value-2', 'value-3'], $content['select']); + self::assertTrue($content['checkbox']); + self::assertSame('#ff0000', $content['color']); + self::assertSame('13:37', $content['time']); + self::assertSame('2020-01-01', $content['date']); + self::assertSame('2020-01-01 13:37:00', $content['datetime']); + self::assertSame('example@sulu.io', $content['email']); + self::assertSame('https://sulu.io', $content['external_url']); + + self::assertCount(2, $content['category_selection']); + $contentCategory1 = $content['category_selection'][0]; + self::assertSame($category1->getId(), $contentCategory1->getId()); + $contentCategory2 = $content['category_selection'][1]; + self::assertSame($category2->getId(), $contentCategory2->getId()); + + self::assertSame($category1->getId(), $content['single_category_selection']->getId()); + self::assertCount(1, $content['collection_selection']); + $contentCollection1 = $content['collection_selection'][0]; + self::assertSame($collection1->getId(), $contentCollection1->getId()); + + self::assertSame($collection1->getId(), $content['single_collection_selection']->getId()); + + self::assertCount(2, $content['media_selection']); + $contentMedia1 = $content['media_selection'][0]; + self::assertInstanceOf(Media::class, $contentMedia1); + self::assertSame($media1->getId(), $contentMedia1->getId()); - // TODO add tests for categories / tags / images / ... - self::assertNull($content['image']); + $contentMedia2 = $content['media_selection'][1]; + self::assertInstanceOf(Media::class, $contentMedia2); + self::assertSame($media2->getId(), $contentMedia2->getId()); - // TODO add excerpt / seo test + //TODO + //account selection / contact selection / image map / blocks 2 / excerpt / seo } } diff --git a/Tests/Functional/Traits/CreateMediaTrait.php b/Tests/Functional/Traits/CreateMediaTrait.php new file mode 100644 index 00000000..fb12f785 --- /dev/null +++ b/Tests/Functional/Traits/CreateMediaTrait.php @@ -0,0 +1,138 @@ +get('doctrine.orm.entity_manager'); + + $collection = new Collection(); + + /** @var CollectionType|null $collectionType */ + $collectionType = $manager->getRepository(CollectionType::class)->find(1); + if (!$collectionType) { + $collectionType = new CollectionType(); + $collectionType->setId(1); + $collectionType->setName('Default'); + $collectionType->setKey('default'); + $manager->persist($collectionType); + } + + $collection->setType($collectionType); + $meta = new CollectionMeta(); + $meta->setLocale($data['locale'] ?? 'en'); + $meta->setTitle($data['title'] ?? 'Example Collection'); + $meta->setCollection($collection); + + $collection->addMeta($meta); + $collection->setDefaultMeta($meta); + + $manager->persist($collection); + $manager->persist($meta); + + return $collection; + } + + /** + * @param array{ + * name?: string, + * description?: string, + * } $data + */ + private function createMediaType(array $data): MediaType + { + $manager = self::getContainer()->get('doctrine.orm.entity_manager'); + + $mediaType = new MediaType(); + $mediaType->setName($data['name'] ?? 'example'); + $mediaType->setDescription($data['description'] ?? 'Example Media Type'); + + $manager->persist($mediaType); + + return $mediaType; + } + + /** + * @param array{ + * title?: string, + * description?: string, + * locale?: string, + * } $data + */ + private function createMedia( + CollectionInterface $collection, + MediaType $mediaType, + array $data = [], + ): MediaInterface + { + $manager = self::getContainer()->get('doctrine.orm.entity_manager'); + + $file = new \SplFileInfo( + __DIR__ . \DIRECTORY_SEPARATOR . '..' . \DIRECTORY_SEPARATOR . 'assets' . \DIRECTORY_SEPARATOR . 'test-image.svg'); + $fileName = $file->getFilename(); + $uploadedFile = new UploadedFile($file->getPathname(), $fileName); + + $storageOptions = self::getContainer()->get('sulu_media.storage')->save( + $uploadedFile->getPathname(), + $fileName + ); + + $media = new Media(); + + $file = new File(); + $file->setVersion(1) + ->setMedia($media); + + $media->addFile($file) + ->setType($mediaType) + ->setCollection($collection); + + $fileVersion = new FileVersion(); + $fileVersion->setVersion($file->getVersion()) + ->setSize($uploadedFile->getSize()) + ->setName($fileName) + ->setStorageOptions($storageOptions) + ->setMimeType($uploadedFile->getMimeType() ?: 'image/jpeg') + ->setFile($file); + + $file->addFileVersion($fileVersion); + + $fileVersionMeta = new FileVersionMeta(); + $fileVersionMeta->setTitle($data['title'] ?? 'Example Media') + ->setDescription($data['description'] ?? 'Example Media description') + ->setLocale($data['locale'] ?? 'en') + ->setFileVersion($fileVersion); + + $fileVersion->addMeta($fileVersionMeta) + ->setDefaultMeta($fileVersionMeta); + + $manager->persist($fileVersionMeta); + $manager->persist($fileVersion); + $manager->persist($media); + + return $media; + } + + abstract protected static function getContainer(): ContainerInterface; +} diff --git a/Tests/Functional/assets/test-image.svg b/Tests/Functional/assets/test-image.svg new file mode 100644 index 00000000..bab96cf1 --- /dev/null +++ b/Tests/Functional/assets/test-image.svg @@ -0,0 +1,3 @@ + diff --git a/composer.json b/composer.json index 32480e88..e5a800c6 100644 --- a/composer.json +++ b/composer.json @@ -10,6 +10,12 @@ ], "homepage": "https://github.com/sulu/SuluContentBundle", "license": "MIT", + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/Prokyonn/sulu.git" + } + ], "require": { "php": "^8.0", "doctrine/inflector": "^1.4.1 || ^2.0.1", @@ -20,7 +26,7 @@ "friendsofsymfony/rest-bundle": "^2.6 || ^3.0", "massive/search-bundle": "^2.4", "ramsey/uuid": "^3.8 || ^4.0", - "sulu/sulu": "^2.5.6 || ^2.6@dev", + "sulu/sulu": "dev-feature/content-resolver as 2.6.12", "symfony/config": "^5.4 || ^6.0 || ^7.0", "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0", "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0",