Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Outdated packages updated. Only minor versions. #8291

Merged
merged 8 commits into from
Jan 7, 2020
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
30 changes: 2 additions & 28 deletions app/bundles/ApiBundle/Controller/CommonApiController.php
Original file line number Diff line number Diff line change
Expand Up @@ -536,8 +536,6 @@ public function getEntityAction($id)

/**
* Initialize some variables.
*
* @param FilterControllerEvent $event
*/
public function initialize(FilterControllerEvent $event)
{
Expand All @@ -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)
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 = [])
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
class AuthorizeController extends Controller
{
/**
* @param Request $request
*
* @return Response
*
* @throws AccessDeniedException
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
class SecurityController extends CommonController
{
/**
* @param Request $request
*
* @return Response
*/
public function loginAction(Request $request)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,6 @@ public function __construct(
}

/**
* @param Request $request
*
* @return \FOS\OAuthServerBundle\Controller\Response|\Symfony\Component\HttpFoundation\Response
*
* @throws \OAuth2\OAuth2RedirectException
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
class SecurityController extends CommonController
{
/**
* @param Request $request
*
* @return \Symfony\Component\HttpFoundation\Response
*/
public function loginAction(Request $request)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
3 changes: 0 additions & 3 deletions app/bundles/ApiBundle/Entity/oAuth1/AccessToken.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 0 additions & 6 deletions app/bundles/ApiBundle/Entity/oAuth1/Consumer.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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(
Expand Down
6 changes: 0 additions & 6 deletions app/bundles/ApiBundle/Entity/oAuth1/ConsumerRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
class ConsumerRepository extends CommonRepository
{
/**
* @param User $user
*
* @return array
*/
public function getUserClients(User $user)
Expand All @@ -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();
Expand Down
3 changes: 0 additions & 3 deletions app/bundles/ApiBundle/Entity/oAuth1/Nonce.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 0 additions & 3 deletions app/bundles/ApiBundle/Entity/oAuth1/RequestToken.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
5 changes: 0 additions & 5 deletions app/bundles/ApiBundle/Entity/oAuth2/AccessToken.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -102,8 +99,6 @@ public function getId()
/**
* Set client.
*
* @param ClientInterface $client
*
* @return AccessToken
*/
public function setClient(ClientInterface $client)
Expand Down
5 changes: 0 additions & 5 deletions app/bundles/ApiBundle/Entity/oAuth2/AuthCode.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -110,8 +107,6 @@ public function getId()
/**
* Set client.
*
* @param ClientInterface $client
*
* @return RefreshToken
*/
public function setClient(ClientInterface $client)
Expand Down
16 changes: 0 additions & 16 deletions app/bundles/ApiBundle/Entity/oAuth2/Client.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -199,8 +193,6 @@ public function setRedirectUris(array $redirectUris)
/**
* Add authCodes.
*
* @param AuthCode $authCodes
*
* @return Client
*/
public function addAuthCode(AuthCode $authCodes)
Expand All @@ -212,8 +204,6 @@ public function addAuthCode(AuthCode $authCodes)

/**
* Remove authCodes.
*
* @param AuthCode $authCodes
*/
public function removeAuthCode(AuthCode $authCodes)
{
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
{
Expand Down
2 changes: 0 additions & 2 deletions app/bundles/ApiBundle/Entity/oAuth2/ClientRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
class ClientRepository extends CommonRepository
{
/**
* @param User $user
*
* @return array
*/
public function getUserClients(User $user)
Expand Down
5 changes: 0 additions & 5 deletions app/bundles/ApiBundle/Entity/oAuth2/RefreshToken.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -102,8 +99,6 @@ public function getId()
/**
* Set client.
*
* @param ClientInterface $client
*
* @return RefreshToken
*/
public function setClient(ClientInterface $client)
Expand Down
15 changes: 0 additions & 15 deletions app/bundles/ApiBundle/EventListener/ApiSubscriber.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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)
Expand All @@ -99,9 +91,6 @@ public function onKernelRequest(GetResponseEvent $event)
}
}

/**
* @param FilterResponseEvent $event
*/
public function onKernelResponse(FilterResponseEvent $event)
{
$response = $event->getResponse();
Expand Down Expand Up @@ -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)
{
Expand All @@ -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)
{
Expand Down
3 changes: 0 additions & 3 deletions app/bundles/ApiBundle/EventListener/ConfigSubscriber.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down