From ffc11af6890f039094c28f6596dc5f45cee94e32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Jakes=CC=8C?= <jan@jakes.pro>
Date: Wed, 16 Oct 2019 13:44:04 +0200
Subject: [PATCH] Check data factories with PHPStan, fix discovered problems

[MAILPOET-2429]
---
 RoboFile.php                               | 7 ++++++-
 tasks/phpstan/phpstan-tests.neon           | 1 +
 tests/DataFactories/Newsletter.php         | 3 +++
 tests/DataFactories/WooCommerceProduct.php | 2 +-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/RoboFile.php b/RoboFile.php
index df48d9f9a6..d40be8fc34 100644
--- a/RoboFile.php
+++ b/RoboFile.php
@@ -476,7 +476,12 @@ class RoboFile extends \Robo\Tasks {
       // tests
       ->taskExec($task)
       ->rawArg('--configuration=phpstan-tests.neon')
-      ->arg("$dir/tests/unit")
+      ->rawArg(
+        implode(' ', [
+          "$dir/tests/DataFactories",
+          "$dir/tests/unit",
+        ])
+      )
       ->dir(__DIR__ . '/tasks/phpstan')
 
       ->taskExec('cd ' . __DIR__ . ' && ./tools/vendor/composer.phar install')
diff --git a/tasks/phpstan/phpstan-tests.neon b/tasks/phpstan/phpstan-tests.neon
index d6ec6c45a2..66071926e7 100644
--- a/tasks/phpstan/phpstan-tests.neon
+++ b/tasks/phpstan/phpstan-tests.neon
@@ -8,6 +8,7 @@ parameters:
     - %mailpoetDir%/vendor/codeception/verify/src/Codeception/function.php
     - %mailpoetDir%/vendor/codeception/verify/src/Codeception/Verify.php
   autoload_directories:
+    - %mailpoetDir%/tests/_support
     - %mailpoetDir%/tests/unit
   dynamicConstantNames:
     - WP_DEBUG
diff --git a/tests/DataFactories/Newsletter.php b/tests/DataFactories/Newsletter.php
index 22f276ca08..5dec056413 100644
--- a/tests/DataFactories/Newsletter.php
+++ b/tests/DataFactories/Newsletter.php
@@ -20,6 +20,9 @@ class Newsletter {
   /** @var array */
   private $segments;
 
+  /** @var array */
+  private $queue_options;
+
   /** @var array */
   private $task_subscribers;
 
diff --git a/tests/DataFactories/WooCommerceProduct.php b/tests/DataFactories/WooCommerceProduct.php
index d144c56720..baa0748977 100644
--- a/tests/DataFactories/WooCommerceProduct.php
+++ b/tests/DataFactories/WooCommerceProduct.php
@@ -98,7 +98,7 @@ class WooCommerceProduct {
     $ids = array_map(function($id){
       return ['id' => $id];
     }, $ids);
-    return $this->update('tagIds', $id);
+    return $this->update('tagIds', $ids);
   }
 
   /**