Draft: Add development branch with the new PageBundle, ArticleBundle, SnippetBundle

.php-version

@@ -0,0 +1 @@
+8.3

composer.json

@@ -26,6 +26,12 @@
         "docs": "https://docs.sulu.io/",
         "chat": "https://sulu.io/services-and-support#chat"
     },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/Prokyonn/sulu.git"
+        }
+    ],
     "require": {
         "php": "^8.2",
         "ext-ctype": "*",
@@ -41,7 +47,7 @@
         "scheb/2fa-email": "^7.2",
         "scheb/2fa-trusted-device": "^7.2",
         "stof/doctrine-extensions-bundle": "^1.11",
-        "sulu/sulu": "^3.0.x-dev",
+        "sulu/sulu": "dev-feature/page-bundle as 3.0",
         "symfony/config": "^7.2",
         "symfony/dotenv": "^7.2",
         "symfony/flex": "^1.17 || ^2.0",

config/bundles.php

@@ -20,7 +20,6 @@
     Sulu\Bundle\MediaBundle\SuluMediaBundle::class => ['all' => true],
     Sulu\Bundle\SecurityBundle\SuluSecurityBundle::class => ['all' => true],
     Sulu\Bundle\CategoryBundle\SuluCategoryBundle::class => ['all' => true],
-    Sulu\Bundle\SnippetBundle\SuluSnippetBundle::class => ['all' => true],
     Sulu\Bundle\PageBundle\SuluPageBundle::class => ['all' => true],
     Sulu\Bundle\TagBundle\SuluTagBundle::class => ['all' => true],
     Sulu\Bundle\WebsiteBundle\SuluWebsiteBundle::class => ['all' => true],
@@ -46,4 +45,9 @@
     Sulu\Bundle\ReferenceBundle\SuluReferenceBundle::class => ['all' => true],
     Scheb\TwoFactorBundle\SchebTwoFactorBundle::class => ['all' => true],
     League\FlysystemBundle\FlysystemBundle::class => ['all' => true],
+    Sulu\Content\Infrastructure\Symfony\HttpKernel\SuluContentBundle::class => ['all' => true],
+    Sulu\Messenger\Infrastructure\Symfony\HttpKernel\SuluMessengerBundle::class => ['all' => true],
+    Sulu\Article\Infrastructure\Symfony\HttpKernel\SuluArticleBundle::class => ['all' => true],
+    Sulu\Snippet\Infrastructure\Symfony\HttpKernel\SuluSnippetBundle::class => ['all' => true],
+    Sulu\Page\Infrastructure\Symfony\HttpKernel\SuluPageBundle::class => ['all' => true],
 ];

config/packages/sulu_article.yaml

@@ -0,0 +1,7 @@
+sulu_article: {}
+
+sulu_core:
+    content:
+        structure:
+            default_type:
+                article: 'article'

config/routes/sulu_admin.yaml

@@ -48,10 +48,10 @@ sulu_category_api:
     resource: "@SuluCategoryBundle/Resources/config/routing_api.yml"
     prefix: /admin/api
 
-sulu_snippet_api:
-    resource: "@SuluSnippetBundle/Resources/config/routing_api.yml"
-    type: rest
-    prefix: /admin/api
+#sulu_snippet_api:
+#    resource: "@SuluSnippetBundle/Resources/config/routing_api.yml"
+#    type: rest
+#    prefix: /admin/api
 
 sulu_location:
     resource: "@SuluLocationBundle/Resources/config/routing.yml"
@@ -112,3 +112,15 @@ sulu_reference_api:
     resource: "@SuluReferenceBundle/Resources/config/routing_api.yml"
     type: rest
     prefix: /admin/api
