Code review

core-bundle/src/Resources/config/routing.yml

@@ -9,3 +9,10 @@ services:
     Contao\CoreBundle\Routing\Content\PageRouteProvider:
         arguments:
             - '@Contao\CoreBundle\Routing\RouteFactory'
+
+    Contao\CoreBundle\Routing\Page\PageRegistry: ~
+
+    Contao\CoreBundle\Routing\RouteFactory:
+        arguments:
+            - '@Contao\CoreBundle\Routing\Page\PageRegistry'
+            - !tagged_iterator contao.content_route_provider

core-bundle/src/Resources/config/services.yml

@@ -520,8 +520,6 @@ services:
             - [addRouteFilter, ['@contao.routing.domain_filter']]
             - [addRouteFilter, ['@contao.routing.published_filter']]
 
-    Contao\CoreBundle\Routing\Page\PageRegistry: ~
-
     contao.routing.page_router:
         class: Symfony\Cmf\Component\Routing\DynamicRouter
         arguments:
@@ -551,11 +549,6 @@ services:
         arguments:
             - '@contao.security.token_checker'
 
-    Contao\CoreBundle\Routing\RouteFactory:
-        arguments:
-            - '@Contao\CoreBundle\Routing\Page\PageRegistry'
-            - !tagged_iterator contao.content_route_provider
-
     contao.routing.route_generator:
         class: Contao\CoreBundle\Routing\ContentResolvingGenerator
         arguments:

core-bundle/src/Resources/contao/classes/Frontend.php

@@ -440,7 +440,10 @@ public static function addToUrl($strRequest, $blnIgnoreParams=false, $arrUnset=a
 		}
 
 		// Unset the language parameter
-		unset($arrGet['language']);
+		if ($objPage->urlPrefix)
+		{
+			unset($arrGet['language']);
+		}
 
 		$strParams    = '';
 		$strConnector = '/';

core-bundle/src/Resources/contao/controllers/FrontendIndex.php

@@ -180,8 +180,6 @@ public function renderPage($pageModel)
 
 			if (preg_match('#^' . $language . $objPage->id . '(' . $suffix . '($|\?)|/)#', Environment::get('relativeRequest')))
 			{
-				@trigger_error('Checking for duplicate URLs with ID/alias in FrontendIndex::renderPage() has been deprecated and will no longer work Contao 5.0. Use the Symfony routing instead.', E_USER_DEPRECATED);
-
 				throw new PageNotFoundException('Page not found: ' . Environment::get('uri'));
 			}
 		}
@@ -209,8 +207,6 @@ public function renderPage($pageModel)
 
 			if (!$hasItem)
 			{
-				@trigger_error('Checking for "requireItem" in FrontendIndex::renderPage() has been deprecated and will no longer work Contao 5.0. Use the Symfony routing instead.', E_USER_DEPRECATED);
-
 				throw new PageNotFoundException('Page not found: ' . Environment::get('uri'));
 			}
 		}
@@ -221,8 +217,6 @@ public function renderPage($pageModel)
 		// Trigger the 404 page if the page is not published and the front end preview is not active (see #374)
 		if (!BE_USER_LOGGED_IN && !$objPage->isPublic)
 		{
-			@trigger_error('Checking for published pages in FrontendIndex::renderPage() has been deprecated and will no longer work Contao 5.0. Use the Symfony routing instead.', E_USER_DEPRECATED);
-
 			throw new PageNotFoundException('Page not found: ' . Environment::get('uri'));
 		}
 
@@ -248,16 +242,12 @@ public function renderPage($pageModel)
 		// Do not try to load the 404 page, it can cause an infinite loop!
 		if (!BE_USER_LOGGED_IN && !$objPage->rootIsPublic)
 		{
-			@trigger_error('Checking for published root page in FrontendIndex::renderPage() has been deprecated and will no longer work Contao 5.0. Use the Symfony routing instead.', E_USER_DEPRECATED);
-
 			throw new PageNotFoundException('Page not found: ' . Environment::get('uri'));
 		}
 
 		// Check wether the language matches the root page language
 		if (isset($_GET['language']) && Config::get('addLanguageToUrl') && Input::get('language') != $objPage->rootLanguage)
 		{
-			@trigger_error('Checking for page language in FrontendIndex::renderPage() has been deprecated and will no longer work Contao 5.0. Use the Symfony routing instead.', E_USER_DEPRECATED);
-
 			throw new PageNotFoundException('Page not found: ' . Environment::get('uri'));
 		}
 

