Issue #381: Symfony badge related fixes

.gitignore

@@ -2,6 +2,7 @@ clover.xml
 coveralls-upload.json
 phpunit.xml
 .phpcs-cache
+.phpunit.result.cache
 
 # Created by .ignore support plugin (hsz.mobi)
 ### JetBrains template

composer.json

@@ -91,11 +91,6 @@
             "Frontend\\User\\": "src/User/src/"
         }
     },
-    "autoload-dev": {
-        "psr-4": {
-            "AppTest\\": "test/AppTest/"
-        }
-    },
     "scripts": {
         "post-create-project-cmd": [
             "@development-enable"

phpunit.xml.dist

@@ -3,8 +3,4 @@
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          colors="true">
-    <testsuites>
-        <testsuite name="UnitTests"/>
-        <testsuite name="FunctionalTests"/>
-    </testsuites>
 </phpunit>

src/App/src/Common/TimestampAwareTrait.php

@@ -86,8 +86,8 @@ public function touch(): void
     {
         try {
             $this->updated = new DateTimeImmutable();
-        } catch (Exception) {
-            #TODO save the error message
+        } catch (Exception $exception) {
+            error_log($exception->getMessage());
         }
     }
 }

src/App/src/Factory/AuthMiddlewareFactory.php

@@ -24,13 +24,10 @@ class AuthMiddlewareFactory
     use AttachAuthorizationEventListenersTrait;
 
     /**
-     * @param ContainerInterface $container
-     * @param $requestedName
-     * @return AuthMiddleware
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */
-    public function __invoke(ContainerInterface $container, $requestedName): AuthMiddleware
+    public function __invoke(ContainerInterface $container, string $requestedName): AuthMiddleware
     {
         /** @var RbacGuardOptions $options */
         $options = $container->get(RbacGuardOptions::class);

src/App/src/RoutesDelegator.php

@@ -9,19 +9,9 @@
 use Mezzio\Application;
 use Psr\Container\ContainerInterface;
 
-/**
- * Class RoutesDelegator
- * @package Frontend\App
- */
 class RoutesDelegator
 {
-    /**
-     * @param ContainerInterface $container
-     * @param $serviceName
-     * @param callable $callback
-     * @return Application
-     */
-    public function __invoke(ContainerInterface $container, $serviceName, callable $callback): Application
+    public function __invoke(ContainerInterface $container, string $serviceName, callable $callback): Application
     {
         /** @var Application $app */
         $app = $callback();

src/App/src/Service/CookieService.php

@@ -20,8 +20,6 @@ class CookieService implements CookieServiceInterface
     private ConfigInterface $sessionConfig;
 
     /**
-     * @param SessionManager $sessionManager
-     *
      * @Inject({
      *     SessionManager::class
      * })
@@ -31,13 +29,7 @@ public function __construct(SessionManager $sessionManager)
         $this->sessionConfig = $sessionManager->getConfig();
     }
 
-    /**
-     * @param string $name
-     * @param $value
-     * @param array|null $options
-     * @return bool
-     */
-    public function setCookie(string $name, $value, ?array $options = []): bool
+    public function setCookie(string $name, mixed $value, ?array $options = []): bool
     {
         if (!$this->sessionConfig->getUseCookies()) {
             return false;
@@ -46,10 +38,6 @@ public function setCookie(string $name, $value, ?array $options = []): bool
         return setcookie($name, $value, $this->getMergedOptions($options));
     }
 
-    /**
-     * @param string $name
-     * @return bool
-     */
     public function expireCookie(string $name): bool
     {
         return setcookie($name, '', $this->getMergedOptions([
@@ -58,8 +46,6 @@ public function expireCookie(string $name): bool
     }
 
     /**
-     * @param array|null $options
-     * @return array
      * @psalm-suppress UndefinedInterfaceMethod
      */
     private function getMergedOptions(?array $options = []): array
@@ -74,9 +60,6 @@ private function getMergedOptions(?array $options = []): array
         ];
     }
 
-    /**
-     * @return int
-     */
     private function getCookieLifetime(): int
     {
         return time() + $this->sessionConfig->getCookieLifetime();

src/App/src/Service/CookieServiceInterface.php

@@ -10,17 +10,7 @@
  */
 interface CookieServiceInterface
 {
-    /**
-     * @param string $name
-     * @param $value
-     * @param array|null $options
-     * @return bool
-     */
-    public function setCookie(string $name, $value, ?array $options = []): bool;
+    public function setCookie(string $name, mixed $value, ?array $options = []): bool;
 
-    /**
-     * @param string $name
-     * @return bool
-     */
     public function expireCookie(string $name): bool;
 }

src/App/src/Service/TranslateServiceInterface.php

@@ -13,5 +13,5 @@ interface TranslateServiceInterface
     /**
      * @param string $languageKey
      */
-    public function addTranslatorCookie(string $languageKey);
+    public function addTranslatorCookie(string $languageKey): void;
 }

src/Contact/src/RoutesDelegator.php

@@ -9,19 +9,9 @@
 use Mezzio\Application;
 use Psr\Container\ContainerInterface;
 
-/**
- * Class RoutesDelegator
- * @package Frontend\Contact
- */
 class RoutesDelegator
 {
-    /**
-     * @param ContainerInterface $container
-     * @param $serviceName
-     * @param callable $callback
-     * @return Application
-     */
-    public function __invoke(ContainerInterface $container, $serviceName, callable $callback): Application
+    public function __invoke(ContainerInterface $container, string $serviceName, callable $callback): Application
     {
         /** @var Application $app */
         $app = $callback();

src/Contact/src/Service/MessageService.php

@@ -49,10 +49,7 @@ public function __construct(
         $this->config = $config;
     }
 
-    /**
-     * @return MessageRepository
-     */
-    public function getRepository(): MessageRepository
+    public function getRepository(): MessageRepository|EntityRepository
     {
         return $this->repository;
     }
@@ -100,30 +97,4 @@ public function sendContactMail(Message $message): bool
 
         return $this->mailService->send()->isValid();
     }
-
-    /**
-     * @param $response
-     * @return bool
-     */
-    public function recaptchaIsValid($response): bool
-    {
-        $requestJson = [
-            'response' => $response,
-            'secret' => $this->config['recaptcha']['secretKey']
-        ];
-        $url = 'https://www.google.com/recaptcha/api/siteverify';
-
-        $curl = curl_init();
-        curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "POST");
-        curl_setopt($curl, CURLOPT_POSTFIELDS, $requestJson);
-        curl_setopt($curl, CURLOPT_URL, $url);
-        curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-
-        $checkRecaptchaResponse = curl_exec($curl);
-        $checkRecaptchaResponse = json_decode($checkRecaptchaResponse, true);
-        if ($checkRecaptchaResponse['success']) {
-            return true;
-        }
-        return false;
-    }
 }

src/Contact/src/Service/MessageServiceInterface.php

@@ -4,6 +4,7 @@
 
 namespace Frontend\Contact\Service;
 
+use Doctrine\ORM\EntityRepository;
 use Dot\Mail\Exception\MailException;
 use Frontend\Contact\Entity\Message;
 use Frontend\Contact\Repository\MessageRepository;
@@ -14,10 +15,7 @@
  */
 interface MessageServiceInterface
 {
-    /**
-     * @return MessageRepository
-     */
-    public function getRepository(): MessageRepository;
+    public function getRepository(): MessageRepository|EntityRepository;
 
     /**
      * @param array $data
@@ -31,10 +29,4 @@ public function processMessage(array $data): bool;
      * @throws MailException
      */
     public function sendContactMail(Message $message): bool;
-
-    /**
-     * @param $response
-     * @return bool
-     */
-    public function recaptchaIsValid($response): bool;
 }

src/Page/src/RoutesDelegator.php

@@ -9,19 +9,9 @@
 use Mezzio\Application;
 use Psr\Container\ContainerInterface;
 
-/**
- * Class RoutesDelegator
- * @package Frontend\Page
- */
 class RoutesDelegator
 {
-    /**
-     * @param ContainerInterface $container
-     * @param $serviceName
-     * @param callable $callback
-     * @return Application
-     */
-    public function __invoke(ContainerInterface $container, $serviceName, callable $callback): Application
+    public function __invoke(ContainerInterface $container, string $serviceName, callable $callback): Application
     {
         /** @var Application $app */
         $app = $callback();

src/Plugin/src/Factory/PluginManagerAwareInitializer.php

@@ -10,24 +10,18 @@
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 
-/**
- * Class PluginManagerAwareInitializer
- * @package Frontend\Plugin\Factory
- */
 class PluginManagerAwareInitializer
 {
     /**
-     * @param ContainerInterface $container
-     * @param $instance
-     * @return void
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */
-    public function __invoke(ContainerInterface $container, $instance): void
+    public function __invoke(ContainerInterface $container, ?object $instance): void
     {
         if ($instance instanceof PluginManagerAwareInterface) {
-            $pluginManager = $container->get(PluginManager::class);
-            $instance->setPluginManager($pluginManager);
+            $instance->setPluginManager(
+                $container->get(PluginManager::class)
+            );
         }
     }
 }

src/Plugin/src/TemplatePlugin.php

@@ -53,7 +53,7 @@ public function render(string $templateName, array $params = []): string
      * @param string $param
      * @param mixed $value
      */
-    public function addDefaultParam(string $templateName, string $param, mixed $value)
+    public function addDefaultParam(string $templateName, string $param, mixed $value): void
     {
         $this->template->addDefaultParam($templateName, $param, $value);
     }

src/User/src/Adapter/AuthenticationAdapter.php

@@ -8,6 +8,7 @@
 use Exception;
 use Frontend\User\Entity\User;
 use Frontend\User\Entity\UserIdentity;
+use Frontend\User\Entity\UserInterface;
 use Frontend\User\Entity\UserRole;
 use Laminas\Authentication\Adapter\AbstractAdapter;
 use Laminas\Authentication\Adapter\AdapterInterface;
@@ -124,7 +125,7 @@ public function authenticate(): Result
     /**
      * @throws Exception
      */
-    private function validateConfig()
+    private function validateConfig(): void
     {
         if (!isset($this->config['identity_class']) || !class_exists($this->config['identity_class'])) {
             throw new Exception("Missing or invalid param 'identity_class' provided.");
@@ -144,11 +145,9 @@ private function validateConfig()
     }
 
     /**
-     * @param $identityClass
-     * @param string $methodName
      * @throws Exception
      */
-    private function checkMethod($identityClass, string $methodName): void
+    private function checkMethod(UserInterface $identityClass, string $methodName): void
     {
         if (!method_exists($identityClass, $methodName)) {
             throw new Exception(sprintf(

src/User/src/Entity/UserAvatar.php

@@ -67,10 +67,10 @@ public function getName(): string
     }
 
     /**
-     * @param $name
+     * @param string $name
      * @return self
      */
-    public function setName($name): self
+    public function setName(string $name): self
     {
         $this->name = $name;
 

src/User/src/Entity/UserDetail.php

@@ -68,10 +68,10 @@ public function getFirstName(): ?string
     }
 
     /**
-     * @param $firstName
+     * @param string $firstName
      * @return self
      */
-    public function setFirstName($firstName): self
+    public function setFirstName(string $firstName): self
     {
         $this->firstName = $firstName;
 
@@ -87,10 +87,10 @@ public function getLastName(): ?string
     }
 
     /**
-     * @param $lastName
+     * @param string $lastName
      * @return self
      */
-    public function setLastName($lastName): self
+    public function setLastName(string $lastName): self
     {
         $this->lastName = $lastName;
 

src/User/src/Entity/UserResetPassword.php

@@ -107,10 +107,10 @@ public function getHash(): string
     }
 
     /**
-     * @param $hash
+     * @param string $hash
      * @return self
      */
-    public function setHash($hash): self
+    public function setHash(string $hash): self
     {
         $this->hash = $hash;