Merge 3.x into 4.x

sonata-project · May 10, 2023 · c089242 · c089242
2 parents 0b3a012 + 382d90f
commit c089242
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 8 deletions.
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -38,7 +38,6 @@ jobs:
               uses: ramsey/composer-install@v2
               with:
                   dependency-versions: highest
-                  composer-options: --prefer-dist --prefer-stable
 
             - name: Lint PHP files
               run: make lint-php

diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml
@@ -38,7 +38,6 @@ jobs:
               uses: ramsey/composer-install@v2
               with:
                   dependency-versions: highest
-                  composer-options: --prefer-dist --prefer-stable
 
             - name: PHPStan
               run: vendor/bin/phpstan --no-progress --memory-limit=1G analyse --error-format=github
@@ -64,7 +63,6 @@ jobs:
               uses: ramsey/composer-install@v2
               with:
                   dependency-versions: highest
-                  composer-options: --prefer-dist --prefer-stable
 
             - name: Psalm
               run: vendor/bin/psalm --no-progress --show-info=false --stats --output-format=github --threads=$(nproc) --shepherd --php-version=8.2
@@ -90,7 +88,6 @@ jobs:
               uses: ramsey/composer-install@v2
               with:
                   dependency-versions: highest
-                  composer-options: --prefer-dist --prefer-stable
 
             - name: Rector
               run: vendor/bin/rector --no-progress-bar --dry-run
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -58,6 +58,11 @@ jobs:
                       allowed-to-fail: false
                       symfony-require: 6.2.*
                       variant: symfony/symfony:"6.2.*"
+                    - php-version: '8.2'
+                      dependencies: highest
+                      allowed-to-fail: false
+                      symfony-require: 6.3.*
+                      variant: symfony/symfony:"6.3.*"
 
         steps:
             - name: Checkout
@@ -88,7 +93,6 @@ jobs:
               uses: ramsey/composer-install@v2
               with:
                   dependency-versions: ${{ matrix.dependencies }}
-                  composer-options: --prefer-dist --prefer-stable
 
             - name: Run Tests with coverage
               run: make coverage

diff --git a/composer.json b/composer.json
@@ -61,6 +61,8 @@
         "symfony/property-access": "To be able to export from database entities",
         "symfony/routing": "To be able to export the routes of a Symfony app"
     },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "autoload": {
         "psr-4": {
             "Sonata\\Exporter\\": "src/",

diff --git a/src/Writer/SitemapWriter.php b/src/Writer/SitemapWriter.php
@@ -253,7 +253,13 @@ private function fixDataType(array &$data): void
      */
     private function generateDefaultLine(array $data): string
     {
-        return sprintf('    <url><loc>%s</loc><lastmod>%s</lastmod><changefreq>%s</changefreq><priority>%s</priority></url>'."\n", $data['url'], date('Y-m-d', strtotime($data['lastmod'])), $data['changefreq'], $data['priority']);
+        return sprintf(
+            '    <url><loc>%s</loc><lastmod>%s</lastmod><changefreq>%s</changefreq><priority>%s</priority></url>'."\n",
+            $data['url'],
+            (new \DateTime($data['lastmod']))->format('Y-m-d'),
+            $data['changefreq'],
+            $data['priority']
+        );
     }
 
     /**

diff --git a/tests/Writer/SitemapWriterTest.php b/tests/Writer/SitemapWriterTest.php
@@ -195,8 +195,14 @@ public function testLimitUrl(): void
         static::assertNotFalse($info);
 
         static::assertLessThan(SitemapWriter::LIMIT_SIZE, $info['size']);
-        static::assertCount(SitemapWriter::LIMIT_URL, $file1->children());
-        static::assertCount(1, iterator_to_array($file2->children()));
+
+        $file1Children = $file1->children();
+        $file2Children = $file2->children();
+
+        static::assertNotNull($file1Children);
+        static::assertNotNull($file2Children);
+        static::assertCount(SitemapWriter::LIMIT_URL, $file1Children);
+        static::assertCount(1, iterator_to_array($file2Children));
     }
 
     /**