12966185640

Committed 25 Jan 2025 03:24PM UTC coverage: 72.268% (-0.2%) from 72.434%

Build # 12966185640

Build Type

Pull #1922

github

Committed by

web-flow

Commit Message

Merge 6eba7534d into 02c21f3ce

Pull Request Pull Request #1922: [BUGFIX] Use late instancing of ContentObjectRenderer

Run Details

16 of 39 new or added lines in 11 files covered. (41.03%)

5548 of 7677 relevant lines covered (72.27%)

13.46 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

57.14

/Classes/Utility/ContentObjectFetcher.php

<?php
namespace FluidTYPO3\Vhs\Utility;

/*
 * This file is part of the FluidTYPO3/Vhs project under GPLv2 or later.
 *
 * For the full copyright and license information, please read the
 * LICENSE.md file that was distributed with this source code.
 */

use Psr\Http\Message\ServerRequestInterface;
use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;

class ContentObjectFetcher
{
    public static function resolve(?ConfigurationManagerInterface $configurationManager = null): ?ContentObjectRenderer
    {
        $contentObject = null;
        $request = ($configurationManager !== null && method_exists($configurationManager, 'getRequest')
            ? $configurationManager->getRequest()
            : ($GLOBALS['TYPO3_REQUEST'] ?? null)) ?? $GLOBALS['TYPO3_REQUEST'] ?? null;

        if ($request && $configurationManager === null) {
            $contentObject = static::resolveFromRequest($request);
        }

        if ($contentObject === null) {
            if ($configurationManager !== null && method_exists($configurationManager, 'getContentObject')) {
                $contentObject = $configurationManager->getContentObject();
            } elseif ($request) {
                $contentObject = static::resolveFromRequest($request);
            }
        }

        return $contentObject;
    }

    protected static function resolveFromRequest(ServerRequestInterface $request): ?ContentObjectRenderer
    {
        /** @var TypoScriptFrontendController $controller */
        $controller = $request->getAttribute('frontend.controller');
        return $controller instanceof TypoScriptFrontendController ? $controller->cObj : null;
    }
}

1	<?php
2	namespace FluidTYPO3\Vhs\Utility;
3
4	/*
5	* This file is part of the FluidTYPO3/Vhs project under GPLv2 or later.
6	*
7	* For the full copyright and license information, please read the
8	* LICENSE.md file that was distributed with this source code.
9	*/
10
11	use Psr\Http\Message\ServerRequestInterface;
12	use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
13	use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
14	use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
15
16	class ContentObjectFetcher
17	{
18	public static function resolve(?ConfigurationManagerInterface $configurationManager = null): ?ContentObjectRenderer
19	{
20	$contentObject = null;	96✔
21	$request = ($configurationManager !== null && method_exists($configurationManager, 'getRequest')	96✔
22	? $configurationManager->getRequest()	×
23	: ($GLOBALS['TYPO3_REQUEST'] ?? null)) ?? $GLOBALS['TYPO3_REQUEST'] ?? null;	96✔
24
25	if ($request && $configurationManager === null) {	96✔
26	$contentObject = static::resolveFromRequest($request);	×
27	}
28
29	if ($contentObject === null) {	96✔
30	if ($configurationManager !== null && method_exists($configurationManager, 'getContentObject')) {	96✔
31	$contentObject = $configurationManager->getContentObject();	96✔
NEW 32	} elseif ($request) {	×
33	$contentObject = static::resolveFromRequest($request);	×
34	}
35	}
36
37	return $contentObject;	96✔
38	}
39
40	protected static function resolveFromRequest(ServerRequestInterface $request): ?ContentObjectRenderer
41	{
42	/** @var TypoScriptFrontendController $controller */
43	$controller = $request->getAttribute('frontend.controller');	×
44	return $controller instanceof TypoScriptFrontendController ? $controller->cObj : null;	×
45	}
46	}

FluidTYPO3 / vhs / 12966185640

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous