Add Article Bundle to monorepository #7653

alexander-schranz · 2024-11-14T12:47:21Z

Q	A
Bug fix?	no
New feature?	yes
BC breaks?	no
Deprecations?	no
Fixed tickets	fixes #
Related issues/PRs	#
License	MIT
Documentation PR	sulu/sulu-docs#

What's in this PR?

Add Article Bundle to monorepository. This will merge article bundle into sulu/sulu current 3.0 branch (beeb087 (commit hash documented for later ignore article bundle commits in changelog)).

If you have to look at the core changes look in the src directory changes and ignore the packages/article which just contains all files form the article bundle.

Why?

This should make the maintainance of bundles easier.

…#506)

Co-authored-by: Alexander Schoonderwaldt <alexander@weprovide.com>

…#509)

Conflicts: phpstan.neon

…u#515)

Conflicts: composer.json

Conflicts: Resources/config/services.xml Tests/Functional/Controller/ArticleControllerTest.php

* Remove default type fallback in compilerpass * Update sulu/sulu requirement version Co-authored-by: Niklas Natter <niklas@sulu.io>

…#511) * Add SegmentViewObject to ExcerptViewObject when indexing article * Filter articles for current segment key in ArticleDataProvider * Add segments as a twig variable to the output * Try fixing tests * Fix segments for Jackrabbit * Adjust build for prefer-lowest Co-authored-by: Daniel Rotter <daniel.rotter@gmail.com>

…lu#518)

…uage (sulu#522)

* Pass localizations array to twig template * Use absolute url in localizations array

)

alexander-schranz

added a few comments for things which are changed in sulu core for supporting the article bundle inside it, this should make it us better unstandable what was change in Sulu inside this merge request as it contains all article bundle files.

alexander-schranz · 2024-11-14T15:30:51Z

