13012391762

Committed 28 Jan 2025 02:15PM UTC coverage: 71.877% (-0.02%) from 71.896%

Build # 13012391762

Build Type

push

github

Committed by

NamelessCoder

Commit Message

[BUGFIX] Read ContentObjectRenderer from currentContentObject attribute if set

Run Details

0 of 2 new or added lines in 1 file covered. (0.0%)

5628 of 7830 relevant lines covered (71.88%)

17.19 hits per line

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

50.0

/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
    {
        if (($cObject = $request->getAttribute('currentContentObject')) instanceof ContentObjectRenderer) {
            return $cObject;
        }
        /** @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✔
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	{
NEW 42	if (($cObject = $request->getAttribute('currentContentObject')) instanceof ContentObjectRenderer) {	×
NEW 43	return $cObject;	×
44	}
45	/** @var TypoScriptFrontendController $controller */
46	$controller = $request->getAttribute('frontend.controller');	×
47	return $controller instanceof TypoScriptFrontendController ? $controller->cObj : null;	×
48	}
49	}

FluidTYPO3 / vhs / 13012391762

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