Merge pull request #8291 from escopecz/composer-minor-versions-update

Outdated packages updated. Only minor versions.
mautic · Jan 7, 2020 · 53d16e1 · 53d16e1
2 parents b53f5a9 + 81dcb66
commit 53d16e1
Show file tree

Hide file tree

Showing 1,430 changed files with 2,125 additions and 11,816 deletions.
diff --git a/app/bundles/ApiBundle/Controller/CommonApiController.php b/app/bundles/ApiBundle/Controller/CommonApiController.php
@@ -536,8 +536,6 @@ public function getEntityAction($id)
 
     /**
      * Initialize some variables.
-     *
-     * @param FilterControllerEvent $event
      */
     public function initialize(FilterControllerEvent $event)
     {
@@ -551,8 +549,6 @@ public function initialize(FilterControllerEvent $event)
     /**
      * Creates new entity from provided params.
      *
-     * @param array $params
-     *
      * @return object
      */
     public function getNewEntity(array $params)
@@ -641,49 +637,31 @@ public function newEntityAction()
         return $this->processForm($entity, $parameters, 'POST');
     }
 
-    /**
-     * @param CoreParametersHelper $coreParametersHelper
-     */
     public function setCoreParametersHelper(CoreParametersHelper $coreParametersHelper)
     {
         $this->coreParametersHelper = $coreParametersHelper;
     }
 
-    /**
-     * @param EventDispatcherInterface $dispatcher
-     */
     public function setDispatcher(EventDispatcherInterface $dispatcher)
     {
         $this->dispatcher = $dispatcher;
     }
 
-    /**
-     * @param MauticFactory $factory
-     */
     public function setFactory(MauticFactory $factory)
     {
         $this->factory = $factory;
     }
 
-    /**
-     * @param Request $request
-     */
     public function setRequest(Request $request)
     {
         $this->request = $request;
     }
 
-    /**
-     * @param TranslatorInterface $translator
-     */
     public function setTranslator(TranslatorInterface $translator)
     {
         $this->translator = $translator;
     }
 
-    /**
-     * @param User $user
-     */
     public function setUser(User $user)
     {
         $this->user = $user;
@@ -713,9 +691,6 @@ protected function accessDenied($msg = 'mautic.core.error.accessdenied')
         return $this->returnError($msg, Response::HTTP_FORBIDDEN);
     }
 