bin/runtests

    if ($target) {
-        $finder->in(__DIR__ . '/../src/Sulu/Bundle/' . $target);
+        $finder->in([__DIR__ . '/../src/Sulu/Bundle/' . $target]);
    } else {
-        $finder->in(__DIR__ . '/../src/Sulu/Bundle/*');
+        $finder->in([__DIR__ . '/../packages/*', __DIR__ . '/../src/Sulu/Bundle/*']);


Make sure it runs also the packages/... tests

alexander-schranz · 2024-11-14T15:31:19Z

bin/runtests

@@ -191,7 +191,7 @@ function get_bundles($target = null)

 function get_test_console_path()
 {
-    $consolePath = __DIR__ . '/../src/Sulu/Bundle/TestBundle/Resources/app/console';
+    $consolePath = __DIR__ . '/../packages/article/Tests/Application/bin/adminconsole'; // to init the database with complete schema was using currently article bundle


this may should be changed in future init the database correctly per bundle instead only once but currently go with this solution

alexander-schranz · 2024-11-14T15:31:57Z

src/Sulu/Bundle/TestBundle/Kernel/SuluTestKernel.php

@@ -51,6 +51,7 @@ public function registerBundles(): iterable
            new \Massive\Bundle\SearchBundle\MassiveSearchBundle(),

            // Sulu
+            new \Sulu\Messenger\Infrastructure\Symfony\HttpKernel\SuluMessengerBundle(),


this also add sulu messenger as a requirement to sulu core

alexander-schranz · 2024-11-14T15:32:33Z

src/Sulu/Bundle/TestBundle/Resources/app/config/sulu.yml

@@ -6,6 +6,7 @@ framework:
        enabled: false
    mailer:
        dsn: 'null://null'
+        message_bus: false # else messenger component duplicates the message: https://github.com/symfony/symfony/issues/48004#issuecomment-2476617713


this seems to be a bug on symfony side which maybe fixed in the future at current state its easy to disable messenger integration in mailer for tests

alexander-schranz

COMPOSER_ROOT_VERSION hack need to be removed when sulu/SuluContentBundle#271 is merged or content bundle is sulu/sulu

alexander-schranz · 2024-11-14T16:23:16Z

.github/workflows/test-application.yaml

@@ -129,6 +129,7 @@ jobs:
            SULU_ADMIN_EMAIL:
            PHPCR_TRANSPORT: ${{ matrix.phpcr-transport }}
            COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            COMPOSER_ROOT_VERSION: dev-feature/content-resolver # todo remove when content bundle is merged into sulu/sulu


this should be reverted when sulu/SuluContentBundle#271 merged or content bundle is sulu/sulu

alexander-schranz · 2024-11-14T16:23:27Z

.github/workflows/test-application.yaml

@@ -263,6 +264,7 @@ jobs:
            MAILER_URL: null://localhost
            SULU_ADMIN_EMAIL:
            COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            COMPOSER_ROOT_VERSION: dev-feature/content-resolver # todo remove when content bundle is merged into sulu/sulu


this should be reverted when sulu/SuluContentBundle#271 merged or content bundle is sulu/sulu

alexander-schranz · 2024-11-14T18:19:59Z

src/Sulu/Bundle/WebsiteBundle/Tests/Functional/CachingTest.php

@@ -27,6 +27,7 @@ public static function getSuluContext(): string
    public function testFirstRequestIsACacheMiss()
    {
        $this->purgeDatabase();
+        $this->initPhpcr();


messenger makes this test fails. interesting this does fix it but not sure why it works before

alexander-schranz · 2024-11-14T18:20:58Z

highest test requires a fix on coduo repository side: coduo/php-matcher#496

lowest test requires us to upgrade to Min Symfony 6.1 (so 6.4) /cc @chirimoya @wachterjohannes @Prokyonn

alexander-schranz · 2024-11-15T10:14:58Z

There a few changes I need todo to make the CI green. It would be a little bit to hidden to make that changes inside this big merge of article bundle into the Sulu core So I would merge this part and move forward with smaller pull request to fix the CI. /cc @Prokyonn

niklasnatter and others added 30 commits July 23, 2020 11:48

Remove unused sulu_article.article_title from article templates (sulu…

a3ea944

…#506)

Changed translation domain from backend to admin (sulu#507)

3e1ad0f

Co-authored-by: Alexander Schoonderwaldt <alexander@weprovide.com>

Change translation domain of article type from backend to admin (sulu…

b4fc767

…#509)

Merge branch '2.0' of github.com:sulu/SuluArticleBundle into 2.1

4975f1c

Conflicts: phpstan.neon

Merge branch '2.1' of github.com:sulu/SuluArticleBundle

f50f4b7

Fix typo in UPGRADE.md (sulu#512)

6b3d4d7

Merge branch '2.1' of github.com:sulu/SuluArticleBundle

92472f4

Fix backview for excerpt and settings (sulu#516)

8864bb8

Add xliff export for articles (sulu#508)

1ea2680

Add xliff import for articles (sulu#510)

537f81c

Added fixes to the Documentation. (sulu#470)

6168fca

Add annotation reader to dynamically add the document annotation (sul…

57916c9

…u#515)

Merge branch '1.2' of github.com:sulu/suluarticlebundle into 2.0

2fdda87

Conflicts: composer.json

Merge branch '2.0' of github.com:sulu/suluarticlebundle into 2.1

8db3708

Merge branch '2.1' of github.com:sulu/suluarticlebundle

13b292b

Conflicts: Resources/config/services.xml Tests/Functional/Controller/ArticleControllerTest.php

Remove default type fallback in compilerpass (sulu#513)

e258004

* Remove default type fallback in compilerpass * Update sulu/sulu requirement version Co-authored-by: Niklas Natter <niklas@sulu.io>

Add elasticsearch/elasticsearch package installation to README.md (su…

bb31689

…lu#518)

Merge branch '2.0' of https://github.com/sulu/SuluArticleBundle into 2.1

691ebe2

Merge branch '2.1' of https://github.com/sulu/SuluArticleBundle

3fdd294

Adjust copy-locale action of ArticleController to return correct lang…

1b95a5f

…uage (sulu#522)

Merge branch '2.1' of https://github.com/sulu/SuluArticleBundle

3a8db1f

UPGRADE for 2.2

ec56e11

Fix when additional webspaces are set but empty (sulu#524)

7dc0298

Merge branch '1.0' of https://github.com/sulu/SuluArticleBundle into 1.1

fa35394

Merge branch '1.1' of https://github.com/sulu/SuluArticleBundle into 1.2

28459ba

Merge branch '1.2' of https://github.com/sulu/SuluArticleBundle into 2.0

dd16f35

Merge branch '2.0' of https://github.com/sulu/SuluArticleBundle into 2.1

7ca9b27

Merge branch '2.1' of https://github.com/sulu/SuluArticleBundle

88cd36d

Pass urls and localizations array to twig template (sulu#526)

a5a86f2

* Pass localizations array to twig template * Use absolute url in localizations array

Prokyonn and others added 4 commits August 27, 2024 09:34

Add max_per_page filter (sulu#699)

d412072

Replace ContentBundleLinkProvider with own ArticleLinkProvider (sulu#702

d88794f

)

Move article bundle to packages/article for monorepo merge

241014b

Merge Article Bundle into sulu monorepo

8d01c41

alexander-schranz force-pushed the feature/article-merge-into-sulu branch 3 times, most recently from bbf6a28 to 041097c Compare November 14, 2024 15:24

alexander-schranz commented Nov 14, 2024

View reviewed changes

alexander-schranz force-pushed the feature/article-merge-into-sulu branch 3 times, most recently from 0b64382 to 68382f4 Compare November 14, 2024 16:22

alexander-schranz commented Nov 14, 2024

View reviewed changes

alexander-schranz force-pushed the feature/article-merge-into-sulu branch 2 times, most recently from bfa897d to 0be40c3 Compare November 14, 2024 16:29

alexander-schranz commented Nov 14, 2024

View reviewed changes

alexander-schranz marked this pull request as draft November 14, 2024 18:21

alexander-schranz added the Feature New functionality not yet included in Sulu label Nov 14, 2024

alexander-schranz force-pushed the feature/article-merge-into-sulu branch from fda563f to 7f36107 Compare November 15, 2024 10:09

alexander-schranz added 2 commits November 15, 2024 11:13

Adjust article bundle and sulu core to test article bundle with it

694136c

Init PHPCR correctly for caching test

91dd32b

alexander-schranz force-pushed the feature/article-merge-into-sulu branch from 7f36107 to 91dd32b Compare November 15, 2024 10:13

alexander-schranz marked this pull request as ready for review November 15, 2024 10:16

alexander-schranz merged commit 7f4cb5f into sulu:3.0 Nov 15, 2024
5 of 8 checks passed

This was referenced Nov 25, 2024

Move things into a subdirectory sulu/SuluContentBundle#274

Closed

Add Content Bundle to monorepository #7674

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Add Article Bundle to monorepository #7653

Add Article Bundle to monorepository #7653

Uh oh!

alexander-schranz commented Nov 14, 2024 •

edited

Loading

Uh oh!

alexander-schranz left a comment

Uh oh!

alexander-schranz Nov 14, 2024

Uh oh!

alexander-schranz Nov 14, 2024

Uh oh!

alexander-schranz Nov 14, 2024

Uh oh!

alexander-schranz Nov 14, 2024

Uh oh!

alexander-schranz left a comment

Uh oh!

alexander-schranz Nov 14, 2024

Uh oh!

alexander-schranz Nov 14, 2024

Uh oh!

alexander-schranz Nov 14, 2024

Uh oh!

alexander-schranz commented Nov 14, 2024

Uh oh!

alexander-schranz commented Nov 15, 2024

Uh oh!

Uh oh!

Uh oh!

Add Article Bundle to monorepository #7653

Add Article Bundle to monorepository #7653

Uh oh!

Conversation

alexander-schranz commented Nov 14, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What's in this PR?

Why?

Uh oh!

alexander-schranz left a comment

Choose a reason for hiding this comment

Uh oh!

alexander-schranz Nov 14, 2024

Choose a reason for hiding this comment

Uh oh!

alexander-schranz Nov 14, 2024

Choose a reason for hiding this comment

Uh oh!

alexander-schranz Nov 14, 2024

Choose a reason for hiding this comment

Uh oh!

alexander-schranz Nov 14, 2024

Choose a reason for hiding this comment

Uh oh!

alexander-schranz left a comment

Choose a reason for hiding this comment

Uh oh!

alexander-schranz Nov 14, 2024

Choose a reason for hiding this comment

Uh oh!

alexander-schranz Nov 14, 2024

Choose a reason for hiding this comment

Uh oh!

alexander-schranz Nov 14, 2024

Choose a reason for hiding this comment

Uh oh!

alexander-schranz commented Nov 14, 2024

Uh oh!

alexander-schranz commented Nov 15, 2024

Uh oh!

Uh oh!

Uh oh!

alexander-schranz commented Nov 14, 2024 •

edited

Loading