Fixing phpstan issues.

drupal-graphql · Jul 25, 2024 · bf6444f · bf6444f
1 parent a6a6233
commit bf6444f
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 15 deletions.
diff --git a/src/EventSubscriber/ApqSubscriber.php b/src/EventSubscriber/ApqSubscriber.php
@@ -65,7 +65,7 @@ public function onBeforeOperation(OperationEvent $event): void {
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents() {
+  public static function getSubscribedEvents(): array {
     return [
       OperationEvent::GRAPHQL_OPERATION_BEFORE => 'onBeforeOperation',
     ];

diff --git a/src/EventSubscriber/OperationSubscriber.php b/src/EventSubscriber/OperationSubscriber.php
@@ -73,7 +73,7 @@ public function onAfterOperation(OperationEvent $event): void {
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents() {
+  public static function getSubscribedEvents(): array {
     return [
       OperationEvent::GRAPHQL_OPERATION_BEFORE => 'onBeforeOperation',
       OperationEvent::GRAPHQL_OPERATION_AFTER => 'onAfterOperation',

diff --git a/src/GraphQL/Response/ResponseInterface.php b/src/GraphQL/Response/ResponseInterface.php
@@ -4,6 +4,8 @@
 
 namespace Drupal\graphql\GraphQL\Response;
 
+use Symfony\Component\Validator\ConstraintViolationListInterface;
+
 /**
  * Response interface used for GraphQL responses.
  */

diff --git a/src/GraphQL/Utility/FileUpload.php b/src/GraphQL/Utility/FileUpload.php
@@ -520,9 +520,9 @@ protected function prepareFilename(string $filename, array &$validators): string
           /** @var \Drupal\file\FileInterface $file */
           $file = $this->fileStorage->create([]);
           $file->setFilename($filename);
-          $passes_validation = empty($this->fileValidator->validate($file, $validators['FileExtension']['extensions']));
+          $passes_validation = count($this->fileValidator->validate($file, $validators['FileExtension']['extensions']));
         }
-        if (empty($validators['FileExtension']['extensions']) || $passes_validation) {
+        if (empty($validators['FileExtension']['extensions']) || ($passes_validation > 0)) {
           if ((substr($filename, -4) != '.txt')) {
             // The destination filename will also later be used to create the
             // URI.

diff --git a/src/Plugin/GraphQL/DataProducer/Entity/Fields/Image/ImageDerivative.php b/src/Plugin/GraphQL/DataProducer/Entity/Fields/Image/ImageDerivative.php
@@ -98,12 +98,9 @@ public function resolve(FileInterface $entity = NULL, $style, RefinableCacheable
     $metadata->addCacheableDependency($access);
     if ($access->isAllowed() && $image_style = ImageStyle::load($style)) {
 
-      // @phpstan-ignore-next-line
       $width = $entity->width;
-      // @phpstan-ignore-next-line
       $height = $entity->height;
-
-      if (empty($width) || empty($height)) {
+      if (!isset($width) || !isset($height)) {
         /** @var \Drupal\Core\Image\ImageInterface $image */
         $image = \Drupal::service('image.factory')->get($entity->getFileUri());
         if ($image->isValid()) {

diff --git a/tests/src/Kernel/Framework/UploadFileServiceTest.php b/tests/src/Kernel/Framework/UploadFileServiceTest.php
@@ -22,13 +22,6 @@ class UploadFileServiceTest extends GraphQLTestBase {
    */
   protected $uploadService;
 
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  protected static $modules = ['file'];
-
   /**
    * Gets the file path of the source file.
    *
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,8 @@ @@
     namespace Drupal\graphql\GraphQL\Response;
+    use Symfony\Component\Validator\ConstraintViolationListInterface;
     /**
      * Response interface used for GraphQL responses.
      */
@@ Expand Down @@