Topic/v14

.github/workflows/unit.yaml

@@ -0,0 +1,41 @@
+name: Unit
+
+on:
+  pull_request:
+
+jobs:
+  tests:
+    name: Tests (PHP ${{ matrix.php-version }})
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php-version: ['8.4']
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          tools: composer:v2
+
+      - run: composer install --no-progress
+
+      - run: composer test
+
+  tests-lowest:
+    name: Tests lowest deps (PHP ${{ matrix.php-version }})
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php-version: ['8.4']
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          tools: composer:v2
+
+      - run: composer update --prefer-lowest --no-progress
+
+      - run: composer test

Classes/ConfigurationModuleProvider/AppRoutesProvider.php

@@ -9,15 +9,9 @@
 
 class AppRoutesProvider extends AbstractProvider
 {
-    /**
-     * @var RoutesConfigurationLoader
-     */
-    protected $routesConfigurationLoader;
-
-    public function __construct(RoutesConfigurationLoader $routesConfigurationLoader)
-    {
-        $this->routesConfigurationLoader = $routesConfigurationLoader;
-    }
+    public function __construct(
+        private readonly RoutesConfigurationLoader $routesConfigurationLoader,
+    ) {}
 
     public function getConfiguration(): array
     {

Classes/Middleware/AppRoutesMiddleware.php

@@ -20,6 +20,7 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Frontend\Aspect\PreviewAspect;
 use TYPO3\CMS\Frontend\Page\PageInformation;
+use TYPO3\CMS\Frontend\Page\PageParts;
 
 class AppRoutesMiddleware implements MiddlewareInterface
 {
@@ -89,7 +90,7 @@ protected function initializeNeededFrontendComponents(array $parameters, ServerR
         $site = $request->getAttribute('site');
 
         // set PageArguments as routing attribute
-        $keysToRemove = ['handler', 'requiresTsfe', 'requiresTypoScript', 'cache', 'L', '_route'];
+        $keysToRemove = ['handler', 'requiresTypoScript', 'cache', 'L', '_route'];
         $remainingArguments = array_diff_key($request->getQueryParams(), array_flip($keysToRemove));
         $request = $request->withAttribute('routing', new PageArguments($site->getRootPageId(), '0', [], [], $remainingArguments));
 
@@ -107,11 +108,13 @@ protected function initializeNeededFrontendComponents(array $parameters, ServerR
         $pageInformation = $this->frontendInitialization->createPageInformation($request);
         $request = $request->withAttribute('frontend.page.information', $pageInformation);
 
-        // TSFE
-        if ($parameters['requiresTsfe'] ?? false) {
-            $tsfe = $this->frontendInitialization->createTyposcriptFrontendController($request);
-            $request = $request->withAttribute('frontend.controller', $tsfe);
+        $pageParts = new PageParts();
+        $lastChanged = (int)$pageInformation->getPageRecord()['tstamp'];
+        if ($lastChanged < (int)$pageInformation->getPageRecord()['SYS_LASTCHANGED']) {
+            $lastChanged = (int)$pageInformation->getPageRecord()['SYS_LASTCHANGED'];
         }
+        $pageParts->setLastChanged($lastChanged);
+        $request = $request->withAttribute('frontend.page.parts', $pageParts);
 
         // TypoScript
         if ($parameters['requiresTypoScript'] ?? false) {

Classes/Service/FrontendInitialization.php

@@ -9,14 +9,11 @@
 use TYPO3\CMS\Core\Cache\Frontend\PhpFrontend;
 use TYPO3\CMS\Core\Routing\PageArguments;
 use TYPO3\CMS\Core\Site\Entity\NullSite;
-use TYPO3\CMS\Core\Site\Entity\SiteInterface;
 use TYPO3\CMS\Core\Site\Entity\SiteLanguage;
 use TYPO3\CMS\Core\Site\SiteFinder;
 use TYPO3\CMS\Core\TypoScript\FrontendTypoScript;
 use TYPO3\CMS\Core\TypoScript\FrontendTypoScriptFactory;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
-use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
 use TYPO3\CMS\Frontend\Page\PageInformation;
 use TYPO3\CMS\Frontend\Page\PageInformationFactory;
 
@@ -29,34 +26,6 @@ public function __construct(
         private readonly PhpFrontend $typoScriptCache,
     ) {}
 
-    public function createTyposcriptFrontendController(ServerRequestInterface $request): TypoScriptFrontendController
-    {
-        $pageInformation = $this->pageInformationFactory->create($request);
-
-        $controller = GeneralUtility::makeInstance(TypoScriptFrontendController::class);
-        $controller->initializePageRenderer($request);
-        $controller->initializeLanguageService($request);
-        $controller->id = $pageInformation->getId();
-        $controller->page = $pageInformation->getPageRecord();
-        $controller->contentPid = $pageInformation->getContentFromPid();
-        $controller->rootLine = $pageInformation->getRootLine();
-        $controller->config['rootLine'] = $pageInformation->getLocalRootLine();
-        $controller->register['SYS_LASTCHANGED'] = (int)$pageInformation->getPageRecord()['tstamp'];
-        if ($controller->register['SYS_LASTCHANGED'] < (int)$pageInformation->getPageRecord()['SYS_LASTCHANGED']) {
-            $controller->register['SYS_LASTCHANGED'] = (int)$pageInformation->getPageRecord()['SYS_LASTCHANGED'];
-        }
-
-        $contentObjectRenderer = GeneralUtility::makeInstance(ContentObjectRenderer::class);
-        $contentObjectRenderer->start($pageInformation->getPageRecord(), 'pages');
-        $controller->cObj = $contentObjectRenderer;
-
-        $request = $request->withAttribute('frontend.controller', $controller);
-        $GLOBALS['TYPO3_REQUEST'] = $request;
-        $GLOBALS['TSFE'] = $controller;
-
-        return $controller;
-    }
-
     public function createPageInformation(ServerRequestInterface $request): PageInformation
     {
         return $this->pageInformationFactory->create($request);

Classes/Service/RoutesConfigurationLoader.php

@@ -13,36 +13,20 @@ class RoutesConfigurationLoader
 {
     public const APP_ROUTES_YAML_PATH = 'Configuration/AppRoutes.yaml';
 
-    /**
-     * @var FrontendInterface
-     */
-    protected $cache;
+    private readonly FrontendInterface $cache;
+    private array $routesConfiguration;
 
-    /**
-     * @var PackageManager
-     */
-    protected $packageManager;
-
-    /**
-     * @var array
-     */
-    protected $routesConfiguration;
-
-    /**
-     * @var YamlFileLoader
-     */
-    protected $yamlFileLoader;
-
-    public function __construct(CacheManager $cacheManager, PackageManager $packageManager, YamlFileLoader $yamlFileLoader)
-    {
+    public function __construct(
+        CacheManager $cacheManager,
+        private readonly PackageManager $packageManager,
+        private readonly YamlFileLoader $yamlFileLoader,
+    ) {
         $this->cache = $cacheManager->getCache('app_routes');
-        $this->packageManager = $packageManager;
-        $this->yamlFileLoader = $yamlFileLoader;
     }
 
     public function getRoutesConfiguration(): array
     {
-        if (!is_array($this->routesConfiguration)) {
+        if (!isset($this->routesConfiguration)) {
             $this->loadRoutesConfiguration();
         }
         return $this->routesConfiguration;

Readme.md

@@ -41,8 +41,7 @@ Everything that is available as YAML configuration option in `symfony/routing` s
 This package offers these additional options:
 
 * `defaults.cache: true` - If true, then responses are cached (see more details below). (default: `false`)
-* `defaults.requiresTsfe: true` - If true, then the `frontend.controller` request attribute will be initialized before your handler is called (default: `false`).
-* `defaults.TypoScript: true` - If true, then the `frontend.typoscript` request attribute will be initialized before your handler is called (default: `false`).
+* `defaults.requiresTypoScript: true` - If true, then the `frontend.typoscript` request attribute will be initialized before your handler is called (default: `false`).
 
 ### Generate Route URLs