Merge branch 'feature/sulu-update-change-link-block-type' into 'master'

Change single page selection to link content type See merge request webapps/sulu-demo!147
sulu · Mar 13, 2024 · e973abf · e973abf
2 parents 1b1fb3b + 4a7fd8d
commit e973abf
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 31 deletions.
diff --git a/config/packages/stof_doctrine_extensions.yaml b/config/packages/stof_doctrine_extensions.yaml
@@ -2,3 +2,11 @@
 # See the official DoctrineExtensions documentation for more details: https://github.com/doctrine-extensions/DoctrineExtensions/tree/main/doc
 stof_doctrine_extensions:
     default_locale: '%default_locale%'
+
+when@prod: &prod
+    stof_doctrine_extensions:
+        # fix issue with gedmo/extensions 1.8.0 and stof/doctrine-extensions-bundle: 3.12.0
+        # @see https://github.com/stof/StofDoctrineExtensionsBundle/issues/457
+        metadata_cache_pool: doctrine.system_cache_pool
+
+when@stage: *prod
diff --git a/config/templates/includes/blocks/link.xml b/config/templates/includes/blocks/link.xml
@@ -12,21 +12,16 @@
                 </meta>
 
                 <properties>
-                    <property name="page" type="single_page_selection" mandatory="true">
-                        <!-- @see https://docs.sulu.io/en/2.2/reference/content-types/single_page_selection.html -->
+                    <property name="link" type="link" mandatory="true">
                         <meta>
-                            <title lang="en">Page</title>
-                            <title lang="de">Seite</title>
+                            <title lang="en">Link</title>
+                            <title lang="de">Link</title>
                         </meta>
-                    </property>
 
-                    <property name="text" type="text_line">
-                        <meta>
-                            <title lang="en">Text</title>
-                            <title lang="de">Text</title>
-                            <info_text lang="en">Leave blank if the page title should be displayed.</info_text>
-                            <info_text lang="en">Leer lassen, wenn der Seiten-Titel angezeigt werden soll.</info_text>
-                        </meta>
+                        <params>
+                            <param name="enable_anchor" value="true"/>
+                            <param name="enable_attributes" value="true"/>
+                        </params>
                     </property>
                 </properties>
             </type>

diff --git a/rector.php b/rector.php
@@ -8,7 +8,6 @@
 use Rector\PHPUnit\Set\PHPUnitSetList;
 use Rector\Set\ValueObject\LevelSetList;
 use Rector\Set\ValueObject\SetList;
-use Rector\Symfony\CodeQuality\Rector\ClassMethod\ActionSuffixRemoverRector;
 use Rector\Symfony\Set\SymfonyLevelSetList;
 use Rector\Symfony\Set\SymfonySetList;
 use Sulu\Rector\Set\SuluLevelSetList;
@@ -35,8 +34,6 @@
     // symfony rules
     $rectorConfig->symfonyContainerPhp(__DIR__ . '/var/cache/website/dev/App_KernelDevDebugContainer.xml');
 
