Merge pull request #7 from zikula/analysis-XaA0mV

Guite · web-flow · commit de422d1b7c26 · 2019-03-26T07:15:20.000+01:00
Apply fixes from StyleCI
diff --git a/AuthenticationMethod/AbstractAuthenticationMethod.php b/AuthenticationMethod/AbstractAuthenticationMethod.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /*
  * This file is part of the Zikula package.
  *
@@ -131,7 +132,7 @@ protected function setAdditionalUserData()
      */
     public function authenticate(array $data = [])
     {
-        $redirectUri = isset($data['redirectUri']) ? $data['redirectUri'] : $this->router->generate('zikulausersmodule_access_login', [], UrlGeneratorInterface::ABSOLUTE_URL);
+        $redirectUri = $data['redirectUri'] ?? $this->router->generate('zikulausersmodule_access_login', [], UrlGeneratorInterface::ABSOLUTE_URL);
         $this->setProvider($redirectUri);
         $request = $this->requestStack->getCurrentRequest();
         $state = $request->query->get('state', null);
@@ -151,39 +152,38 @@ public function authenticate(array $data = [])
             $this->session->getFlashBag()->add('error', 'Invalid State');
 
             return null;
-        } else {
-            // Try to get an access token (using the authorization code grant)
-            $this->token = $this->getProvider()->getAccessToken('authorization_code', [
+        }
+        // Try to get an access token (using the authorization code grant)
+        $this->token = $this->getProvider()->getAccessToken('authorization_code', [
                 'code' => $code
             ]);
 
-            try {
-                // get the user's details
-                $this->user = $this->getProvider()->getResourceOwner($this->token);
-                $this->setAdditionalUserData();
-                $uid = $this->repository->getZikulaId($this->getAlias(), $this->user->getId());
-                if (isset($uid)) {
-                    //$this->session->getFlashBag()->add('success', sprintf('Hello %s!', $this->getUname()));
-                } else {
-                    $registrationUrl = $this->router->generate('zikulausersmodule_registration_register');
-                    $this->session->remove('oauth2state');
-                    $registerLink = '<a href="' . $registrationUrl . '">' . $this->translator->__('create a new account') . '</a>';
-                    $this->session->getFlashBag()->add('error',
+        try {
+            // get the user's details
+            $this->user = $this->getProvider()->getResourceOwner($this->token);
+            $this->setAdditionalUserData();
+            $uid = $this->repository->getZikulaId($this->getAlias(), $this->user->getId());
+            if (isset($uid)) {
+                //$this->session->getFlashBag()->add('success', sprintf('Hello %s!', $this->getUname()));
+            } else {
+                $registrationUrl = $this->router->generate('zikulausersmodule_registration_register');
+                $this->session->remove('oauth2state');
+                $registerLink = '<a href="' . $registrationUrl . '">' . $this->translator->__('create a new account') . '</a>';
+                $this->session->getFlashBag()->add('error',
                         $this->translator->__f(
                             'This user is not locally registered. You must first %registerLink on this site before logging in with %displayName', [
                                 '%registerLink' => $registerLink,
                                 '%displayName' => $this->getDisplayName()
                             ]
                         )
                     );
-                }
+            }
 
-                return $uid;
-            } catch (\Exception $exception) {
-                $this->session->getFlashBag()->add('error', $this->translator->__('Could not obtain user details from external service.') . ' (' . $exception->getMessage() . ')');
+            return $uid;
+        } catch (\Exception $exception) {
+            $this->session->getFlashBag()->add('error', $this->translator->__('Could not obtain user details from external service.') . ' (' . $exception->getMessage() . ')');
 
-                return null;
-            }
+            return null;
         }
     }
 
diff --git a/AuthenticationMethod/FacebookAuthenticationMethod.php b/AuthenticationMethod/FacebookAuthenticationMethod.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /*
  * This file is part of the Zikula package.
  *
diff --git a/AuthenticationMethod/GithubAuthenticationMethod.php b/AuthenticationMethod/GithubAuthenticationMethod.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /*
  * This file is part of the Zikula package.
  *
diff --git a/AuthenticationMethod/GoogleAuthenticationMethod.php b/AuthenticationMethod/GoogleAuthenticationMethod.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /*
  * This file is part of the Zikula package.
  *
diff --git a/AuthenticationMethod/LinkedInAuthenticationMethod.php b/AuthenticationMethod/LinkedInAuthenticationMethod.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /*
  * This file is part of the Zikula package.
  *
diff --git a/Container/LinkContainer.php b/Container/LinkContainer.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /*
  * This file is part of the Zikula package.
  *
@@ -65,9 +66,9 @@ public function __construct(TranslatorInterface $translator, RouterInterface $ro
      */
     public function getLinks($type = LinkContainerInterface::TYPE_ADMIN)
     {
-        $method = 'get' . ucfirst(strtolower($type));
+        $method = 'get' . ucfirst(mb_strtolower($type));
         if (method_exists($this, $method)) {
-            return $this->$method();
+            return $this->{$method}();
         }
 
         return [];
diff --git a/Controller/ConfigController.php b/Controller/ConfigController.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /*
  * This file is part of the Zikula package.
  *
diff --git a/Controller/MappingController.php b/Controller/MappingController.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /*
  * This file is part of the Zikula package.
  *
@@ -15,8 +16,8 @@
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Zikula\Core\Controller\AbstractController;
-use Zikula\ThemeModule\Engine\Annotation\Theme;
 use Zikula\OAuthModule\Entity\Repository\MappingRepository;
+use Zikula\ThemeModule\Engine\Annotation\Theme;
 
 /**
  * Class MappingController
diff --git a/DependencyInjection/ZikulaOAuthExtension.php b/DependencyInjection/ZikulaOAuthExtension.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /*
  * This file is part of the Zikula package.
  *
@@ -11,10 +12,10 @@
 
 namespace Zikula\OAuthModule\DependencyInjection;
 
+use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\Config\FileLocator;
 
 class ZikulaOAuthExtension extends Extension
 {
diff --git a/Entity/MappingEntity.php b/Entity/MappingEntity.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /*
  * This file is part of the Zikula package.
  *
diff --git a/Entity/Repository/MappingRepository.php b/Entity/Repository/MappingRepository.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /*
  * This file is part of the Zikula package.
  *
diff --git a/Exception/InvalidProviderConfigException.php b/Exception/InvalidProviderConfigException.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /*
  * This file is part of the Zikula package.
  *
diff --git a/Form/Type/SettingsType.php b/Form/Type/SettingsType.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /*
  * This file is part of the Zikula package.
  *
diff --git a/Listener/UserDeleteListener.php b/Listener/UserDeleteListener.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /*
  * This file is part of the Zikula package.
  *
diff --git a/OAuthConstant.php b/OAuthConstant.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /*
  * This file is part of the Zikula package.
  *
diff --git a/OAuthModuleInstaller.php b/OAuthModuleInstaller.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /*
  * This file is part of the Zikula package.
  *
diff --git a/ZikulaOAuthModule.php b/ZikulaOAuthModule.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /*
  * This file is part of the Zikula package.
  *

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
	`3`	`+declare(strict_types=1);`
`3`	`4`	`/*`
`4`	`5`	`* This file is part of the Zikula package.`
`5`	`6`	`*`