CS

contao · Jan 17, 2024 · 991ee0c · 991ee0c
1 parent 64751be
commit 991ee0c
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 15 deletions.
diff --git a/news-bundle/contao/classes/News.php b/news-bundle/contao/classes/News.php
@@ -26,10 +26,13 @@ class News extends Frontend
 	 * @param boolean   $blnAbsolute
 	 *
 	 * @return string
+	 *
+	 * @deprecated Deprecated since Contao 5.3, to be removed in Contao 6;
+	 *             use the content URL generator instead.
 	 */
 	public static function generateNewsUrl($objItem, $blnAddArchive=false, $blnAbsolute=false)
 	{
-		trigger_deprecation('contao/core-bundle', '5.3', 'Using "%s" is deprecated, use the content URL generator instead.', __METHOD__);
+		trigger_deprecation('contao/core-bundle', '5.3', 'Using "%s()" has been deprecated and will no longer work in Contao 6. Use the content URL generator instead.', __METHOD__);
 
 		try
 		{

diff --git a/news-bundle/contao/modules/ModuleNewsMenu.php b/news-bundle/contao/modules/ModuleNewsMenu.php
@@ -77,9 +77,7 @@ public function generate()
 		{
 			try
 			{
-				$urlGenerator = System::getContainer()->get('contao.routing.content_url_generator');
-
-				$this->strUrl = $urlGenerator->generate($objTarget);
+				$this->strUrl = System::getContainer()->get('contao.routing.content_url_generator')->generate($objTarget);
 			}
 			catch (ExceptionInterface)
 			{

diff --git a/news-bundle/contao/modules/ModuleNewsReader.php b/news-bundle/contao/modules/ModuleNewsReader.php
@@ -76,10 +76,10 @@ public function generate()
 	 */
 	protected function compile()
 	{
-		$urlGenerator = System::getContainer()->get('contao.routing.content_url_generator');
-
 		$this->Template->articles = '';
 
+		$urlGenerator = System::getContainer()->get('contao.routing.content_url_generator');
+
 		if ($this->overviewPage && ($overviewPage = PageModel::findById($this->overviewPage)))
 		{
 			$this->Template->referer = $urlGenerator->generate($overviewPage);

diff --git a/news-bundle/src/EventListener/GeneratePageListener.php b/news-bundle/src/EventListener/GeneratePageListener.php
@@ -56,8 +56,8 @@ public function __invoke(PageModel $pageModel, LayoutModel $layoutModel): void
                 continue;
             }
 
-            // TODO: Use ResponseContext, once it supports appending to <head>
             try {
+                // TODO: Use ResponseContext, once it supports appending to <head>
                 $GLOBALS['TL_HEAD'][] = $this->generateFeedTag($this->urlGenerator->generate($feed, [], UrlGeneratorInterface::ABSOLUTE_URL), $feed->feedFormat, $feed->title);
             } catch (ExceptionInterface) {
             }

diff --git a/news-bundle/src/EventListener/NewsFeedListener.php b/news-bundle/src/EventListener/NewsFeedListener.php
@@ -36,6 +36,9 @@
 use Symfony\Component\Filesystem\Path;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
+/**
+ * @internal
+ */
 class NewsFeedListener
 {
     public function __construct(

diff --git a/news-bundle/src/Routing/NewsResolver.php b/news-bundle/src/Routing/NewsResolver.php
@@ -61,8 +61,6 @@ public function getParametersForContent(object $content, PageModel $pageModel):
             return [];
         }
 
-        return [
-            'parameters' => '/'.($content->alias ?: $content->id),
-        ];
+        return ['parameters' => '/'.($content->alias ?: $content->id)];
     }
 }
diff --git a/news-bundle/tests/EventListener/InsertTagsListenerTest.php b/news-bundle/tests/EventListener/InsertTagsListenerTest.php
@@ -146,6 +146,7 @@ public function testReturnsFalseIfTheTagIsUnknown(): void
     {
         $urlGenerator = $this->createMock(ContentUrlGenerator::class);
         $logger = $this->createMock(LoggerInterface::class);
+
         $listener = new InsertTagsListener($this->mockContaoFramework(), $urlGenerator, $logger);
 
         $this->assertFalse($listener('link_url::2', false, null, []));

diff --git a/news-bundle/tests/EventListener/SitemapListenerTest.php b/news-bundle/tests/EventListener/SitemapListenerTest.php
@@ -50,8 +50,6 @@ public function testNothingIsAddedIfNoPublishedArchive(): void
      */
     public function testNewsArticleIsAdded(array $pageProperties, array $newsArchiveProperties, bool $hasAuthenticatedMember): void
     {
-        $jumpToPage = $this->mockClassWithProperties(PageModel::class, $pageProperties);
-
         $adapters = [
             NewsArchiveModel::class => $this->mockConfiguredAdapter([
                 'findByProtected' => [
@@ -62,7 +60,7 @@ public function testNewsArticleIsAdded(array $pageProperties, array $newsArchive
                 ],
             ]),
             PageModel::class => $this->mockConfiguredAdapter([
-                'findWithDetails' => $jumpToPage,
+                'findWithDetails' => $this->mockClassWithProperties(PageModel::class, $pageProperties),
             ]),
             NewsModel::class => $this->mockConfiguredAdapter([
                 'findPublishedDefaultByPid' => [

diff --git a/news-bundle/tests/Routing/NewsResolverTest.php b/news-bundle/tests/Routing/NewsResolverTest.php
@@ -81,7 +81,6 @@ public function testResolveNewsWithArticleSource(): void
     public function testResolveNewsWithoutSource(): void
     {
         $target = $this->mockClassWithProperties(PageModel::class);
-
         $newsArchive = $this->mockClassWithProperties(NewsArchiveModel::class, ['jumpTo' => 42]);
 
         $content = $this->mockClassWithProperties(NewsModel::class, ['source' => '']);
@@ -115,7 +114,6 @@ public function testResolveNewsWithoutSource(): void
     public function testGetParametersForContent(object $content, array $expected): void
     {
         $pageModel = $this->mockClassWithProperties(PageModel::class);
-
         $resolver = new NewsResolver($this->mockContaoFramework());
 
         $this->assertSame($expected, $resolver->getParametersForContent($content, $pageModel));