TASK: Load stubs depending on TYPO3 version

This reverts commit a30c83a.
sascha-egerer · Feb 15, 2024 · bb14d3e · bb14d3e
1 parent a30c83a
commit bb14d3e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 25 deletions.
diff --git a/extension.neon b/extension.neon
@@ -140,17 +140,9 @@ parameters:
             routeEnhancers: array
             websiteTitle: string
     stubFiles:
-        - stubs/DomainObjectInterface.stub
         - stubs/EventDispatcher.stub
         - stubs/ObjectStorage.stub
-        - stubs/QueryFactory.stub
-        - stubs/QueryInterface.stub
-        - stubs/QueryResultInterface.stub
-        - stubs/Repository.stub
-        # See SaschaEgerer\PhpstanTypo3\Stubs\StubFilesExtensionLoader
-        # GeneralUtility.stub is only used if TYPO3 version is < 12
-        #- stubs/GeneralUtility.stub
-        #- stubs/QueryResult.stub
+        # Some stubs are loaded depending on the TYPO3 version used. See SaschaEgerer\PhpstanTypo3\Stubs\StubFilesExtensionLoader
     dynamicConstantNames:
         - TYPO3_MODE
         - TYPO3_REQUESTTYPE

diff --git a/src/Stubs/StubFilesExtensionLoader.php b/src/Stubs/StubFilesExtensionLoader.php
@@ -20,7 +20,12 @@ public function getFiles(): array
 			$files[] = $stubsDir . '/GeneralUtility.stub';
 		}
 		if ($versionParser->parseConstraints($typo3Version->getVersion())->matches($versionParser->parseConstraints('<= 12.2.0'))) {
-			$files[] = $stubsDir . '/QueryResult.stub';
+			$files[] = $stubsDir . '/QueryFactory.stub';
+			$files[] = $stubsDir . '/QueryFactory.stub';
+			$files[] = $stubsDir . '/Repository.stub';
+			$files[] = $stubsDir . '/DomainObjectInterface.stub';
+			$files[] = $stubsDir . '/QueryInterface.stub';
+			$files[] = $stubsDir . '/QueryResultInterface.stub';
 		}
 
 		return $files;

diff --git a/stubs/QueryInterface.stub b/stubs/QueryInterface.stub
@@ -6,9 +6,6 @@ namespace TYPO3\CMS\Extbase\Persistence;
  */
 interface QueryInterface
 {
-    public const ORDER_ASCENDING = 'ASC';
-    public const ORDER_DESCENDING = 'DESC';
-
     /**
      * @param bool $returnRawQueryResult
      * @return \TYPO3\CMS\Extbase\Persistence\QueryResultInterface<ModelType>|array<string, mixed>

diff --git a/stubs/Repository.stub b/stubs/Repository.stub
@@ -61,11 +61,4 @@ class Repository
      * @phpstan-return class-string<static>
      */
     protected function getRepositoryClassName();
-
-    /**
-     * @phpstan-param array<non-empty-string, mixed> $criteria
-     * @phpstan-param array<non-empty-string, QueryInterface::ORDER_*>|null $orderBy
-     * @phpstan-return QueryResultInterface<TEntityClass>|list<TEntityClass>
-     */
-    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null);
 }
diff --git a/tests/Unit/Type/data/repository-stub-files.php b/tests/Unit/Type/data/repository-stub-files.php
@@ -159,11 +159,6 @@ public function myTests(): void
 			'array<int, RepositoryStubFiles\My\Test\Extension\Domain\Model\MyModel>|TYPO3\CMS\Extbase\Persistence\QueryResultInterface<RepositoryStubFiles\My\Test\Extension\Domain\Model\MyModel>',
 			$this->findAll()
 		);
-
-		assertType(
-			'array<int, RepositoryStubFiles\My\Test\Extension\Domain\Model\MyModel>|TYPO3\CMS\Extbase\Persistence\QueryResultInterface<RepositoryStubFiles\My\Test\Extension\Domain\Model\MyModel>',
-			$this->findBy(['foo' => 'baz'])
-		);
 	}
 
 	public function findAll() // phpcs:ignore SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingAnyTypeHint