Merge pull request #66 from City-of-Helsinki/UHF-9213

UHF-9213: Run phpstan
City-of-Helsinki · Nov 29, 2023 · 8966aa2 · 8966aa2
2 parents b14b5fc + 14afb15
commit 8966aa2
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -66,8 +66,11 @@ jobs:
 
       - name: Run PHPCS
         working-directory: ${{ env.DRUPAL_ROOT }}
-        run: |
-          vendor/bin/phpcs $MODULE_FOLDER --standard=Drupal --extensions=php,module,inc,install,test,info
+        run: vendor/bin/phpcs $MODULE_FOLDER --standard=Drupal,DrupalPractice --extensions=php,module,inc,install,test,info
+
+      - name: Run phpstan
+        working-directory: ${{ env.DRUPAL_ROOT }}
+        run: vendor/bin/phpstan analyze -c $MODULE_FOLDER/phpstan.neon $MODULE_FOLDER
 
       - name: Start services
         working-directory: ${{ env.DRUPAL_ROOT }}

diff --git a/phpstan.neon b/phpstan.neon
@@ -0,0 +1,12 @@
+parameters:
+  fileExtensions:
+      - php
+      - module
+      - install
+  paths:
+    - ./
+  excludePaths:
+    - vendor
+  level: 3
+  checkMissingIterableValueType: false
+  treatPhpDocTypesAsCertain: false
diff --git a/src/Plugin/DebugDataItem/Robots.php b/src/Plugin/DebugDataItem/Robots.php
@@ -17,7 +17,7 @@
  *   description = @Translation("Robots data")
  * )
  */
-class Robots extends DebugDataItemPluginBase implements ContainerFactoryPluginInterface {
+final class Robots extends DebugDataItemPluginBase implements ContainerFactoryPluginInterface {
 
   /**
    * Robots header enabled settings value.
@@ -29,8 +29,8 @@ class Robots extends DebugDataItemPluginBase implements ContainerFactoryPluginIn
   /**
    * {@inheritdoc}
    */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    $instance = new static($configuration, $plugin_id, $plugin_definition);
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) : self {
+    $instance = new self($configuration, $plugin_id, $plugin_definition);
 
     $instance->robotsHeader = (bool) $container->get('config.factory')
       ->get('helfi_proxy.settings')

diff --git a/tests/src/Kernel/RobotsResponseSubscriberTest.php b/tests/src/Kernel/RobotsResponseSubscriberTest.php
@@ -58,6 +58,7 @@ private function getResponseEvent(Request $request = NULL) : ResponseEvent {
       $this->container->get('http_kernel'),
       $request,
       // @todo Rename this once Core requires 7.0 symfony.
+      // @phpstan-ignore-next-line
       HttpKernelInterface::MASTER_REQUEST,
       new HtmlResponse()
     );

diff --git a/tests/src/Kernel/TunnistamoRedirectUrlSubscriberTest.php b/tests/src/Kernel/TunnistamoRedirectUrlSubscriberTest.php
@@ -132,7 +132,9 @@ private function configureTunnistamoClient(): void {
    */
   private function getRedirectUri() : string {
     $client = OpenIDConnectClientEntity::load('tunnistamo')->getPlugin();
-    $url = $client->authorize()->getTargetUrl();
+    /** @var \Symfony\Component\HttpFoundation\RedirectResponse $response */
+    $response = $client->authorize();
+    $url = $response->getTargetUrl();
     parse_str(parse_url($url, PHP_URL_QUERY), $query);
 
     return $query['redirect_uri'];