From ab097d356a5bcc21e0bb3890fb91cce2671ca71f Mon Sep 17 00:00:00 2001
From: Amine Ben hammou <amine@mailpoet.com>
Date: Mon, 4 Mar 2019 17:01:24 +0100
Subject: [PATCH] Fix PHPStan errors

---
 lib/Config/Capabilities.php                           |  2 +-
 lib/Config/Updater.php                                |  2 +-
 lib/Mailer/Mailer.php                                 |  5 ++++-
 lib/Models/CustomField.php                            |  2 +-
 lib/Models/Form.php                                   |  3 ++-
 lib/Models/Model.php                                  |  3 ++-
 lib/Models/Newsletter.php                             |  2 +-
 lib/Models/Segment.php                                |  3 ++-
 lib/Models/SendingQueue.php                           |  2 +-
 lib/Models/Subscriber.php                             |  2 +-
 lib/Newsletter/Renderer/Renderer.php                  |  5 ++++-
 lib/Newsletter/Shortcodes/Categories/Subscriber.php   |  3 +++
 .../ImportExport/Export/DefaultSubscribersGetter.php  |  2 +-
 lib/WP/Functions.php                                  | 11 +++++++++--
 14 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/lib/Config/Capabilities.php b/lib/Config/Capabilities.php
index 8a832f77c7..7dde2d9623 100644
--- a/lib/Config/Capabilities.php
+++ b/lib/Config/Capabilities.php
@@ -20,7 +20,7 @@ class Capabilities {
       $wp = new WPFunctions;
     }
     $this->wp = $wp;
