Merge 4.x into 5.x

sonata-project · Mar 11, 2023 · aee1da2 · aee1da2
2 parents af5088c + 694efc7
commit aee1da2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -92,6 +92,6 @@ jobs:
               run: make coverage
 
             - name: Send coverage to Codecov
-              uses: codecov/codecov-action@v2
+              uses: codecov/codecov-action@v3
               with:
-                  file: build/logs/clover.xml
+                  files: build/logs/clover.xml
diff --git a/docs/reference/data_source.rst b/docs/reference/data_source.rst
@@ -11,32 +11,30 @@ Here's one way to do it:
 
 1. Decorate the default Sonata\DoctrineORMAdminBundle\Exporter\DataSource with your own and call ``setDateTimeFormat`` there.::
 
-      <?php
-      
       namespace App\Service\Admin;
-      
+
       use Sonata\AdminBundle\Datagrid\ProxyQueryInterface;
       use Sonata\AdminBundle\Exporter\DataSourceInterface;
       use Sonata\DoctrineORMAdminBundle\Exporter\DataSource;
       use Sonata\Exporter\Source\DoctrineORMQuerySourceIterator;
       use Sonata\Exporter\Source\SourceIteratorInterface;
-      
+
       class DecoratingDataSource implements DataSourceInterface
       {
           private DataSource $dataSource;
-          
+
           public function __construct(DataSource $dataSource)
           {
               $this->dataSource = $dataSource;
           }
-          
+
           public function createIterator(ProxyQueryInterface $query, array $fields): SourceIteratorInterface
           {
               /** @var DoctrineORMQuerySourceIterator $iterator */
               $iterator = $this->dataSource->createIterator($query, $fields);
-              
-              $iterator->setDateTimeFormat('Y-m-d H:i:s');              
-              
+
+              $iterator->setDateTimeFormat('Y-m-d H:i:s');
+
               return $iterator;
           }
       }
@@ -48,6 +46,4 @@ Here's one way to do it:
           ...
           App\Service\Admin\DecoratingDataSource:
               decorates: 'sonata.admin.data_source.orm'
-              arguments: ['@App\Services\Admin\DecoratingDataSource.inner']              
-
-
+              arguments: ['@App\Services\Admin\DecoratingDataSource.inner']