core-bundle/src/Resources/contao/dca/tl_article.php

@@ -773,7 +773,7 @@ public function cutArticle($row, $href, $label, $title, $icon, $attributes)
 	 */
 	public function pasteArticle(DataContainer $dc, $row, $table, $cr, $arrClipboard=null)
 	{
-		@trigger_error('Deprecated since Contao 4.10, to be removed in Contao 5. Use Contao\CoreBundle\EventListener\DataContainer\ContentCompositionListener::renderArticlePasteButton instead.', E_USER_DEPRECATED);
+		@trigger_error('tl_article::pasteArticle() is deprecated since Contao 4.10, to be removed in Contao 5. Use ContentCompositionListener::renderArticlePasteButton() instead.', E_USER_DEPRECATED);
 
 		return System::getContainer()
 			->get(ContentCompositionListener::class)

core-bundle/src/Resources/contao/library/Contao/Controller.php

@@ -1172,8 +1172,7 @@ protected static function replaceOldBePaths($strContext)
 	 *
 	 * @return string An URL that can be used in the front end
 	 *
-	 * @deprecated Deprecated since Contao 4.2, to be removed in Contao 5.0.
-	 *             Use the Symfony router instead.
+	 * @deprecated Deprecated since Contao 4.2, to be removed in Contao 5.0. Use the Symfony router instead.
 	 */
 	public static function generateFrontendUrl(array $arrRow, $strParams=null, $strForceLang=null, $blnFixDomain=false)
 	{

core-bundle/src/Resources/contao/library/Contao/Template.php

@@ -349,14 +349,14 @@ public function route($strName, $arrParams=array())
 	/**
 	 * Return a content route relative to the base URL
 	 *
-	 * @param mixed $content   The content
-	 * @param array $arrParams The route parameters
+	 * @param mixed $objContent The content
+	 * @param array $arrParams  The route parameters
 	 *
 	 * @return string The route
 	 */
-	public function routeContent($content, $arrParams=array())
+	public function contentRoute($objContent, $arrParams=array())
 	{
-		$arrParams[PageRoute::CONTENT_PARAMETER] = $content;
+		$arrParams[PageRoute::CONTENT_PARAMETER] = $objContent;
 
 		return $this->route(PageRoute::ROUTE_NAME, $arrParams);
 	}
@@ -394,16 +394,16 @@ public function previewRoute($strName, $arrParams=array())
 	/**
 	 * Return the preview content route
 	 *
-	 * @param mixed $content   The content
-	 * @param array $arrParams The route parameters
+	 * @param mixed $objContent The content
+	 * @param array $arrParams  The route parameters
 	 *
 	 * @return string The route
 	 */
-	public function previewContentRoute($content, $arrParams = array())
+	public function previewContentRoute($objContent, $arrParams = array())
 	{
-		$arrParams[PageRoute::CONTENT_PARAMETER] = $content;
+		$arrParams[PageRoute::CONTENT_PARAMETER] = $objContent;
 
-		return $this->routeContent(PageRoute::ROUTE_NAME, $arrParams);
+		return $this->contentRoute(PageRoute::ROUTE_NAME, $arrParams);
 	}
 
 	/**

core-bundle/src/Resources/contao/pages/PageError404.php

@@ -84,8 +84,8 @@ protected function prepare()
 		// Find the matching root page
 		$objRootPage = $this->getRootPageFromUrl();
 
-		// Forward if the language should be but is not set (see #4028). CMF Routing will take care of this in non-legacy mode.
-		if (System::getContainer()->getParameter('contao.legacy_routing') && Config::get('addLanguageToUrl'))
+		// Forward if the language should be but is not set (see #4028).
+		if ($objRootPage->urlPrefix)
 		{
 			// Get the request string without the script name
 			$strRequest = Environment::get('relativeRequest');
@@ -100,8 +100,6 @@ protected function prepare()
 				}
 				else
 				{
-					Input::setGet('language', $objRootPage->language);
-
 					if ($strRequest == Environment::get('request'))
 					{
 						$strRequest = $objRootPage->language . '/' . $strRequest;

core-bundle/src/Routing/Content/ContentRouteProviderInterface.php

@@ -19,14 +19,13 @@
  * A content route provider converts content to a URL (represented by a route object).
  *
  * - Resolve to a Contao\CoreBundle\Routing\Page\PageRoute if the
- *    content is embedded on a page (e.g. through a "reader" module).
+ *   content is embedded on a page (e.g. through a "reader" module).
  *
  * - Resolve to a Symfony\Component\Routing\Route if the content's URL
- *    is not within the CMS (e.g. an absolute URL).
+ *   is not within the CMS (e.g. an absolute URL).
  *
  * If a provider is responsible for a content object but cannot convert it to a route,
- * a Symfony\Component\Routing\Exception\RouteNotFoundException or
- * Contao\CoreBundle\Exception\ContentRouteNotFoundException should be thrown
+ * a Contao\CoreBundle\Exception\ContentRouteNotFoundException should be thrown.
  */
 interface ContentRouteProviderInterface
 {

core-bundle/tests/Functional/RoutingTest.php

@@ -359,9 +359,14 @@ public function getAliases(): \Generator
      */
     public function testResolvesAliasesWithLocale(array $fixtures, string $request, int $statusCode, string $pageTitle, array $query, string $host, bool $autoItem): void
     {
-        $fixtures[] = 'locale';
         $this->loadFixtureFiles($fixtures);
 
+        self::$container
+            ->get('doctrine')
+            ->getConnection()
+            ->exec('UPDATE tl_page SET urlPrefix=language')
+        ;
+
         Config::set('useAutoItem', $autoItem);
 
         $_SERVER['REQUEST_URI'] = $request;
@@ -666,9 +671,14 @@ public function getAliasesWithLocale(): \Generator
      */
     public function testResolvesAliasesWithoutUrlSuffix(array $fixtures, string $request, int $statusCode, string $pageTitle, array $query, string $host, bool $autoItem): void
     {
-        $fixtures[] = 'suffix';
         $this->loadFixtureFiles($fixtures);
 
+        self::$container
+            ->get('doctrine')
+            ->getConnection()
+            ->exec("UPDATE tl_page SET urlSuffix=''")
+        ;
+
         Config::set('useAutoItem', $autoItem);
 
         $_SERVER['REQUEST_URI'] = $request;
@@ -1017,9 +1027,14 @@ public function getRootAliases(): \Generator
      */
     public function testResolvesTheRootPageWithLocale(array $fixtures, string $request, int $statusCode, string $pageTitle, string $acceptLanguages, string $host): void
     {
-        $fixtures[] = 'locale';
         $this->loadFixtureFiles($fixtures);
 
+        self::$container
+            ->get('doctrine')
+            ->getConnection()
+            ->exec('UPDATE tl_page SET urlPrefix=language')
+        ;
+
         $_SERVER['REQUEST_URI'] = $request;
         $_SERVER['HTTP_HOST'] = $host;
         $_SERVER['HTTP_ACCEPT_LANGUAGE'] = $acceptLanguages;

core-bundle/tests/Routing/Candidates/CandidatesTest.php

@@ -391,6 +391,17 @@ public function getCandidatesProvider(): \Generator
                 'default' => ['15/foo', '15'],
             ],
         ];
+
+        yield [
+            '/foo/bar/baz.html',
+            ['.html'],
+            ['foo/bar'],
+            [
+                'default' => ['baz'],
+                'locale' => ['foo/bar/baz', 'foo/bar', 'foo'],
+                'legacy' => [],
+            ],
+        ];
     }
 
     /**