Merge branch '3.x' into master

sonata-project · Jul 10, 2019 · 2bbc8cd · 2bbc8cd
2 parents 8687d3c + f1bf151
commit 2bbc8cd
Show file tree

Hide file tree

Showing 68 changed files with 62 additions and 446 deletions.
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -28,6 +28,7 @@ $rules = [
     ],
     'no_extra_blank_lines' => true,
     'no_php4_constructor' => true,
+    'no_superfluous_phpdoc_tags' => ['allow_mixed' => true],
     'no_useless_else' => true,
     'no_useless_return' => true,
     'ordered_class_elements' => true,

diff --git a/src/Admin/BaseMediaAdmin.php b/src/Admin/BaseMediaAdmin.php
@@ -42,7 +42,6 @@ abstract class BaseMediaAdmin extends AbstractAdmin
      * @param string                   $code
      * @param string                   $class
      * @param string                   $baseControllerName
-     * @param Pool                     $pool
      * @param CategoryManagerInterface $categoryManager
      */
     public function __construct($code, $class, $baseControllerName, Pool $pool, CategoryManagerInterface $categoryManager = null)

diff --git a/src/Admin/GalleryAdmin.php b/src/Admin/GalleryAdmin.php
@@ -34,7 +34,6 @@ class GalleryAdmin extends AbstractAdmin
      * @param string $code
      * @param string $class
      * @param string $baseControllerName
