4268: Cleaned up

Author: rimi-itk

Taskfile.yml

@@ -167,6 +167,14 @@ tasks:
           COMPOSE_ARGS: run --rm prettier {{.YAML_FILES_GLOB}} --check
     silent: true
 
+  code-analysis:
+    desc: "Run code analysis"
+    cmds:
+      - task: compose
+        vars:
+          COMPOSE_ARGS: exec phpfpm vendor/bin/psalm --no-cache
+    silent: true
+
   default:
     cmds:
       - task --list

src/Fixtures/FixtureLoader.php

@@ -8,8 +8,6 @@
 use Elastic\Elasticsearch\Exception\MissingParameterException;
 use Elastic\Elasticsearch\Exception\ServerResponseException;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
 use Symfony\Contracts\HttpClient\Exception\DecodingExceptionInterface;
 use Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface;
@@ -60,19 +58,19 @@ public function process(string $indexName, string $url): void
      * @throws RedirectionExceptionInterface
      * @throws ServerExceptionInterface
      * @throws TransportExceptionInterface
-     * @throws HttpException
+     * @throws \HttpException
      */
     private function download(string $url): array
     {
         // Load from local file if using "file" URL scheme.
         if (preg_match('~^file://(?<path>/.+)$~', $url, $matches)) {
             $path = $matches['path'];
             if (!is_readable($path)) {
-                throw new NotFoundHttpException('Unable to download fixture data');
+                throw new \HttpException('Unable to load fixture data');
             }
             $data = json_decode(file_get_contents($path), true);
             if (empty($data)) {
-                throw new NotFoundHttpException('Unable to download fixture data');
+                throw new \HttpException('Unable to load fixture data');
             }
 
             return $data;
@@ -81,7 +79,7 @@ private function download(string $url): array
         $response = $this->httpClient->request('GET', $url);
 
         if (Response::HTTP_OK !== $response->getStatusCode()) {
-            throw new NotFoundHttpException('Unable to download fixture data');
+            throw new \HttpException('Unable to download fixture data');
         }
 
         return $response->toArray();