Fix changed date for sitemape

sulu · Mar 18, 2024 · 41b8c02 · 41b8c02
1 parent 9798dd3
commit 41b8c02
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 37 deletions.
diff --git a/Content/ArticleDataProvider.php b/Content/ArticleDataProvider.php
@@ -176,6 +176,7 @@ public function resolveDataItems(
         $filters['types'] = $this->getTypesProperty($propertyParameter);
         $filters['excluded'] = $this->getExcludedFilter($filters, $propertyParameter);
 
+        /** @var string|null $locale */
         $locale = $options['locale'];
         $webspaceKey = $this->getWebspaceKey($propertyParameter, $options);
         $queryResult = $this->getSearchResult($filters, $limit, $page, $pageSize, $locale, $webspaceKey);
@@ -206,6 +207,7 @@ public function resolveResourceItems(
         $filters['types'] = $this->getTypesProperty($propertyParameter);
         $filters['excluded'] = $this->getExcludedFilter($filters, $propertyParameter);
 
+        /** @var string|null $locale */
         $locale = $options['locale'];
         $webspaceKey = $this->getWebspaceKey($propertyParameter, $options);
         $queryResult = $this->getSearchResult($filters, $limit, $page, $pageSize, $locale, $webspaceKey);

diff --git a/Content/PageTreeArticleDataProvider.php b/Content/PageTreeArticleDataProvider.php
@@ -35,7 +35,9 @@ public function resolveDatasource($datasource, array $propertyParameter, array $
             return null;
         }
 
-        $document = $this->documentManager->find($datasource, $options['locale']);
+        /** @var string|null $locale */
+        $locale = $options['locale'];
+        $document = $this->documentManager->find($datasource, $locale);
 
         if (!$document instanceof BasePageDocument) {
             return null;

diff --git a/Sitemap/ArticleSitemapProvider.php b/Sitemap/ArticleSitemapProvider.php
@@ -109,6 +109,7 @@ protected function buildUrl(
         return new SitemapUrl(
             $this->findUrl($articleView, $scheme, $host, $webspaceKey),
             $articleView->getLocale(),
+            null,
             $articleView->getChanged()
         );
     }

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -170,36 +170,11 @@ parameters:
 			count: 1
 			path: Content/ArticleDataProvider.php
 
-		-
-			message: "#^Method Sulu\\\\Bundle\\\\ArticleBundle\\\\Content\\\\ArticleDataProvider\\:\\:resolveDataItems\\(\\) has parameter \\$filters with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: Content/ArticleDataProvider.php
-
-		-
-			message: "#^Method Sulu\\\\Bundle\\\\ArticleBundle\\\\Content\\\\ArticleDataProvider\\:\\:resolveDataItems\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: Content/ArticleDataProvider.php
-
-		-
-			message: "#^Method Sulu\\\\Bundle\\\\ArticleBundle\\\\Content\\\\ArticleDataProvider\\:\\:resolveDatasource\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: Content/ArticleDataProvider.php
-
 		-
 			message: "#^Method Sulu\\\\Bundle\\\\ArticleBundle\\\\Content\\\\ArticleDataProvider\\:\\:resolveDatasource\\(\\) should return Sulu\\\\Component\\\\SmartContent\\\\DatasourceItemInterface but empty return statement found\\.$#"
 			count: 1
 			path: Content/ArticleDataProvider.php
 
-		-
-			message: "#^Method Sulu\\\\Bundle\\\\ArticleBundle\\\\Content\\\\ArticleDataProvider\\:\\:resolveResourceItems\\(\\) has parameter \\$filters with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: Content/ArticleDataProvider.php
-
-		-
-			message: "#^Method Sulu\\\\Bundle\\\\ArticleBundle\\\\Content\\\\ArticleDataProvider\\:\\:resolveResourceItems\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: Content/ArticleDataProvider.php
-
 		-
 			message: "#^Negated boolean expression is always false\\.$#"
 			count: 1
@@ -280,18 +255,13 @@ parameters:
 			count: 1
 			path: Content/PageTreeArticleDataProvider.php
 
-		-
-			message: "#^Method Sulu\\\\Bundle\\\\ArticleBundle\\\\Content\\\\PageTreeArticleDataProvider\\:\\:resolveDatasource\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: Content/PageTreeArticleDataProvider.php
-
 		-
 			message: "#^Method Sulu\\\\Bundle\\\\ArticleBundle\\\\Content\\\\PageTreeArticleDataProvider\\:\\:resolveDatasource\\(\\) should return Sulu\\\\Component\\\\SmartContent\\\\DatasourceItemInterface but returns null\\.$#"
 			count: 2
 			path: Content/PageTreeArticleDataProvider.php
 
 		-
-			message: "#^Parameter \\#1 \\$identifier of method Sulu\\\\Component\\\\DocumentManager\\\\DocumentManagerInterface\\:\\:find\\(\\) expects string, mixed given\\.$#"
+			message: "#^Parameter \\#1 \\$identifier of method Sulu\\\\Component\\\\DocumentManager\\\\DocumentManagerInterface\\:\\:find\\(\\) expects string, int\\<min, \\-1\\>\\|int\\<1, max\\>\\|string given\\.$#"
 			count: 1
 			path: Content/PageTreeArticleDataProvider.php
 
@@ -2075,6 +2045,16 @@ parameters:
 			count: 1
 			path: Import/ImportResult.php
 
+		-
+			message: "#^Parameter \\#1 \\$filters of method Sulu\\\\Component\\\\SmartContent\\\\DataProviderInterface\\:\\:resolveResourceItems\\(\\) expects array\\{dataSource\\?\\: int\\|string\\|null, sortMethod\\?\\: 'asc'\\|'desc', sortBy\\?\\: string, tags\\?\\: array\\<string\\>, tagOperator\\?\\: 'and'\\|'or', types\\?\\: array\\<string\\>, categories\\?\\: array\\<int\\>, categoryOperator\\?\\: 'and'\\|'or', \\.\\.\\.\\}, array given\\.$#"
+			count: 1
+			path: Infrastructure/Sulu/Headless/DataProviderResolver/AbstractArticleDataProviderResolver.php
+
+		-
+			message: "#^Parameter \\#1 \\$filters of method Sulu\\\\Component\\\\SmartContent\\\\DataProviderInterface\\:\\:resolveResourceItems\\(\\) expects array\\{dataSource\\?\\: int\\|string\\|null, sortMethod\\?\\: 'asc'\\|'desc', sortBy\\?\\: string, tags\\?\\: array\\<string\\>, tagOperator\\?\\: 'and'\\|'or', types\\?\\: array\\<string\\>, categories\\?\\: array\\<int\\>, categoryOperator\\?\\: 'and'\\|'or', \\.\\.\\.\\}, array given\\.$#"
+			count: 1
+			path: Infrastructure/SuluHeadlessBundle/DataProviderResolver/AbstractArticleDataProviderResolver.php
+
 		-
 			message: "#^Method Sulu\\\\Bundle\\\\ArticleBundle\\\\ListBuilder\\\\ElasticSearchFieldDescriptorBuilder\\:\\:setSearchability\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -2385,11 +2365,6 @@ parameters:
 			count: 1
 			path: Sitemap/ArticleSitemapProvider.php
 
-		-
-			message: "#^Parameter \\#3 \\$defaultLocale of class Sulu\\\\Bundle\\\\WebsiteBundle\\\\Sitemap\\\\SitemapUrl constructor expects string\\|null, DateTime given\\.$#"
-			count: 1
-			path: Sitemap/ArticleSitemapProvider.php
-
 		-
 			message: "#^Cannot call method getExcerpt\\(\\) on mixed\\.$#"
 			count: 1