Merge branch 'sascha-egerer:master' into master

Author: derhansen

extension.neon

@@ -141,6 +141,7 @@ parameters:
             routing: TYPO3\CMS\Core\Routing\SiteRouteResult|TYPO3\CMS\Core\Routing\PageArguments
             currentContentObject: TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer
             frontend.controller: TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController
+            frontend.page.information: TYPO3\CMS\Frontend\Page\PageInformation
             frontend.typoscript: TYPO3\CMS\Core\TypoScript\FrontendTypoScript
             extbase: TYPO3\CMS\Extbase\Mvc\ExtbaseRequestParameters
             frontend.page.information: TYPO3\CMS\Frontend\Page\PageInformation
@@ -155,7 +156,7 @@ parameters:
             websiteTitle: string
     stubFiles:
         - stubs/DomainObjectInterface.stub
-        - stubs/EventDispatcher.stub
+        - stubs/EventDispatcherInterface.stub
         - stubs/ObjectStorage.stub
         - stubs/QueryFactory.stub
         - stubs/QueryInterface.stub

stubs/EventDispatcher.stub renamed to stubs/EventDispatcherInterface.stub

@@ -15,42 +15,43 @@ class ObjectStorage implements \Iterator, \ArrayAccess
     protected $storage;
 
     /**
-     * @param TEntity $value
+     * @param TEntity|string|null $value
      * @param mixed $information
      */
     public function offsetSet($value, $information);
 
     /**
-     * @param TEntity|int $value
+     * @param TEntity|int|string $value
      * @return bool
      */
     public function offsetExists($value);
 
     /**
-     * @param TEntity|int $value
+     * @param TEntity|int|string $value
      */
     public function offsetUnset($value);
 
     /**
-     * @param TEntity|int $value
+     * @param TEntity|int|string $value
      * @return ($value is int ? TEntity|null : mixed)
      */
     public function offsetGet($value);
 
     /**
      * This is different from the SplObjectStorage as the key in this implementation is the object hash (string).
      * @phpstan-ignore-next-line See https://forge.typo3.org/issues/98146
-     * @return string|null
+     * @return string
      */
+    // @phpstan-ignore-next-line See https://forge.typo3.org/issues/98146
     public function key();
 
     /**
-     * @return array<TEntity>
+     * @return list<TEntity>
      */
     public function toArray();
 
     /**
-     * @return array<TEntity>
+     * @return list<TEntity>
      */
     public function getArray();
 

stubs/ObjectStorage.stub

@@ -6,9 +6,14 @@ namespace TYPO3\CMS\Extbase\Persistence;
  */
 interface QueryInterface
 {
+    // We have to define the constants here to be able to use them in other stubs.
+    // See https://phpstan.org/user-guide/stub-files
+    public const ORDER_ASCENDING = 'ASC';
+    public const ORDER_DESCENDING = 'DESC';
+    
     /**
      * @param bool $returnRawQueryResult
-     * @return \TYPO3\CMS\Extbase\Persistence\QueryResultInterface<ModelType>|array<string, mixed>
+     * @return \TYPO3\CMS\Extbase\Persistence\QueryResultInterface<ModelType>|list<array<string, mixed>>
      */
     public function execute($returnRawQueryResult = false);
 

stubs/QueryInterface.stub

@@ -10,7 +10,7 @@ use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
 class QueryResult implements QueryResultInterface
 {
     /**
-     * @return null|ModelType
+     * @return ModelType|null
      */
     public function getFirst();
 }

stubs/QueryResult.stub

@@ -14,12 +14,12 @@ interface QueryResultInterface extends \Countable, \Iterator, \ArrayAccess
     public function getQuery();
 
     /**
-     * @return null|ModelType
+     * @return ModelType|null
      */
     public function getFirst();
 
     /**
-     * @return ModelType[]
+     * @return list<ModelType>
      */
     public function toArray();
 }

stubs/QueryResultInterface.stub

@@ -47,7 +47,7 @@ class Repository
     public function findByIdentifier($identifier);
 
     /**
-     * @phpstan-param array<string,string> $defaultOrderings
+     * @phpstan-param array<non-empty-string, QueryInterface::ORDER_*> $defaultOrderings
      * @phpstan-return void
      */
     public function setDefaultOrderings($defaultOrderings);