+
+sulu_article_api:
+    resource: "@SuluArticleBundle/config/routing_admin_api.yaml"
+    prefix: /admin/api
+
+sulu_snippet_api:
+    resource: "@SuluSnippetBundle/config/routing_admin_api.yaml"
+    prefix: /admin/api
+
+sulu_next_page_api:
+    resource: "@SuluNextPageBundle/config/routing_admin_api.yaml"
+    prefix: /admin/api

config/templates/articles/article.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" ?>
+<template xmlns="http://schemas.sulu.io/template/template"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://schemas.sulu.io/template/template http://schemas.sulu.io/template/template-1.0.xsd">
+
+    <key>article</key>
+
+    <view>articles/article</view>
+    <controller>Sulu\Content\UserInterface\Controller\Website\ContentController::indexAction</controller>
+    <cacheLifetime>604800</cacheLifetime>
+
+    <meta>
+        <title lang="en">Article</title>
+        <title lang="de">Artikel</title>
+    </meta>
+
+    <properties>
+        <property name="title" type="text_line" mandatory="true">
+            <meta>
+                <title lang="en">Title</title>
+                <title lang="de">Titel</title>
+            </meta>
+            <params>
+                <param name="headline" value="true"/>
+            </params>
+
+            <tag name="sulu.rlp.part"/>
+        </property>
+
+        <property name="url" type="route">
+            <meta>
+                <title lang="en">Resourcelocator</title>
+                <title lang="de">Adresse</title>
+            </meta>
+
+            <tag name="sulu.rlp"/>
+        </property>
+
+        <property name="article" type="text_editor">
+            <meta>
+                <title lang="en">Article</title>
+                <title lang="de">Artikel</title>
+            </meta>
+        </property>
+    </properties>
+</template>

config/templates/pages/default.xml

@@ -6,7 +6,7 @@
     <key>default</key>
 
     <view>pages/default</view>
-    <controller>Sulu\Bundle\WebsiteBundle\Controller\DefaultController::indexAction</controller>
+    <controller>Sulu\Content\UserInterface\Controller\Website\ContentController::indexAction</controller>
     <cacheLifetime>604800</cacheLifetime>
 
     <meta>
@@ -27,7 +27,7 @@
             <tag name="sulu.rlp.part"/>
         </property>
 
-        <property name="url" type="resource_locator" mandatory="true">
+        <property name="url" type="route">
             <meta>
                 <title lang="en">Resourcelocator</title>
                 <title lang="de">Adresse</title>
@@ -36,11 +36,107 @@
             <tag name="sulu.rlp"/>
         </property>
 
-        <property name="article" type="text_editor">
+        <property name="editor" type="text_editor">
             <meta>
                 <title lang="en">Article</title>
                 <title lang="de">Artikel</title>
             </meta>
         </property>