-    /**
-     * @param ExclusionStrategyInterface $strategy
-     */
     protected function addExclusionStrategy(ExclusionStrategyInterface $strategy)
     {
         $this->exclusionStrategies[] = $strategy;
@@ -1361,9 +1336,8 @@ protected function validateBatchPayload($parameters)
     /**
      * {@inheritdoc}
      *
-     * @param null  $data
-     * @param null  $statusCode
-     * @param array $headers
+     * @param null $data
+     * @param null $statusCode
      */
     protected function view($data = null, $statusCode = null, array $headers = [])
     {

diff --git a/app/bundles/ApiBundle/Controller/oAuth1/AuthorizeController.php b/app/bundles/ApiBundle/Controller/oAuth1/AuthorizeController.php
@@ -22,8 +22,6 @@
 class AuthorizeController extends Controller
 {
     /**
-     * @param Request $request
-     *
      * @return Response
      *
      * @throws AccessDeniedException

diff --git a/app/bundles/ApiBundle/Controller/oAuth1/SecurityController.php b/app/bundles/ApiBundle/Controller/oAuth1/SecurityController.php
@@ -20,8 +20,6 @@
 class SecurityController extends CommonController
 {
     /**
-     * @param Request $request
-     *
      * @return Response
      */
     public function loginAction(Request $request)

diff --git a/app/bundles/ApiBundle/Controller/oAuth2/AuthorizeController.php b/app/bundles/ApiBundle/Controller/oAuth2/AuthorizeController.php
@@ -103,8 +103,6 @@ public function __construct(
     }
 
     /**
-     * @param Request $request
-     *
      * @return \FOS\OAuthServerBundle\Controller\Response|\Symfony\Component\HttpFoundation\Response
      *
      * @throws \OAuth2\OAuth2RedirectException

diff --git a/app/bundles/ApiBundle/Controller/oAuth2/SecurityController.php b/app/bundles/ApiBundle/Controller/oAuth2/SecurityController.php
@@ -20,8 +20,6 @@
 class SecurityController extends CommonController
 {
     /**
-     * @param Request $request
-     *
      * @return \Symfony\Component\HttpFoundation\Response
      */
     public function loginAction(Request $request)

diff --git a/app/bundles/ApiBundle/DependencyInjection/Compiler/SerializerPass.php b/app/bundles/ApiBundle/DependencyInjection/Compiler/SerializerPass.php
@@ -15,8 +15,6 @@ class SerializerPass implements CompilerPassInterface
      * with our metadata driver, as we do not use any of those. There's
      * currently no other way that I can find to get our driver into the
      * chain in front of the rest.
-     *
-     * @param ContainerBuilder $container
      */
     public function process(ContainerBuilder $container)
     {

diff --git a/app/bundles/ApiBundle/Entity/oAuth1/AccessToken.php b/app/bundles/ApiBundle/Entity/oAuth1/AccessToken.php
@@ -52,9 +52,6 @@ class AccessToken implements AccessTokenInterface
      */
     protected $expiresAt;
 
-    /**
-     * @param ORM\ClassMetadata $metadata
-     */
     public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);

diff --git a/app/bundles/ApiBundle/Entity/oAuth1/Consumer.php b/app/bundles/ApiBundle/Entity/oAuth1/Consumer.php
@@ -62,9 +62,6 @@ public function __construct()
         $this->accessTokens = new ArrayCollection();
     }
 
-    /**
-     * @param ORM\ClassMetadata $metadata
-     */
     public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
@@ -93,9 +90,6 @@ public static function loadMetadata(ORM\ClassMetadata $metadata)
             ->build();
     }
 
-    /**
-     * @param ClassMetadata $metadata
-     */
     public static function loadValidatorMetadata(ClassMetadata $metadata)
     {
         $metadata->addPropertyConstraint('name', new Assert\NotBlank(

diff --git a/app/bundles/ApiBundle/Entity/oAuth1/ConsumerRepository.php b/app/bundles/ApiBundle/Entity/oAuth1/ConsumerRepository.php
@@ -21,8 +21,6 @@
 class ConsumerRepository extends CommonRepository
 {
     /**
-     * @param User $user
-     *
      * @return array
      */
     public function getUserClients(User $user)
@@ -39,10 +37,6 @@ public function getUserClients(User $user)
         return $q->getQuery()->getResult();
     }
 
-    /**
-     * @param Consumer $consumer
-     * @param User     $user
-     */
     public function deleteAccessTokens(Consumer $consumer, User $user)
     {
         $qb = $this->_em->createQueryBuilder();

diff --git a/app/bundles/ApiBundle/Entity/oAuth1/Nonce.php b/app/bundles/ApiBundle/Entity/oAuth1/Nonce.php
@@ -37,9 +37,6 @@ public function __construct($nonce, $timestamp)
         $this->timestamp = $timestamp;
     }
 
-    /**
-     * @param ORM\ClassMetadata $metadata
-     */
     public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);

diff --git a/app/bundles/ApiBundle/Entity/oAuth1/RequestToken.php b/app/bundles/ApiBundle/Entity/oAuth1/RequestToken.php
@@ -57,9 +57,6 @@ class RequestToken implements RequestTokenInterface
      */
     protected $verifier;
 
-    /**
-     * @param ORM\ClassMetadata $metadata
-     */
     public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);

diff --git a/app/bundles/ApiBundle/Entity/oAuth2/AccessToken.php b/app/bundles/ApiBundle/Entity/oAuth2/AccessToken.php
@@ -52,9 +52,6 @@ class AccessToken extends BaseAccessToken
      */
     protected $scope;
 
-    /**
-     * @param ORM\ClassMetadata $metadata
-     */
     public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
@@ -102,8 +99,6 @@ public function getId()
     /**
      * Set client.
      *
-     * @param ClientInterface $client
-     *
      * @return AccessToken
      */
     public function setClient(ClientInterface $client)

diff --git a/app/bundles/ApiBundle/Entity/oAuth2/AuthCode.php b/app/bundles/ApiBundle/Entity/oAuth2/AuthCode.php
@@ -57,9 +57,6 @@ class AuthCode extends BaseAuthCode
      */
     protected $redirectUri;
 
-    /**
-     * @param ORM\ClassMetadata $metadata
-     */
     public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
@@ -110,8 +107,6 @@ public function getId()
     /**
      * Set client.
      *
-     * @param ClientInterface $client
-     *
      * @return RefreshToken
      */
     public function setClient(ClientInterface $client)

diff --git a/app/bundles/ApiBundle/Entity/oAuth2/Client.php b/app/bundles/ApiBundle/Entity/oAuth2/Client.php
@@ -75,9 +75,6 @@ public function __construct()
         $this->users = new ArrayCollection();
     }
 
-    /**
-     * @param ORM\ClassMetadata $metadata
-     */
     public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
@@ -110,9 +107,6 @@ public static function loadMetadata(ORM\ClassMetadata $metadata)
             ->build();
     }
 