-     * @param Pool   $pool
      */
     public function __construct($code, $class, $baseControllerName, Pool $pool)
     {

diff --git a/src/Block/GalleryBlockService.php b/src/Block/GalleryBlockService.php
@@ -51,10 +51,7 @@ class GalleryBlockService extends AbstractAdminBlockService
     protected $galleryManager;
 
     /**
-     * @param string             $name
-     * @param EngineInterface    $templating
-     * @param ContainerInterface $container
-     * @param ManagerInterface   $galleryManager
+     * @param string $name
      */
     public function __construct($name, EngineInterface $templating, ContainerInterface $container, ManagerInterface $galleryManager)
     {

diff --git a/src/Block/GalleryListBlockService.php b/src/Block/GalleryListBlockService.php
@@ -41,10 +41,7 @@ class GalleryListBlockService extends AbstractAdminBlockService
     protected $pool;
 
     /**
-     * @param string                  $name
-     * @param EngineInterface         $templating
-     * @param GalleryManagerInterface $galleryManager
-     * @param Pool                    $pool
+     * @param string $name
      */
     public function __construct($name, EngineInterface $templating, GalleryManagerInterface $galleryManager, Pool $pool)
     {

diff --git a/src/Block/MediaBlockService.php b/src/Block/MediaBlockService.php
@@ -49,10 +49,7 @@ class MediaBlockService extends AbstractAdminBlockService
     protected $mediaManager;
 
     /**
-     * @param string             $name
-     * @param EngineInterface    $templating
-     * @param ContainerInterface $container
-     * @param ManagerInterface   $mediaManager
+     * @param string $name
      */
     public function __construct($name, EngineInterface $templating, ContainerInterface $container, ManagerInterface $mediaManager)
     {
@@ -203,8 +200,6 @@ public function getBlockMetadata($code = null)
     }
 
     /**
-     * @param MediaInterface|null $media
-     *
      * @return array
      */
     protected function getFormatChoices(MediaInterface $media = null)
@@ -225,8 +220,6 @@ protected function getFormatChoices(MediaInterface $media = null)
     }
 
     /**
-     * @param FormMapper $formMapper
-     *
      * @return FormBuilder
      */
     protected function getMediaBuilder(FormMapper $formMapper)

diff --git a/src/CDN/CDNInterface.php b/src/CDN/CDNInterface.php
@@ -52,7 +52,6 @@ public function flushByString($string);
     /**
      * Flush a set of resources matching the paths in provided array.
      *
-     * @param array $paths
      *
      * @return void|string
      */

diff --git a/src/CDN/CloudFront.php b/src/CDN/CloudFront.php
@@ -150,8 +150,6 @@ public function flushPaths(array $paths)
 
     /**
      * For testing only.
-     *
-     * @param CloudFrontClient $client
      */
     public function setClient(CloudFrontClient $client): void
     {
@@ -195,7 +193,6 @@ public static function getStatusList()
     /**
      * Generates a valid caller reference from given paths regardless its order.
      *
-     * @param array $paths
      *
      * @return string a md5 representation
      */

diff --git a/src/CDN/Fallback.php b/src/CDN/Fallback.php
@@ -25,10 +25,6 @@ class Fallback implements CDNInterface
      */
     protected $fallback;
 
-    /**
-     * @param CDNInterface $cdn
-     * @param CDNInterface $fallback
-     */
     public function __construct(CDNInterface $cdn, CDNInterface $fallback)
     {
         $this->cdn = $cdn;

diff --git a/src/Command/AddMassMediaCommand.php b/src/Command/AddMassMediaCommand.php
@@ -72,9 +72,6 @@ public function execute(InputInterface $input, OutputInterface $output): void
     }
 
     /**
-     * @param InputInterface  $input
-     * @param OutputInterface $output
-     *
      * @return resource
      */
     protected function getFilePointer(InputInterface $input, OutputInterface $output)
@@ -90,10 +87,6 @@ protected function getFilePointer(InputInterface $input, OutputInterface $output
         return fopen($input->getOption('file'), 'r');
     }
 
-    /**
-     * @param array           $data
-     * @param OutputInterface $output
-     */
     protected function insertMedia(array $data, OutputInterface $output): void
     {
         $media = $this->getMediaManager()->create();

diff --git a/src/Command/RemoveThumbsCommand.php b/src/Command/RemoveThumbsCommand.php
@@ -173,8 +173,7 @@ public function getContext()
     }
 
     /**
-     * @param MediaProviderInterface $provider
-     * @param string                 $context
+     * @param string $context
      *
      * @return string
      */
@@ -203,10 +202,8 @@ public function getFormat(MediaProviderInterface $provider, $context)
     }
 
     /**
-     * @param MediaInterface         $media
-     * @param MediaProviderInterface $provider
-     * @param string                 $context
-     * @param string                 $format
+     * @param string $context
+     * @param string $format
      *
      * @return bool
      */

diff --git a/src/Consumer/CreateThumbnailConsumer.php b/src/Consumer/CreateThumbnailConsumer.php
@@ -38,11 +38,6 @@ class CreateThumbnailConsumer implements ConsumerInterface
      */
     protected $container;
 
-    /**
-     * @param ManagerInterface   $mediaManager
-     * @param Pool               $pool
-     * @param ContainerInterface $container
-     */
     public function __construct(ManagerInterface $mediaManager, Pool $pool, ContainerInterface $container)
     {
         $this->mediaManager = $mediaManager;
@@ -78,8 +73,6 @@ public function process(ConsumerEvent $event): void
     }
 
     /**
-     * @param ConsumerEvent $event
-     *
      * @return ThumbnailInterface
      */
     protected function getThumbnail(ConsumerEvent $event)

diff --git a/src/Controller/Api/GalleryController.php b/src/Controller/Api/GalleryController.php
@@ -58,10 +58,7 @@ class GalleryController
     /**
      * Constructor.
      *
-     * @param GalleryManagerInterface $galleryManager
-     * @param MediaManagerInterface   $mediaManager
-     * @param FormFactoryInterface    $formFactory
-     * @param string                  $galleryItemClass
+     * @param string $galleryItemClass
      */
     public function __construct(GalleryManagerInterface $galleryManager, MediaManagerInterface $mediaManager, FormFactoryInterface $formFactory, $galleryItemClass)
     {
@@ -109,8 +106,6 @@ public function __construct(GalleryManagerInterface $galleryManager, MediaManage
      *
      * @View(serializerGroups={"sonata_api_read"}, serializerEnableMaxDepthChecks=true)
      *
-     * @param ParamFetcherInterface $paramFetcher
-     *
      * @return PagerInterface
      */
     public function getGalleriesAction(ParamFetcherInterface $paramFetcher)
@@ -423,11 +418,6 @@ public function deleteGalleryAction($id)
     /**
      * Write a GalleryItem, this method is used by both POST and PUT action methods.
      *
-     * @param GalleryInterface     $gallery
-     * @param MediaInterface       $media
-     * @param GalleryItemInterface $galleryItem
-     * @param Request              $request
-     *
      * @return FormInterface
      */
     protected function handleWriteGalleryItem(GalleryInterface $gallery, MediaInterface $media, GalleryItemInterface $galleryItem = null, Request $request)

diff --git a/src/Controller/Api/MediaController.php b/src/Controller/Api/MediaController.php
@@ -57,10 +57,6 @@ class MediaController
 
     /**
      * Constructor.
-     *
-     * @param MediaManagerInterface $mediaManager
-     * @param Pool                  $mediaPool
-     * @param FormFactoryInterface  $formFactory
      */
     public function __construct(MediaManagerInterface $mediaManager, Pool $mediaPool, FormFactoryInterface $formFactory)
     {
@@ -84,8 +80,6 @@ public function __construct(MediaManagerInterface $mediaManager, Pool $mediaPool
      *
      * @View(serializerGroups={"sonata_api_read"}, serializerEnableMaxDepthChecks=true)
      *
-     * @param ParamFetcherInterface $paramFetcher
-     *
      * @return PagerInterface
      */
     public function getMediaAction(ParamFetcherInterface $paramFetcher)
@@ -188,9 +182,8 @@ public function getMediumFormatsAction($id)
      *  }
      * )
      *
-     * @param int     $id      The media id
-     * @param string  $format  The format
-     * @param Request $request
+     * @param int    $id     The media id
+     * @param string $format The format
      *
      * @return Response
      */
@@ -373,9 +366,6 @@ protected function getMedium($id = null)
     /**
      * Write a medium, this method is used by both POST and PUT action methods.
      *
-     * @param Request                $request
-     * @param MediaInterface         $media
-     * @param MediaProviderInterface $provider
      *
      * @return View|FormInterface
      */

diff --git a/src/Controller/GalleryAdminController.php b/src/Controller/GalleryAdminController.php
@@ -27,7 +27,6 @@ class GalleryAdminController extends Controller
 {
     /**
      * @param string   $view
-     * @param array    $parameters
      * @param Response $response
      *
      * @return Response

diff --git a/src/Controller/MediaController.php b/src/Controller/MediaController.php
@@ -25,8 +25,6 @@
 class MediaController extends Controller
 {
     /**
-     * @param MediaInterface $media
-     *
      * @return MediaProviderInterface
      */
     public function getProvider(MediaInterface $media)
@@ -45,9 +43,8 @@ public function getMedia($id)
     }
 
     /**
-     * @param Request $request
-     * @param string  $id
-     * @param string  $format
+     * @param string $id
+     * @param string $format
      *
      * @throws NotFoundHttpException
      *
@@ -75,9 +72,8 @@ public function downloadAction(Request $request, $id, $format = MediaProviderInt
     }
 
     /**
-     * @param Request $request
-     * @param string  $id
-     * @param string  $format
+     * @param string $id
+     * @param string $format
      *
      * @throws NotFoundHttpException
      *
@@ -109,9 +105,8 @@ public function viewAction(Request $request, $id, $format = MediaProviderInterfa
      * optionally saves the image and
      * outputs it to the browser at the same time.
      *
-     * @param Request $request
-     * @param string  $path
-     * @param string  $filter
+     * @param string $path
+     * @param string $filter
      *
      * @return Response
      *

diff --git a/src/DependencyInjection/Compiler/AddProviderCompilerPass.php b/src/DependencyInjection/Compiler/AddProviderCompilerPass.php
@@ -50,7 +50,6 @@ public function process(ContainerBuilder $container): void
     /**
      * NEXT_MAJOR: Remove this method.
      *
-     * @param ContainerBuilder $container
      *
      * @return array
      */
@@ -64,9 +63,6 @@ public function fixSettings(ContainerBuilder $container)
         return $this->getExtensionConfig($container);
     }
 
-    /**
-     * @param ContainerBuilder $container
-     */
     public function attachProviders(ContainerBuilder $container): void
     {
         $pool = $container->getDefinition('sonata.media.pool');
@@ -75,10 +71,6 @@ public function attachProviders(ContainerBuilder $container): void
         }
     }
 
-    /**
-     * @param ContainerBuilder $container
-     * @param array            $settings
-     */
     public function attachArguments(ContainerBuilder $container, array $settings): void
     {
         foreach ($container->findTaggedServiceIds('sonata.media.provider') as $id => $attributes) {
@@ -103,9 +95,6 @@ public function attachArguments(ContainerBuilder $container, array $settings): v
 
     /**
      * Define the default settings to the config array.
-     *
-     * @param ContainerBuilder $container
-     * @param array            $settings
      */
     public function applyFormats(ContainerBuilder $container, array $settings): void
     {