-    $this->access_control = new AccessControl($wp);
+    $this->access_control = new AccessControl;
   }
 
   function init() {
diff --git a/lib/Config/Updater.php b/lib/Config/Updater.php
index 7b3555b473..ccb3b71296 100644
--- a/lib/Config/Updater.php
+++ b/lib/Config/Updater.php
@@ -28,7 +28,7 @@ class Updater {
   function init() {
     WPFunctions::get()->addFilter('pre_set_site_transient_update_plugins', array($this, 'checkForUpdate'));
   }
-
+  
   function checkForUpdate($update_transient) {
     if (!is_object($update_transient)) {
       $update_transient = new \stdClass;
diff --git a/lib/Mailer/Mailer.php b/lib/Mailer/Mailer.php
index 6ecbc94fef..1c5eaffd93 100644
--- a/lib/Mailer/Mailer.php
+++ b/lib/Mailer/Mailer.php
@@ -154,7 +154,10 @@ class Mailer {
       $return_path :
       $this->settings->get('bounce.address');
   }
-
+  
+  /**
+   * @param  \MailPoet\Models\Subscriber|array $subscriber
+   */
   function formatSubscriberNameAndEmailAddress($subscriber) {
     $subscriber = (is_object($subscriber)) ? $subscriber->asArray() : $subscriber;
     if (!is_array($subscriber)) return $subscriber;
diff --git a/lib/Models/CustomField.php b/lib/Models/CustomField.php
index 1e322b8950..b6851b7728 100644
--- a/lib/Models/CustomField.php
+++ b/lib/Models/CustomField.php
@@ -2,6 +2,7 @@
 namespace MailPoet\Models;
 
 use MailPoet\Form\Block\Date;
+use MailPoet\WP\Functions as WPFunctions;
 
 if (!defined('ABSPATH')) exit;
 
@@ -9,7 +10,6 @@ if (!defined('ABSPATH')) exit;
  * @property string $type
  * @property string|array $params
  */
-use MailPoet\WP\Functions as WPFunctions;
 
 class CustomField extends Model {
   public static $_table = MP_CUSTOM_FIELDS_TABLE;
diff --git a/lib/Models/Form.php b/lib/Models/Form.php
index ab8fb88ef1..c53d45871c 100644
--- a/lib/Models/Form.php
+++ b/lib/Models/Form.php
@@ -1,6 +1,8 @@
 <?php
 namespace MailPoet\Models;
 
+use MailPoet\WP\Functions as WPFunctions;
+
 if (!defined('ABSPATH')) exit;
 
 /**
@@ -8,7 +10,6 @@ if (!defined('ABSPATH')) exit;
  * @property string|array $body
  * @property string $name
  */
-use MailPoet\WP\Functions as WPFunctions;
 
 class Form extends Model {
   public static $_table = MP_FORMS_TABLE;
diff --git a/lib/Models/Model.php b/lib/Models/Model.php
index cafb138488..f69b754e62 100644
--- a/lib/Models/Model.php
+++ b/lib/Models/Model.php
@@ -2,6 +2,8 @@
 
 namespace MailPoet\Models;
 
+use MailPoet\WP\Functions as WPFunctions;
+
 if (!defined('ABSPATH')) exit;
 
 /**
@@ -112,7 +114,6 @@ if (!defined('ABSPATH')) exit;
  * @property string|null $updated_at
  * @property string|null $id
  */
-use MailPoet\WP\Functions as WPFunctions;
 
 class Model extends \Sudzy\ValidModel {
   const DUPLICATE_RECORD = 23000;
diff --git a/lib/Models/Newsletter.php b/lib/Models/Newsletter.php
index 79889ff0dd..64ba424b34 100644
--- a/lib/Models/Newsletter.php
+++ b/lib/Models/Newsletter.php
@@ -8,6 +8,7 @@ use MailPoet\Util\Helpers;
 use MailPoet\Util\Security;
 use MailPoet\WP\Emoji;
 use function MailPoet\Util\array_column;
+use MailPoet\WP\Functions as WPFunctions;
 
 if (!defined('ABSPATH')) exit;
 
@@ -29,7 +30,6 @@ if (!defined('ABSPATH')) exit;
  * @property string $body
  * @property string|null $schedule
  */
-use MailPoet\WP\Functions as WPFunctions;
 
 class Newsletter extends Model {
   public static $_table = MP_NEWSLETTERS_TABLE;
diff --git a/lib/Models/Segment.php b/lib/Models/Segment.php
index 101bfa21bc..da8b07d6d0 100644
--- a/lib/Models/Segment.php
+++ b/lib/Models/Segment.php
@@ -1,6 +1,8 @@
 <?php
 namespace MailPoet\Models;
 
+use MailPoet\WP\Functions as WPFunctions;
+
 if (!defined('ABSPATH')) exit;
 
 /**
@@ -9,7 +11,6 @@ if (!defined('ABSPATH')) exit;
  * @property string $type
  * @property string $description
  */
-use MailPoet\WP\Functions as WPFunctions;
 
 class Segment extends Model {
   static $_table = MP_SEGMENTS_TABLE;
diff --git a/lib/Models/SendingQueue.php b/lib/Models/SendingQueue.php
index ed9a87dacf..263d89ef69 100644
--- a/lib/Models/SendingQueue.php
+++ b/lib/Models/SendingQueue.php
@@ -4,6 +4,7 @@ namespace MailPoet\Models;
 use MailPoet\Util\Helpers;
 use MailPoet\WP\Emoji;
 use MailPoet\Tasks\Subscribers as TaskSubscribers;
+use MailPoet\WP\Functions as WPFunctions;
 
 if (!defined('ABSPATH')) exit;
 
@@ -19,7 +20,6 @@ if (!defined('ABSPATH')) exit;
  * @property string|array $subscribers
  * @property string|null $deleted_at
  */
-use MailPoet\WP\Functions as WPFunctions;
 
 class SendingQueue extends Model {
   public static $_table = MP_SENDING_QUEUES_TABLE;
diff --git a/lib/Models/Subscriber.php b/lib/Models/Subscriber.php
index b8ae526a9b..40721c585f 100644
--- a/lib/Models/Subscriber.php
+++ b/lib/Models/Subscriber.php
@@ -5,6 +5,7 @@ use MailPoet\Settings\SettingsController;
 use MailPoet\Subscribers\ConfirmationEmailMailer;
 use MailPoet\Util\Helpers;
 use function MailPoet\Util\array_column;
+use MailPoet\WP\Functions as WPFunctions;
 
 if (!defined('ABSPATH')) exit;
 
@@ -26,7 +27,6 @@ if (!defined('ABSPATH')) exit;
  * @property string $unconfirmed_data
  * @property int $is_woocommerce_user
  */
-use MailPoet\WP\Functions as WPFunctions;
 
 class Subscriber extends Model {
   public static $_table = MP_SUBSCRIBERS_TABLE;
diff --git a/lib/Newsletter/Renderer/Renderer.php b/lib/Newsletter/Renderer/Renderer.php
index 44f512fbdd..3888a41115 100644
--- a/lib/Newsletter/Renderer/Renderer.php
+++ b/lib/Newsletter/Renderer/Renderer.php
@@ -21,7 +21,10 @@ class Renderer {
   private $template;
   const NEWSLETTER_TEMPLATE = 'Template.html';
   const FILTER_POST_PROCESS = 'mailpoet_rendering_post_process';
-
+  
+  /**
+   * @param \MailPoet\Models\Newsletter|array $newsletter
+   */
   function __construct($newsletter, $preview = false) {
     $this->newsletter = ($newsletter instanceof Newsletter) ? $newsletter->asArray() : $newsletter;
     $this->preview = $preview;
diff --git a/lib/Newsletter/Shortcodes/Categories/Subscriber.php b/lib/Newsletter/Shortcodes/Categories/Subscriber.php
index 96a9da4e39..1128f8c593 100644
--- a/lib/Newsletter/Shortcodes/Categories/Subscriber.php
+++ b/lib/Newsletter/Shortcodes/Categories/Subscriber.php
@@ -8,6 +8,9 @@ use MailPoet\WP\Functions as WPFunctions;
 if (!defined('ABSPATH')) exit;
 
 class Subscriber {
+  /**
+   * @param \MailPoet\Models\Subscriber|false $subscriber
+   */
   static function process(
     $shortcode_details,
     $newsletter,
diff --git a/lib/Subscribers/ImportExport/Export/DefaultSubscribersGetter.php b/lib/Subscribers/ImportExport/Export/DefaultSubscribersGetter.php
index 22f07a3a8c..6d47a7da4d 100644
--- a/lib/Subscribers/ImportExport/Export/DefaultSubscribersGetter.php
+++ b/lib/Subscribers/ImportExport/Export/DefaultSubscribersGetter.php
@@ -5,11 +5,11 @@ namespace MailPoet\Subscribers\ImportExport\Export;
 use MailPoet\Models\Segment;
 use MailPoet\Models\Subscriber;
 use MailPoet\Models\SubscriberSegment;
+use MailPoet\WP\Functions as WPFunctions;
 
 /**
  * Gets batches of subscribers from default segments.
  */
-use MailPoet\WP\Functions as WPFunctions;
 
 class DefaultSubscribersGetter extends SubscribersGetter {
 
diff --git a/lib/WP/Functions.php b/lib/WP/Functions.php
index 3e99808886..d19e8aac4a 100644
--- a/lib/WP/Functions.php
+++ b/lib/WP/Functions.php
@@ -2,8 +2,12 @@
 namespace MailPoet\WP;
 
 class Functions {
-  static private $instance;
 
+  static private $instance;
+  
+  /**
+   * @return Functions
+   */
   static function get() {
     if (self::$instance == null) {
       self::$instance = new Functions;
@@ -154,7 +158,10 @@ class Functions {
   function currentUserCan() {
     return call_user_func_array('current_user_can', func_get_args());
   }
-
+  
+  /**
+   * @return \WP_Role | null
+   */
   function getRole() {
     return call_user_func_array('get_role', func_get_args());
   }