Skip to content
This repository has been archived by the owner on Jun 26, 2020. It is now read-only.

Commit

Permalink
Merge 171aeec into 866d621
Browse files Browse the repository at this point in the history
  • Loading branch information
@core23
core23 committed Jul 25, 2019
2 parents 866d621 + 171aeec commit 3008664
Show file tree
Hide file tree
Showing 18 changed files with 3 additions and 129 deletions.
2 changes: 0 additions & 2 deletions phpstan.neon
View file
@@ -1,7 +1,5 @@
includes:
- vendor-bin/phpstan/vendor/jangregor/phpstan-prophecy/src/extension.neon
- vendor-bin/phpstan/vendor/phpstan/phpstan-phpunit/extension.neon
- vendor-bin/phpstan/vendor/phpstan/phpstan-phpunit/rules.neon

parameters:
autoload_files:
Expand Down
8 changes: 0 additions & 8 deletions src/Action/AuthErrorAction.php
View file
Expand Up @@ -46,12 +46,6 @@ final class AuthErrorAction
*/
private $eventDispatcher;

/**
* @param Environment $twig
* @param RouterInterface $router
* @param SessionManagerInterface $sessionManager
* @param EventDispatcherInterface $eventDispatcher
*/
public function __construct(
Environment $twig,
RouterInterface $router,
Expand All @@ -68,8 +62,6 @@ public function __construct(
* @throws LoaderError
* @throws RuntimeError
* @throws SyntaxError
*
* @return Response
*/
public function __invoke(): Response
{
Expand Down
8 changes: 0 additions & 8 deletions src/Action/AuthSuccessAction.php
View file
Expand Up @@ -46,12 +46,6 @@ final class AuthSuccessAction
*/
private $eventDispatcher;

/**
* @param Environment $twig
* @param RouterInterface $router
* @param SessionManagerInterface $sessionManager
* @param EventDispatcherInterface $eventDispatcher
*/
public function __construct(
Environment $twig,
RouterInterface $router,
Expand All @@ -68,8 +62,6 @@ public function __construct(
* @throws RuntimeError
* @throws SyntaxError
* @throws LoaderError
*
* @return Response
*/
public function __invoke(): Response
{
Expand Down
11 changes: 0 additions & 11 deletions src/Action/CheckAuthAction.php
View file
Expand Up @@ -42,11 +42,6 @@ final class CheckAuthAction implements LoggerAwareInterface
*/
private $sessionManager;

/**
* @param RouterInterface $router
* @param Facebook $facebookConnection
* @param SessionManagerInterface $sessionManager
*/
public function __construct(
RouterInterface $router,
Facebook $facebookConnection,
Expand All @@ -58,9 +53,6 @@ public function __construct(
$this->logger = new NullLogger();
}

/**
* @return RedirectResponse
*/
public function __invoke(): RedirectResponse
{
$session = $this->getSession();
Expand Down Expand Up @@ -88,9 +80,6 @@ private function generateUrl(string $route, array $parameters = [], int $referen
return $this->router->generate($route, $parameters, $referenceType);
}

/**
* @return SessionInterface|null
*/
private function getSession(): ?SessionInterface
{
$fb = $this->facebookConnection;
Expand Down
7 changes: 1 addition & 6 deletions src/Action/StartAuthAction.php
View file
Expand Up @@ -34,9 +34,7 @@ final class StartAuthAction
private $permissions;

/**
* @param RouterInterface $router
* @param Facebook $facebookConnection
* @param string[] $permissions
* @param string[] $permissions
*/
public function __construct(RouterInterface $router, Facebook $facebookConnection, array $permissions)
{
Expand All @@ -45,9 +43,6 @@ public function __construct(RouterInterface $router, Facebook $facebookConnectio
$this->permissions = $permissions;
}

/**
* @return RedirectResponse
*/
public function __invoke(): RedirectResponse
{
$fb = $this->facebookConnection;
Expand Down
11 changes: 0 additions & 11 deletions src/Block/Service/AbstractFacebookBlockService.php
View file
Expand Up @@ -28,11 +28,6 @@ abstract class AbstractFacebookBlockService extends AbstractAdminBlockService im
*/
private $facebook;

/**
* @param string $name
* @param EngineInterface $templating
* @param Facebook $connection
*/
public function __construct(string $name, EngineInterface $templating, Facebook $connection)
{
parent::__construct($name, $templating);
Expand All @@ -41,17 +36,11 @@ public function __construct(string $name, EngineInterface $templating, Facebook
$this->logger = new NullLogger();
}

/**
* @return Facebook
*/
protected function getFacebook(): Facebook
{
return $this->facebook;
}

/**
* @return AccessToken
*/
final protected function getAccessToken(): AccessToken
{
return $this->facebook->getApp()->getAccessToken();
Expand Down
5 changes: 0 additions & 5 deletions src/Block/Service/PageFeedBlockService.php
View file
Expand Up @@ -104,11 +104,6 @@ public function getBlockMetadata($code = null)
]);
}

/**
* @param array $settings
*
* @return array
*/
private function getData(array $settings): array
{
try {
Expand Down
9 changes: 0 additions & 9 deletions src/Connection/FacebookConnection.php
View file
Expand Up @@ -27,9 +27,6 @@ final class FacebookConnection extends Facebook
private $sharedSecret;

/**
* @param string $apiKey
* @param string $sharedSecret
*
* @throws FacebookSDKException
*/
public function __construct(string $apiKey, string $sharedSecret)
Expand All @@ -43,17 +40,11 @@ public function __construct(string $apiKey, string $sharedSecret)
$this->sharedSecret = $sharedSecret;
}

/**
* @return string
*/
public function getApiId(): string
{
return $this->apiId;
}

/**
* @return string
*/
public function getSharedSecret(): string
{
return $this->sharedSecret;
Expand Down
3 changes: 0 additions & 3 deletions src/DependencyInjection/Configuration.php
View file
Expand Up @@ -37,9 +37,6 @@ public function getConfigTreeBuilder()
return $treeBuilder;
}

/**
* @param ArrayNodeDefinition $node
*/
private function addApiSection(ArrayNodeDefinition $node): void
{
$node
Expand Down
4 changes: 0 additions & 4 deletions src/DependencyInjection/Core23FacebookExtension.php
View file
Expand Up @@ -38,10 +38,6 @@ public function load(array $configs, ContainerBuilder $container): void
$this->configureApi($container, $config);
}

/**
* @param ContainerBuilder $container
* @param array $config
*/
private function configureApi(ContainerBuilder $container, array $config): void
{
$container->setParameter('core23_facebook.api.app_id', $config['api']['app_id']);
Expand Down
6 changes: 0 additions & 6 deletions src/Event/AuthFailedEvent.php
View file
Expand Up @@ -21,17 +21,11 @@ final class AuthFailedEvent extends Event
*/
private $response;

/**
* @return Response|null
*/
public function getResponse(): ?Response
{
return $this->response;
}

/**
* @param Response|null $response
*/
public function setResponse(?Response $response): void
{
$this->response = $response;
Expand Down
15 changes: 0 additions & 15 deletions src/Event/AuthSuccessEvent.php
View file
Expand Up @@ -27,41 +27,26 @@ final class AuthSuccessEvent extends Event
*/
private $response;

/**
* @param SessionInterface $session
*/
public function __construct(SessionInterface $session)
{
$this->session = $session;
}

/**
* @return SessionInterface
*/
public function getSession(): SessionInterface
{
return $this->session;
}

/**
* @return Response|null
*/
public function getResponse(): ?Response
{
return $this->response;
}

/**
* @param Response|null $response
*/
public function setResponse(?Response $response): void
{
$this->response = $response;
}

/**
* @return string
*/
public function getUsername(): string
{
return $this->session->getName();
Expand Down
12 changes: 0 additions & 12 deletions src/Session/Session.php
View file
Expand Up @@ -36,12 +36,6 @@ final class Session implements SessionInterface
*/
private $expireDate;

/**
* @param string $facebookId
* @param string $name
* @param string $token
* @param \DateTime|null $expireDate
*/
public function __construct(string $facebookId, string $name, string $token, ?\DateTime $expireDate)
{
$this->facebookId = $facebookId;
Expand Down Expand Up @@ -82,12 +76,6 @@ public function getExpireDate(): ?\DateTime
return $this->expireDate;
}

/**
* @param AccessToken $token
* @param GraphUser $graphUser
*
* @return SessionInterface
*/
public static function fromFacebookApi(AccessToken $token, GraphUser $graphUser): SessionInterface
{
return new self($graphUser->getId() ?: '', $graphUser->getName() ?: '', $token->getValue(), $token->getExpiresAt());
Expand Down
12 changes: 0 additions & 12 deletions src/Session/SessionInterface.php
View file
Expand Up @@ -13,23 +13,11 @@

interface SessionInterface
{
/**
* @return string
*/
public function getFacebookId(): string;

/**
* @return string
*/
public function getName(): string;

/**
* @return string
*/
public function getToken(): string;

/**
* @return \DateTime|null
*/
public function getExpireDate(): ?\DateTime;
}
3 changes: 0 additions & 3 deletions src/Session/SessionManager.php
View file
Expand Up @@ -29,9 +29,6 @@ final class SessionManager implements SessionManagerInterface
*/
private $session;

/**
* @param Session $session
*/
public function __construct(Session $session)
{
$this->session = $session;
Expand Down
10 changes: 0 additions & 10 deletions src/Session/SessionManagerInterface.php
View file
Expand Up @@ -15,30 +15,20 @@ interface SessionManagerInterface
{
/**
* Returns the auth status.
*
* @return bool
*/
public function isAuthenticated(): bool;

/**
* Get the session username.
*
* @return string|null
*/
public function getUsername(): ?string;

/**
* @param SessionInterface $session
*/
public function store(SessionInterface $session): void;

/**
* Removes all stored sessions.
*/
public function clear(): void;

/**
* @return SessionInterface|null
*/
public function getSession(): ?SessionInterface;
}
3 changes: 0 additions & 3 deletions tests/Action/CheckAuthActionTest.php
View file
Expand Up @@ -137,9 +137,6 @@ public function testExecuteWithNoAccessToken(): void
static::assertSame('/error', $response->getTargetUrl());
}

/**
* @return ObjectProphecy
*/
private function prepareAccessToken(): ObjectProphecy
{
$accessToken = $this->prophesize(AccessToken::class);
Expand Down
3 changes: 2 additions & 1 deletion vendor-bin/phpstan/composer.json
View file
@@ -1,6 +1,7 @@
{
"require": {
"jangregor/phpstan-prophecy": "^0.3",
"jangregor/phpstan-prophecy": "^0.4",
"phpstan/extension-installer": "^1.0",
"phpstan/phpstan": "^0.11",
"phpstan/phpstan-phpunit": "^0.11"
},
Expand Down

0 comments on commit 3008664

Please sign in to comment.