-    $rectorConfig->skip([ActionSuffixRemoverRector::class]);
-
     $rectorConfig->sets([
         SymfonySetList::SYMFONY_CODE_QUALITY,
         SymfonySetList::SYMFONY_CONSTRUCTOR_INJECTION,

diff --git a/src/Build/UserBuilder.php b/src/Build/UserBuilder.php
@@ -11,12 +11,14 @@
 use Sulu\Bundle\SecurityBundle\Entity\User;
 use Sulu\Bundle\SecurityBundle\Entity\UserSetting;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 class UserBuilder implements BuilderInterface, ContainerAwareInterface
 {
-    use ContainerAwareTrait;
+    /**
+     * @var ContainerInterface
+     */
+    protected $container;
 
     public function __construct(private readonly SuluUserBuilder $decoratedUserBuilder, ?ContainerInterface $container = null)
     {

diff --git a/src/Controller/Admin/AlbumController.php b/src/Controller/Admin/AlbumController.php
@@ -31,7 +31,7 @@ public function __construct(private readonly DoctrineListRepresentationFactory $
     }
 
     #[Route(path: '/admin/api/albums/{id}', methods: ['GET'], name: 'app.get_album')]
-    public function getAction(int $id): Response
+    public function get(int $id): Response
     {
         $album = $this->entityManager->getRepository(Album::class)->find($id);
         if (!$album instanceof Album) {
@@ -42,7 +42,7 @@ public function getAction(int $id): Response
     }
 
     #[Route(path: '/admin/api/albums/{id}', methods: ['PUT'], name: 'app.put_album')]
-    public function putAction(Request $request, int $id): Response
+    public function put(Request $request, int $id): Response
     {
         $album = $this->entityManager->getRepository(Album::class)->find($id);
         if (!$album instanceof Album) {
@@ -57,7 +57,7 @@ public function putAction(Request $request, int $id): Response
     }
 
     #[Route(path: '/admin/api/albums', methods: ['POST'], name: 'app.post_album')]
-    public function postAction(Request $request): Response
+    public function post(Request $request): Response
     {
         $album = new Album();
         /** @var AlbumData $data */
@@ -70,7 +70,7 @@ public function postAction(Request $request): Response
     }
 
     #[Route(path: '/admin/api/albums/{id}', methods: ['DELETE'], name: 'app.delete_album')]
-    public function deleteAction(int $id): Response
+    public function delete(int $id): Response
     {
         /** @var Album $album */
         $album = $this->entityManager->getReference(Album::class, $id);
@@ -81,7 +81,7 @@ public function deleteAction(int $id): Response
     }
 
     #[Route(path: '/admin/api/albums', methods: ['GET'], name: 'app.get_album_list')]
-    public function getListAction(): Response
+    public function getList(): Response
     {
         $listRepresentation = $this->doctrineListRepresentationFactory->createDoctrineListRepresentation(
             Album::RESOURCE_KEY,

diff --git a/src/DataFixtures/Document/DocumentFixture.php b/src/DataFixtures/Document/DocumentFixture.php
@@ -1087,8 +1087,13 @@ private function loadHomepageEnglish(DocumentManager $documentManager, array $pa
                     ],
                     [
                         'type' => 'link',
-                        'page' => $aboutPage->getUuid(),
-                        'text' => 'READ MORE',
+                        'link' => [
+                            'href' => $aboutPage->getUuid(),
+                            'provider' => 'page',
+                            'locale' => 'en',
+                            'target' => '_self',
+                            'title' => 'READ MORE',
+                        ],
                     ],
                     [
                         'type' => 'teasers',
@@ -1152,8 +1157,13 @@ private function loadHomepageGerman(DocumentManager $documentManager, array $pag
                     ],
                     [
                         'type' => 'link',
-                        'page' => $aboutPage->getUuid(),
-                        'text' => 'MEHR LESEN',
+                        'link' => [
+                            'href' => $aboutPage->getUuid(),
+                            'provider' => 'page',
+                            'locale' => 'en',
+                            'target' => '_self',
+                            'title' => 'MEHR LESEN',
+                        ],
                     ],
                     [
                         'type' => 'teasers',

diff --git a/templates/includes/blocks/link.html.twig b/templates/includes/blocks/link.html.twig
@@ -1,6 +1,4 @@
-{# @see https://docs.sulu.io/en/2.2/reference/twig-extensions/functions/sulu_content_load.html #}
-{% set page = sulu_content_load(content.page, ['title', 'url']) %}
-
-<a href="{{ sulu_content_path(page.content.url) }}" class="button block-link">
-    {{ text|default(page.content.title|default('read_more'|trans)) }}
+{# @see https://docs.sulu.io/en/2.5/reference/content-types/link.html #}
+<a href="{{ content.link }}" class="button block-link" target="{{ view.link.target }}">
+    {{ view.link.title|default('read_more'|trans) }}
 </a>