+
+        <property name="date" type="date">
+            <meta>
+                <title lang="en">Date</title>
+                <title lang="de">Datum</title>
+            </meta>
+        </property>
+
+        <property name="datetime" type="datetime">
+            <meta>
+                <title lang="en">Datetime</title>
+                <title lang="de">Datum und Uhrzeit</title>
+            </meta>
+        </property>
+
+        <property name="snippet" type="single_snippet_selection">
+            <meta>
+                <title lang="en">Snippet</title>
+                <title lang="de">Schnipsel</title>
+            </meta>
+        </property>
+
+        <property name="snippets" type="snippet_selection">
+            <meta>
+                <title lang="en">Snippets</title>
+                <title lang="de">Schnipsel</title>
+            </meta>
+        </property>
+
+        <property name="page" type="single_page_selection">
+            <meta>
+                <title lang="en">Page</title>
+                <title lang="de">Seite</title>
+            </meta>
+        </property>
+
+        <property name="pages" type="page_selection">
+            <meta>
+                <title lang="en">Page</title>
+                <title lang="de">Seite</title>
+            </meta>
+        </property>
+
+        <property name="location" type="location">
+            <meta>
+                <title lang="en">Location</title>
+                <title lang="de">Ort</title>
+            </meta>
+        </property>
+
+        <block name="blocks" default-type="editor" minOccurs="1" maxOccurs="1">
+            <meta>
+                <title lang="en">Content</title>
+                <title lang="de">Inhalte</title>
+            </meta>
+
+            <types>
+                <type name="editor">
+                    <meta>
+                        <title lang="en">Editor</title>
+                        <title lang="de">Editor</title>
+                    </meta>
+                    <properties>
+                        <property name="text_editor" type="text_editor">
+                            <meta>
+                                <title lang="en">Text Editor</title>
+                                <title lang="de">Texteditor</title>
+                            </meta>
+                        </property>
+                    </properties>
+                </type>
+                <type name="media">
+                    <meta>
+                        <title lang="de">Media</title>
+                        <title lang="en">Media</title>
+                    </meta>
+                    <properties>
+                        <property name="media_selection" type="media_selection">
+                            <meta>
+                                <title lang="en">Media Selection</title>
+                                <title lang="de">Medienauswahl</title>
+                            </meta>
+                            <params>
+                                <param name="types" value="image,video"/>
+                                <param name="displayOptions" type="collection">
+                                    <param name="leftTop" value="true"/>
+                                    <param name="top" value="true"/>
+                                </param>
+
+                                <param name="defaultDisplayOption" value="left"/>
+                            </params>
+                        </property>
+                    </properties>
+                </type>
+            </types>
+        </block>
     </properties>
 </template>

config/templates/pages/homepage.xml

@@ -6,7 +6,7 @@
     <key>homepage</key>
 
     <view>pages/homepage</view>
-    <controller>Sulu\Bundle\WebsiteBundle\Controller\DefaultController::indexAction</controller>
+    <controller>Sulu\Content\UserInterface\Controller\Website\ContentController::indexAction</controller>
     <cacheLifetime>86400</cacheLifetime>
 
     <meta>

public/build/admin/manifest.json

@@ -1,6 +1,6 @@
 {
-  "main.css": "/build/admin/main.6ac266f08e2c460021aa.css",
-  "main.js": "/build/admin/main.6ac266f08e2c460021aa.js",
+  "main.css": "/build/admin/main.83040a089a74dff3169f.css",
+  "main.js": "/build/admin/main.83040a089a74dff3169f.js",
   "fa-solid-900.svg": "/build/admin/fa-solid-900.7a8b4f130182d19a2d7c.svg",
   "fa-brands-400.svg": "/build/admin/fa-brands-400.2f517e09eb2ca6650ff5.svg",
   "fa-solid-900.eot": "/build/admin/fa-solid-900.9bbb245e67a133f6e486.eot",
@@ -77,6 +77,6 @@
   "images/layers.png": "/build/admin/images/layers.416d91365b44e4b4f477.png",
   "images/marker-shadow.png": "/build/admin/images/marker-shadow.a0c6cc1401c107b501ef.png",
   "images/checkerBackground.gif": "/build/admin/images/checkerBackground.9883f9a87851b3f982e6.gif",
-  "main.css.map": "/build/admin/main.6ac266f08e2c460021aa.css.map",
-  "main.js.map": "/build/admin/main.6ac266f08e2c460021aa.js.map"
+  "main.css.map": "/build/admin/main.83040a089a74dff3169f.css.map",
+  "main.js.map": "/build/admin/main.83040a089a74dff3169f.js.map"
 }

templates/articles/article.html.twig

@@ -0,0 +1,9 @@
+{% extends "base.html.twig" %}
+
+{% block content %}
+    <h1>{{ content.title }}</h1>
+
+    {{ content.article|raw }}
+
+    {{ dump() }}
+{% endblock %}

templates/pages/default.html.twig

@@ -3,5 +3,5 @@
 {% block content %}
     <h1>{{ content.title }}</h1>
 
-    {{ content.article|raw }}
+    {{ dump() }}
 {% endblock %}