- Replaces model arrays with model objects

lib/Newsletter/Shortcodes/Categories/Newsletter.php

@@ -1,9 +1,10 @@
 <?php
 namespace MailPoet\Newsletter\Shortcodes\Categories;
+
 use MailPoet\Models\Newsletter as NewsletterModel;
 
 if(!defined('ABSPATH')) exit;
-require_once( ABSPATH . "wp-includes/pluggable.php" );
+require_once(ABSPATH . "wp-includes/pluggable.php");
 
 class Newsletter {
   static function process($action,
@@ -15,7 +16,7 @@ class Newsletter {
   ) {
     switch($action) {
       case 'subject':
-        return ($newsletter) ? $newsletter['subject'] : false;
+        return ($newsletter) ? $newsletter->subject : false;
 
       case 'total':
         return substr_count($content, 'data-post-id');
@@ -27,9 +28,9 @@ class Newsletter {
         return ($latest_post) ? $latest_post['post_title'] : false;
 
       case 'number':
-        if($newsletter['type'] !== NewsletterModel::TYPE_NOTIFICATION_HISTORY) return false;
+        if($newsletter->type !== NewsletterModel::TYPE_NOTIFICATION_HISTORY) return false;
         $sent_newsletters =
-          NewsletterModel::where('parent_id', $newsletter['parent_id'])
+          NewsletterModel::where('parent_id', $newsletter->parent_id)
             ->where('status', NewsletterModel::STATUS_SENT)
             ->count();
         return ++$sent_newsletters;

lib/Newsletter/Shortcodes/Categories/Subscriber.php

@@ -1,5 +1,6 @@
 <?php
 namespace MailPoet\Newsletter\Shortcodes\Categories;
+
 use MailPoet\Models\Subscriber as SubscriberModel;
 use MailPoet\Models\SubscriberCustomField;
 
@@ -15,14 +16,14 @@ class Subscriber {
   ) {
     switch($action) {
       case 'firstname':
-        return ($subscriber) ? $subscriber['first_name'] : $default_value;
+        return ($subscriber) ? $subscriber->first_name : $default_value;
       case 'lastname':
-        return ($subscriber) ? $subscriber['last_name'] : $default_value;
+        return ($subscriber) ? $subscriber->last_name : $default_value;
       case 'email':
-        return ($subscriber) ? $subscriber['email'] : false;
+        return ($subscriber) ? $subscriber->email : false;
       case 'displayname':
-        if($subscriber && $subscriber['wp_user_id']) {
-          $wp_user = get_userdata($subscriber['wp_user_id']);
+        if($subscriber && $subscriber->wp_user_id) {
+          $wp_user = get_userdata($subscriber->wp_user_id);
           return $wp_user->user_login;
         }
         return $default_value;
@@ -31,10 +32,10 @@ class Subscriber {
           ->count();
       default:
         if(preg_match('/cf_(\d+)/', $action, $custom_field) &&
-          !empty($subscriber['id'])
+          !empty($subscriber->id)
         ) {
           $custom_field = SubscriberCustomField
-            ::where('subscriber_id', $subscriber['id'])
+            ::where('subscriber_id', $subscriber->id)
             ->where('custom_field_id', $custom_field[1])
             ->findOne();
           return ($custom_field) ? $custom_field->value : false;

lib/Newsletter/Shortcodes/Shortcodes.php

@@ -12,15 +12,9 @@ class Shortcodes {
     $subscriber = false,
     $queue = false
   ) {
-    $this->newsletter = (is_object($newsletter)) ?
-      $newsletter->asArray() :
-      $newsletter;
-    $this->subscriber = (is_object($subscriber)) ?
-      $subscriber->asArray() :
-      $subscriber;
-    $this->queue = (is_object($queue)) ?
-      $queue->asArray() :
-      $queue;
+    $this->newsletter = $newsletter;
+    $this->subscriber = $subscriber;
+    $this->queue = $queue;
   }
 
   function extract($content, $categories = false) {