-    /**
-     * @param ClassMetadata $metadata
-     */
     public static function loadValidatorMetadata(ClassMetadata $metadata)
     {
         $metadata->addPropertyConstraint('name', new Assert\NotBlank(
@@ -199,8 +193,6 @@ public function setRedirectUris(array $redirectUris)
     /**
      * Add authCodes.
      *
-     * @param AuthCode $authCodes
-     *
      * @return Client
      */
     public function addAuthCode(AuthCode $authCodes)
@@ -212,8 +204,6 @@ public function addAuthCode(AuthCode $authCodes)
 
     /**
      * Remove authCodes.
-     *
-     * @param AuthCode $authCodes
      */
     public function removeAuthCode(AuthCode $authCodes)
     {
@@ -233,8 +223,6 @@ public function getAuthCodes()
     /**
      * Determines if a client attempting API access is already authorized by the user.
      *
-     * @param User $user
-     *
      * @return bool
      */
     public function isAuthorizedClient(User $user)
@@ -247,8 +235,6 @@ public function isAuthorizedClient(User $user)
     /**
      * Add users.
      *
-     * @param \Mautic\UserBundle\Entity\User $users
-     *
      * @return Client
      */
     public function addUser(\Mautic\UserBundle\Entity\User $users)
@@ -260,8 +246,6 @@ public function addUser(\Mautic\UserBundle\Entity\User $users)
 
     /**
      * Remove users.
-     *
-     * @param \Mautic\UserBundle\Entity\User $users
      */
     public function removeUser(\Mautic\UserBundle\Entity\User $users)
     {

diff --git a/app/bundles/ApiBundle/Entity/oAuth2/ClientRepository.php b/app/bundles/ApiBundle/Entity/oAuth2/ClientRepository.php
@@ -21,8 +21,6 @@
 class ClientRepository extends CommonRepository
 {
     /**
-     * @param User $user
-     *
      * @return array
      */
     public function getUserClients(User $user)

diff --git a/app/bundles/ApiBundle/Entity/oAuth2/RefreshToken.php b/app/bundles/ApiBundle/Entity/oAuth2/RefreshToken.php
@@ -52,9 +52,6 @@ class RefreshToken extends BaseRefreshToken
      */
     protected $scope;
 
-    /**
-     * @param ORM\ClassMetadata $metadata
-     */
     public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
@@ -102,8 +99,6 @@ public function getId()
     /**
      * Set client.
      *
-     * @param ClientInterface $client
-     *
      * @return RefreshToken
      */
     public function setClient(ClientInterface $client)

diff --git a/app/bundles/ApiBundle/EventListener/ApiSubscriber.php b/app/bundles/ApiBundle/EventListener/ApiSubscriber.php
@@ -47,12 +47,6 @@ class ApiSubscriber implements EventSubscriberInterface
      */
     private $translator;
 
-    /**
-     * @param IpLookupHelper       $ipLookupHelper
-     * @param CoreParametersHelper $coreParametersHelper
-     * @param AuditLogModel        $auditLogModel
-     * @param TranslatorInterface  $translator
-     */
     public function __construct(
         IpLookupHelper $ipLookupHelper,
         CoreParametersHelper $coreParametersHelper,
@@ -81,8 +75,6 @@ public static function getSubscribedEvents()
     /**
      * Check for API requests and throw denied access if API is disabled.
      *
-     * @param GetResponseEvent $event
-     *
      * @throws AccessDeniedHttpException
      */
     public function onKernelRequest(GetResponseEvent $event)
@@ -99,9 +91,6 @@ public function onKernelRequest(GetResponseEvent $event)
         }
     }
 
-    /**
-     * @param FilterResponseEvent $event
-     */
     public function onKernelResponse(FilterResponseEvent $event)
     {
         $response   = $event->getResponse();
@@ -180,8 +169,6 @@ public function isBasicAuth(Request $request)
 
     /**
      * Add a client change entry to the audit log.
-     *
-     * @param Events\ClientEvent $event
      */
     public function onClientPostSave(Events\ClientEvent $event)
     {
@@ -201,8 +188,6 @@ public function onClientPostSave(Events\ClientEvent $event)
 
     /**
      * Add a role delete entry to the audit log.
-     *
-     * @param Events\ClientEvent $event
      */
     public function onClientDelete(Events\ClientEvent $event)
     {

diff --git a/app/bundles/ApiBundle/EventListener/ConfigSubscriber.php b/app/bundles/ApiBundle/EventListener/ConfigSubscriber.php
@@ -41,9 +41,6 @@ public function onConfigGenerate(ConfigBuilderEvent $event)
         ]);
     }
 
-    /**
-     * @param ConfigEvent $event
-     */
     public function onConfigSave(ConfigEvent $event)
     {
         // Symfony craps out with integer for firewall settings