Merge 4.x into 5.x

sonata-project · Dec 10, 2021 · f2362a0 · f2362a0
2 parents 5e16306 + 96690e5
commit f2362a0
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 23 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -2,4 +2,4 @@
 #
 # It's auto-generated by sonata-project/dev-kit package.
 
-github: [greg0ire, OskarStark, core23, wbloszyk]
+github: [greg0ire, OskarStark, core23, VincentLanglet]
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -46,7 +46,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.0'
+                  php-version: '8.1'
                   coverage: none
                   tools: composer:v2, composer-normalize:2
               env:

diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml
@@ -25,7 +25,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.0'
+                  php-version: '8.1'
                   coverage: none
                   tools: composer:v2
                   extensions: mongodb, gd
@@ -50,7 +50,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.0'
+                  php-version: '8.1'
                   coverage: none
                   tools: composer:v2
                   extensions: mongodb, gd
@@ -62,4 +62,4 @@ jobs:
                   composer-options: --prefer-dist --prefer-stable
 
             - name: Psalm
-              run: vendor/bin/psalm --show-info=false --stats --output-format=github --threads=$(nproc) --shepherd --php-version=8.0
+              run: vendor/bin/psalm --show-info=false --stats --output-format=github --threads=$(nproc) --shepherd --php-version=8.1
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -34,6 +34,7 @@ jobs:
                 php-version:
                     - '7.4'
                     - '8.0'
+                    - '8.1'
                 dependencies: [highest]
                 allowed-to-fail: [false]
                 symfony-require: ['']
@@ -43,22 +44,22 @@ jobs:
                       dependencies: lowest
                       allowed-to-fail: false
                       variant: normal
-                    - php-version: '8.0'
+                    - php-version: '8.1'
                       dependencies: highest
                       allowed-to-fail: false
                       symfony-require: 4.4.*
                       variant: symfony/symfony:"4.4.*"
-                    - php-version: '8.0'
+                    - php-version: '8.1'
                       dependencies: highest
                       allowed-to-fail: false
                       symfony-require: 5.3.*
                       variant: symfony/symfony:"5.3.*"
-                    - php-version: '8.0'
+                    - php-version: '8.1'
                       dependencies: highest
                       allowed-to-fail: false
                       symfony-require: 5.4.*
                       variant: symfony/symfony:"5.4.*"
-                    - php-version: '8.0'
+                    - php-version: '8.1'
                       dependencies: highest
                       allowed-to-fail: false
                       symfony-require: 6.0.*

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - [[#2214](https://github.com/sonata-project/SonataMediaBundle/pull/2214)] Fix block service registration ([@core23](https://github.com/core23))
 
 ## [4.0.0-alpha1](https://github.com/sonata-project/SonataMediaBundle/compare/3.35.1...4.0.0-alpha1) - 2021-10-21
+
+## [3.37.1](https://github.com/sonata-project/SonataMediaBundle/compare/3.37.0...3.37.1) - 2021-12-09
+### Fixed
+- [[#2245](https://github.com/sonata-project/SonataMediaBundle/pull/2245)] `src/Resources/views/MediaAdmin/inner_row_media.html.twig` ([@cezar77](https://github.com/cezar77))
+
+## [3.37.0](https://github.com/sonata-project/SonataMediaBundle/compare/3.356...3.37.0) - 2021-11-17
 ### Added
 - [[#2164](https://github.com/sonata-project/SonataMediaBundle/pull/2164)] Added property type hints ([@jordisala1991](https://github.com/jordisala1991))
 

diff --git a/src/DependencyInjection/SonataMediaExtension.php b/src/DependencyInjection/SonataMediaExtension.php
@@ -165,12 +165,9 @@ public function configureProviders(ContainerBuilder $container, array $config):
      */
     public function configureParameterClass(ContainerBuilder $container, array $config): void
     {
-        $container->setParameter('sonata.media.admin.media.entity', $config['class']['media']);
-        $container->setParameter('sonata.media.admin.gallery.entity', $config['class']['gallery']);
-        $container->setParameter('sonata.media.admin.gallery_item.entity', $config['class']['gallery_item']);
-
         $container->setParameter('sonata.media.media.class', $config['class']['media']);
         $container->setParameter('sonata.media.gallery.class', $config['class']['gallery']);
+        $container->setParameter('sonata.media.gallery_item.class', $config['class']['gallery_item']);
 
         $container->getDefinition('sonata.media.form.type.media')->replaceArgument(1, $config['class']['media']);
     }

diff --git a/src/Resources/config/doctrine_mongodb_admin.php b/src/Resources/config/doctrine_mongodb_admin.php
@@ -35,7 +35,7 @@
             ])
             ->args([
                 '',
-                '%sonata.media.admin.media.entity%',
+                '%sonata.media.media.class%',
                 'sonata.media.controller.media.admin',
                 new ReferenceConfigurator('sonata.media.pool'),
                 (new ReferenceConfigurator('sonata.media.manager.category'))->nullOnInvalid(),
@@ -61,7 +61,7 @@
             ])
             ->args([
                 '',
-                '%sonata.media.admin.gallery.entity%',
+                '%sonata.media.gallery.class%',
                 'sonata.media.controller.gallery.admin',
                 new ReferenceConfigurator('sonata.media.pool'),
             ])
@@ -82,7 +82,7 @@
             ])
             ->args([
                 '',
-                '%sonata.media.admin.gallery_item.entity%',
+                '%sonata.media.gallery_item.class%',
                 '%sonata.admin.configuration.default_controller%',
             ])
             ->call('setTranslationDomain', ['SonataMediaBundle']);

diff --git a/src/Resources/config/doctrine_orm_admin.php b/src/Resources/config/doctrine_orm_admin.php
@@ -35,7 +35,7 @@
             ])
             ->args([
                 '',
-                '%sonata.media.admin.media.entity%',
+                '%sonata.media.media.class%',
                 'sonata.media.controller.media.admin',
                 new ReferenceConfigurator('sonata.media.pool'),
                 (new ReferenceConfigurator('sonata.media.manager.category'))->nullOnInvalid(),
@@ -62,7 +62,7 @@
             ])
             ->args([
                 '',
-                '%sonata.media.admin.gallery.entity%',
+                '%sonata.media.gallery.class%',
                 'sonata.media.controller.gallery.admin',
                 new ReferenceConfigurator('sonata.media.pool'),
             ])
