Move more logic to parent class

Author: swissspidy

classes/Message/CommentModeration.php

@@ -18,23 +18,6 @@
  * @since 2.0.0
  */
 class CommentModeration extends Section {
-	/**
-	 * Constructor.
-	 *
-	 * @since  2.0.0
-	 * @access public
-	 *
-	 * @param array   $entries The comment moderation entries.
-	 * @param WP_User $user    The current user.
-	 */
-	public function __construct( $entries, WP_User $user = null ) {
-		parent::__construct( $user );
-
-		foreach ( $entries as $comment => $time ) {
-			$this->entries[] = $this->get_single_message( get_comment( $comment ), $time );
-		}
-	}
-
 	/**
 	 * Returns the comment moderation section message.
 	 *
@@ -85,12 +68,13 @@ public function get_message() {
 	 * @since  2.0.0
 	 * @access protected
 	 *
-	 * @param WP_Comment $comment The comment object.
-	 * @param int        $time    The timestamp when the comment was written.
+	 * @param int $comment The comment ID.
+	 * @param int $time    The timestamp when the comment was written.
 	 *
 	 * @return string The comment moderation message.
 	 */
-	protected function get_single_message( WP_Comment $comment, $time ) {
+	protected function get_single_message( $comment, $time ) {
+		$comment = get_comment( $comment );
 		if ( null === $comment || '0' !== $comment->comment_approved ) {
 			return '';
 		}

classes/Message/CommentNotification.php

@@ -16,21 +16,6 @@
  * Responsible for creating the comment notification section
  */
 class CommentNotification extends CommentModeration {
-	/**
-	 * Constructor.
-	 *
-	 * @param array   $entries The comment moderation entries.
-	 * @param WP_User $user    The current user.
-	 */
-	public function __construct( $entries, WP_User $user = null ) {
-		parent::__construct( $entries, $user );
-
-		$this->entries = array();
-		foreach ( $entries as $comment => $time ) {
-			$this->entries[] = $this->get_single_message( get_comment( $comment ), $time );
-		}
-	}
-
 	/**
 	 * Get comment moderation section message.
 	 *
@@ -75,12 +60,14 @@ public function get_message() {
 	/**
 	 * Get the comment moderation message.
 	 *
-	 * @param WP_Comment $comment The comment object.
-	 * @param int        $time    The timestamp when the comment was written.
+	 * @param int $comment The comment ID.
+	 * @param int $time    The timestamp when the comment was written.
 	 *
 	 * @return string The comment moderation message.
 	 */
-	protected function get_single_message( WP_Comment $comment, $time ) {
+	protected function get_single_message( $comment, $time ) {
+		$comment = get_comment( $comment );
+
 		if ( null === $comment ) {
 			return '';
 		}

classes/Message/CoreUpdate.php

@@ -18,23 +18,37 @@ class CoreUpdate extends Section {
 	/**
 	 * The comment moderation entries.
 	 *
+	 * @since  2.0.0
+	 * @access protected
+	 *
 	 * @var array
 	 */
 	protected $entries;
 
+	/**
+	 * The event type.
+	 *
+	 * @since  2.0.0
+	 * @access protected
+	 *
+	 * @var string
+	 */
+	protected $event;
+
 	/**
 	 * Constructor.
 	 *
+	 * @since  2.0.0
+	 * @access protected
+	 *
 	 * @param array   $entries The core update entries.
 	 * @param WP_User $user    The current user.
 	 * @param string  $event   The current event.
 	 */
 	public function __construct( $entries, WP_User $user = null, $event ) {
-		parent::__construct( $user );
+		parent::__construct( $entries, $user );
 
-		foreach ( $entries as $version => $time ) {
-			$this->entries[] = $this->get_single_message( $version, $time, $event );
-		}
+		$this->event = $event;
 	}
 
 	/**
@@ -51,12 +65,11 @@ public function get_message() {
 	 *
 	 * @param string $version The version WordPress was updated to.
 	 * @param int    $time    The timestamp when the update happened.
-	 * @param string $event   The current event.
 	 *
 	 * @return string The core update message.
 	 */
-	protected function get_single_message( $version, $time, $event ) {
-		if ( 'core_update_success' === $event ) {
+	protected function get_single_message( $version, $time ) {
+		if ( 'core_update_success' === $this->event ) {
 			return $this->get_core_update_success_message( $version, $time );
 		} else {
 			return $this->get_core_update_fail_message( $version, $time );

classes/Message/PasswordChangeNotification.php

@@ -17,23 +17,6 @@
  * @since 2.0.0
  */
 class PasswordChangeNotification extends Section {
-	/**
-	 * Constructor.
-	 *
-	 * @since  2.0.0
-	 * @access public
-	 *
-	 * @param array   $entries The user notification entries.
-	 * @param WP_User $user    The current user.
-	 */
-	public function __construct( $entries, WP_User $user = null ) {
-		parent::__construct( $user );
-
-		foreach ( $entries as $user_id => $time ) {
-			$this->entries[] = $this->get_single_message( $user_id, $time );
-		}
-	}
-
 	/**
 	 * Get password change notification section message.
 	 *

classes/Message/Section.php

@@ -47,6 +47,19 @@ abstract class Section implements MessageInterface {
 	 */
 	abstract public function get_message();
 
+	/**
+	 * Returns a single message in the section.
+	 *
+	 * @since  2.0.0
+	 * @access protected
+	 *
+	 * @param string|int $entry The single entry item. For example a user ID or comment ID.
+	 * @param int        $time  The timestamp when the update happened.
+	 *
+	 * @return string The single message.
+	 */
+	abstract protected function get_single_message( $entry, $time );
+
 	/**
 	 * Constructor.
 	 *
@@ -55,9 +68,14 @@ abstract public function get_message();
 	 * @since  2.0.0
 	 * @access public
 	 *
-	 * @param WP_User $user The current user.
+	 * @param array   $entries The message entries.
+	 * @param WP_User $user    The current user.
 	 */
-	public function __construct( WP_User $user = null ) {
+	public function __construct( $entries, WP_User $user = null ) {
+		foreach ( $entries as $entry => $time ) {
+			$this->entries[] = $this->get_single_message( $entry, $time );
+		}
+
 		$this->user = $user;
 	}
 }

classes/Message/UserNotification.php

@@ -17,23 +17,6 @@
  * @since 2.0.0
  */
 class UserNotification extends Section {
-	/**
-	 * Constructor.
-	 *
-	 * @since  2.0.0
-	 * @access public
-	 *
-	 * @param array   $entries The user notification entries.
-	 * @param WP_User $user    The current user.
-	 */
-	public function __construct( $entries, WP_User $user = null ) {
-		parent::__construct( $user );
-
-		foreach ( $entries as $user_id => $time ) {
-			$this->entries[] = $this->get_single_message( $user_id, $time );
-		}
-	}
-
 	/**
 	 * Returns the core update section message.
 	 *