[TASK] Move DoctrineQueryProxy to Proxy namespace

NamelessCoder · NamelessCoder · commit 74596bfd6035 · 2025-01-28T13:38:09.000+01:00
diff --git a/Classes/Proxy/DispatcherProxy.php b/Classes/Proxy/DispatcherProxy.php
@@ -1,5 +1,5 @@
 <?php
-namespace FluidTYPO3\Vhs\Utility;
+namespace FluidTYPO3\Vhs\Proxy;
 
 /*
  * This file is part of the FluidTYPO3/Vhs project under GPLv2 or later.
diff --git a/Classes/Proxy/DoctrineQueryProxy.php b/Classes/Proxy/DoctrineQueryProxy.php
@@ -1,5 +1,5 @@
 <?php
-namespace FluidTYPO3\Vhs\Utility;
+namespace FluidTYPO3\Vhs\Proxy;
 
 use Doctrine\DBAL\Driver\ResultStatement;
 use Doctrine\DBAL\FetchMode;
diff --git a/Classes/ViewHelpers/Condition/Page/IsLanguageViewHelper.php b/Classes/ViewHelpers/Condition/Page/IsLanguageViewHelper.php
@@ -8,7 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
-use FluidTYPO3\Vhs\Utility\DoctrineQueryProxy;
+use FluidTYPO3\Vhs\Proxy\DoctrineQueryProxy;
 use TYPO3\CMS\Core\Context\Context;
 use TYPO3\CMS\Core\Context\LanguageAspect;
 use TYPO3\CMS\Core\Database\Connection;
diff --git a/Classes/ViewHelpers/Content/AbstractContentViewHelper.php b/Classes/ViewHelpers/Content/AbstractContentViewHelper.php
@@ -8,9 +8,9 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Proxy\DoctrineQueryProxy;
 use FluidTYPO3\Vhs\Traits\SlideViewHelperTrait;
 use FluidTYPO3\Vhs\Utility\ContentObjectFetcher;
-use FluidTYPO3\Vhs\Utility\DoctrineQueryProxy;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
diff --git a/Classes/ViewHelpers/Content/InfoViewHelper.php b/Classes/ViewHelpers/Content/InfoViewHelper.php
@@ -8,9 +8,9 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Proxy\DoctrineQueryProxy;
 use FluidTYPO3\Vhs\Traits\TemplateVariableViewHelperTrait;
 use FluidTYPO3\Vhs\Utility\ContentObjectFetcher;
-use FluidTYPO3\Vhs\Utility\DoctrineQueryProxy;
 use TYPO3\CMS\Core\Context\Context;
 use TYPO3\CMS\Core\Context\LanguageAspect;
 use TYPO3\CMS\Core\Database\Connection;
diff --git a/Classes/ViewHelpers/Page/LanguageMenuViewHelper.php b/Classes/ViewHelpers/Page/LanguageMenuViewHelper.php
@@ -8,11 +8,11 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Proxy\DoctrineQueryProxy;
 use FluidTYPO3\Vhs\Traits\ArrayConsumingViewHelperTrait;
 use FluidTYPO3\Vhs\Traits\TagViewHelperCompatibility;
 use FluidTYPO3\Vhs\Utility\ContentObjectFetcher;
 use FluidTYPO3\Vhs\Utility\CoreUtility;
-use FluidTYPO3\Vhs\Utility\DoctrineQueryProxy;
 use TYPO3\CMS\Core\Context\Context;
 use TYPO3\CMS\Core\Context\LanguageAspect;
 use TYPO3\CMS\Core\Database\ConnectionPool;
diff --git a/Classes/ViewHelpers/Render/RequestViewHelper.php b/Classes/ViewHelpers/Render/RequestViewHelper.php
@@ -8,8 +8,9 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Proxy\DispatcherProxy;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 use FluidTYPO3\Vhs\Utility\ContentObjectFetcher;
-use FluidTYPO3\Vhs\Utility\DispatcherProxy;
 use FluidTYPO3\Vhs\Utility\RequestResolver;
 use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -22,7 +23,6 @@
 use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
-use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * ### Render: Request
diff --git a/Classes/ViewHelpers/Resource/AbstractResourceViewHelper.php b/Classes/ViewHelpers/Resource/AbstractResourceViewHelper.php
@@ -8,8 +8,8 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Proxy\DoctrineQueryProxy;
 use FluidTYPO3\Vhs\Traits\TagViewHelperCompatibility;
-use FluidTYPO3\Vhs\Utility\DoctrineQueryProxy;
 use FluidTYPO3\Vhs\Utility\ResourceUtility;
 use TYPO3\CMS\Core\Database\Connection;
 use TYPO3\CMS\Core\Database\ConnectionPool;
diff --git a/Classes/ViewHelpers/Resource/Record/AbstractRecordResourceViewHelper.php b/Classes/ViewHelpers/Resource/Record/AbstractRecordResourceViewHelper.php
@@ -8,9 +8,9 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Proxy\DoctrineQueryProxy;
 use FluidTYPO3\Vhs\Traits\TemplateVariableViewHelperTrait;
 use FluidTYPO3\Vhs\Utility\ContentObjectFetcher;
-use FluidTYPO3\Vhs\Utility\DoctrineQueryProxy;
 use FluidTYPO3\Vhs\Utility\ErrorUtility;
 use TYPO3\CMS\Core\Context\Context;
 use TYPO3\CMS\Core\Database\Connection;
diff --git a/Classes/ViewHelpers/Resource/Record/FalViewHelper.php b/Classes/ViewHelpers/Resource/Record/FalViewHelper.php
@@ -8,7 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
-use FluidTYPO3\Vhs\Utility\DoctrineQueryProxy;
+use FluidTYPO3\Vhs\Proxy\DoctrineQueryProxy;
 use FluidTYPO3\Vhs\Utility\ResourceUtility;
 use TYPO3\CMS\Core\Database\Connection;
 use TYPO3\CMS\Core\Database\ConnectionPool;
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -4,6 +4,10 @@ parameters:
             message: "#^Parameter \\#2 \\$response of method FluidTYPO3\\\\Vhs\\\\Proxy\\\\DispatcherProxy\\:\\:dispatch\\(\\) expects TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Response\\|null, \\(TYPO3\\\\CMS\\\\Core\\\\Http\\\\Response\\&TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Web\\\\Response\\)\\|\\(TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\ResponseInterface\\&TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Web\\\\Response\\)\\|null given\\.$#"
             count: 1
             path: Classes/ViewHelpers/Render/RequestViewHelper.php
+        -
+            message: "#^Parameter \\#2 \\$response of method FluidTYPO3\\\\Vhs\\\\Proxy\\\\DispatcherProxy\\:\\:dispatch\\(\\) expects TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Response\\|null, \\(TYPO3\\\\CMS\\\\Core\\\\Http\\\\Response\\&TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Web\\\\Response\\)\\|\\(TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\ResponseInterface\\&TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Web\\\\Response\\)\\|null given\\.$#"
+            count: 1
+            path: Classes/Proxy/DispatcherProxy.php
         -
             message: "#^Method TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Dispatcher\\:\\:dispatch\\(\\) invoked with 2 parameters, 1 required\\.$#"
             count: 1
@@ -31,7 +35,7 @@ parameters:
         -
             message: "#^Call to an undefined method TYPO3\\\\CMS\\\\Core\\\\Database\\\\Query\\\\QueryBuilder\\:\\:execute\\(\\)\\.$#"
             count: 1
-            path: Classes/Utility/DoctrineQueryProxy.php
+            path: Classes/Proxy/DoctrineQueryProxy.php
         -
             message: "#^Access to undefined constant TYPO3\\\\CMS\\\\Core\\\\Domain\\\\Repository\\\\PageRepository\\:\\:DOKTYPE_RECYCLER\\.$#"
             count: 1
@@ -43,11 +47,11 @@ parameters:
         -
             message: "#Call to an undefined method Doctrine\\\\DBAL\\\\Driver\\\\ResultStatement\\|Doctrine\\\\DBAL\\\\Result\\:\\:fetch\\(\\)\\.$#"
             count: 1
-            path: Classes/Utility/DoctrineQueryProxy.php
+            path: Classes/Proxy/DoctrineQueryProxy.php
         -
             message: "#Call to an undefined method Doctrine\\\\DBAL\\\\Driver\\\\ResultStatement\\|Doctrine\\\\DBAL\\\\Result\\:\\:fetchAll\\(\\)\\.$#"
             count: 1
-            path: Classes/Utility/DoctrineQueryProxy.php
+            path: Classes/Proxy/DoctrineQueryProxy.php
         -
             message: "#^Access to protected property TYPO3\\\\CMS\\\\Core\\\\Domain\\\\Repository\\\\PageRepository\\:\\:\\$where_groupAccess\\.$#"
             count: 1
@@ -79,15 +83,15 @@ parameters:
         -
             message: "#^Method TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Dispatcher\\:\\:dispatch\\(\\) invoked with 2 parameters, 1 required\\.$#"
             count: 1
-            path: Classes/Utility/DispatcherProxy.php
+            path: Classes/Proxy/DispatcherProxy.php
         -
             message: "#^Parameter \\#1 \\$controllerClassName of class TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Request constructor expects string, Psr\\\\Http\\\\Message\\\\ServerRequestInterface given\\.$#"
             count: 1
             path: Classes/ViewHelpers/Render/RequestViewHelper.php
         -
             message: "#^Parameter \\#2 \\$response of method TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Dispatcher\\:\\:dispatch\\(\\) expects TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\ResponseInterface, TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Response\\|null given\\.$#"
             count: 1
-            path: Classes/Utility/DispatcherProxy.php
+            path: Classes/Proxy/DispatcherProxy.php
         -
             message: "#Right side of \\|\\| is always true\\.$#"
             count: 1

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,10 @@ parameters:`
`4`	`4`	`message: "#^Parameter \\#2 \\$response of method FluidTYPO3\\\\Vhs\\\\Proxy\\\\DispatcherProxy\\:\\:dispatch\\(\\) expects TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Response\\\|null, \\(TYPO3\\\\CMS\\\\Core\\\\Http\\\\Response\\&TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Web\\\\Response\\)\\\|\\(TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\ResponseInterface\\&TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Web\\\\Response\\)\\\|null given\\.$#"`
`5`	`5`	`count: 1`
`6`	`6`	`path: Classes/ViewHelpers/Render/RequestViewHelper.php`
	`7`	`+ -`
	`8`	`+ message: "#^Parameter \\#2 \\$response of method FluidTYPO3\\\\Vhs\\\\Proxy\\\\DispatcherProxy\\:\\:dispatch\\(\\) expects TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Response\\\|null, \\(TYPO3\\\\CMS\\\\Core\\\\Http\\\\Response\\&TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Web\\\\Response\\)\\\|\\(TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\ResponseInterface\\&TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Web\\\\Response\\)\\\|null given\\.$#"`
	`9`	`+ count: 1`
	`10`	`+ path: Classes/Proxy/DispatcherProxy.php`
`7`	`11`	`-`
`8`	`12`	`message: "#^Method TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Dispatcher\\:\\:dispatch\\(\\) invoked with 2 parameters, 1 required\\.$#"`
`9`	`13`	`count: 1`
`@@ -31,7 +35,7 @@ parameters:`
`31`	`35`	`-`
`32`	`36`	`message: "#^Call to an undefined method TYPO3\\\\CMS\\\\Core\\\\Database\\\\Query\\\\QueryBuilder\\:\\:execute\\(\\)\\.$#"`
`33`	`37`	`count: 1`
`34`		`- path: Classes/Utility/DoctrineQueryProxy.php`
	`38`	`+ path: Classes/Proxy/DoctrineQueryProxy.php`
`35`	`39`	`-`
`36`	`40`	`message: "#^Access to undefined constant TYPO3\\\\CMS\\\\Core\\\\Domain\\\\Repository\\\\PageRepository\\:\\:DOKTYPE_RECYCLER\\.$#"`
`37`	`41`	`count: 1`
`@@ -43,11 +47,11 @@ parameters:`
`43`	`47`	`-`
`44`	`48`	`message: "#Call to an undefined method Doctrine\\\\DBAL\\\\Driver\\\\ResultStatement\\\|Doctrine\\\\DBAL\\\\Result\\:\\:fetch\\(\\)\\.$#"`
`45`	`49`	`count: 1`
`46`		`- path: Classes/Utility/DoctrineQueryProxy.php`
	`50`	`+ path: Classes/Proxy/DoctrineQueryProxy.php`
`47`	`51`	`-`
`48`	`52`	`message: "#Call to an undefined method Doctrine\\\\DBAL\\\\Driver\\\\ResultStatement\\\|Doctrine\\\\DBAL\\\\Result\\:\\:fetchAll\\(\\)\\.$#"`
`49`	`53`	`count: 1`
`50`		`- path: Classes/Utility/DoctrineQueryProxy.php`
	`54`	`+ path: Classes/Proxy/DoctrineQueryProxy.php`
`51`	`55`	`-`
`52`	`56`	`message: "#^Access to protected property TYPO3\\\\CMS\\\\Core\\\\Domain\\\\Repository\\\\PageRepository\\:\\:\\$where_groupAccess\\.$#"`
`53`	`57`	`count: 1`
`@@ -79,15 +83,15 @@ parameters:`
`79`	`83`	`-`
`80`	`84`	`message: "#^Method TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Dispatcher\\:\\:dispatch\\(\\) invoked with 2 parameters, 1 required\\.$#"`
`81`	`85`	`count: 1`
`82`		`- path: Classes/Utility/DispatcherProxy.php`
	`86`	`+ path: Classes/Proxy/DispatcherProxy.php`
`83`	`87`	`-`
`84`	`88`	`message: "#^Parameter \\#1 \\$controllerClassName of class TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Request constructor expects string, Psr\\\\Http\\\\Message\\\\ServerRequestInterface given\\.$#"`
`85`	`89`	`count: 1`
`86`	`90`	`path: Classes/ViewHelpers/Render/RequestViewHelper.php`
`87`	`91`	`-`
`88`	`92`	`message: "#^Parameter \\#2 \\$response of method TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Dispatcher\\:\\:dispatch\\(\\) expects TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\ResponseInterface, TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Response\\\|null given\\.$#"`
`89`	`93`	`count: 1`
`90`		`- path: Classes/Utility/DispatcherProxy.php`
	`94`	`+ path: Classes/Proxy/DispatcherProxy.php`
`91`	`95`	`-`
`92`	`96`	`message: "#Right side of \\\|\\\| is always true\\.$#"`
`93`	`97`	`count: 1`