@@ -83,7 +83,7 @@
             ])
             ->args([
                 '',
-                '%sonata.media.admin.gallery_item.entity%',
+                '%sonata.media.gallery_item.class%',
                 '%sonata.admin.configuration.default_controller%',
             ])
             ->call('setTranslationDomain', ['SonataMediaBundle']);

diff --git a/src/Resources/views/MediaAdmin/inner_row_media.html.twig b/src/Resources/views/MediaAdmin/inner_row_media.html.twig
@@ -15,7 +15,7 @@ file that was distributed with this source code.
     <div class="col-sm-12">
         <div class="pull-left">
             {% if admin.isGranted('EDIT', object) and admin.hasRoute('edit') %}
-                <a href="{{ admin.generateObjectUrl('edit', object) }) }}" style="float: left; margin-right: 6px;">
+                <a href="{{ admin.generateObjectUrl('edit', object) }}" style="float: left; margin-right: 6px;">
                     {{ sonata_thumbnail(object, 'admin', {'width': 90}) }}
                 </a>
             {% else %}
@@ -24,7 +24,7 @@ file that was distributed with this source code.
         </div>
         <span class="badge pull-right">{{ object.providerName|trans({}, 'SonataMediaBundle') }}</span>
         {% if admin.isGranted('EDIT', object) and admin.hasRoute('edit') %}
-            <a href="{{ admin.generateObjectUrl('edit', object }) }}"><strong>{{ object.name }}</strong></a>
+            <a href="{{ admin.generateObjectUrl('edit', object) }}"><strong>{{ object.name }}</strong></a>
         {% else %}
             <strong>{{ object.name }}</strong>
         {% endif %}

diff --git a/tests/Validator/Constraints/ImageUploadDimensionValidatorTest.php b/tests/Validator/Constraints/ImageUploadDimensionValidatorTest.php
@@ -142,10 +142,10 @@ private function mockImage(int $width, int $height): object
     /**
      * @return Stub&MediaInterface
      */
-    private function mockMedia(): object
+    private function mockMedia(): Stub
     {
         $binaryContent = $this->createStub(UploadedFile::class);
-        $binaryContent->method('getPathname')->willReturn(tmpfile());
+        $binaryContent->method('getPathname')->willReturn('pathname');
 
         $media = $this->createStub(MediaInterface::class);
         $media->method('getContext')->willReturn(self::TEST_CONTEXT);