RELEASE: 5.0.46

Author: eeteamcodebase

CHANGELOG.md

@@ -6,21 +6,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Releases
 
-### [5.0.45]
+### [5.0.46]
 
 #### Added
  - NEW
 
 #### Fixed
- - [Dont send address to PayPal if country code is not  a 2 character ISO 3166 code (#1947)](https://github.com/eventespresso/cafe/pull/1947)
  - FIX
 
 #### Changed
- - [Trailing 0 Removed from Ticket Price Calculator (Barista#1426) (#1940)](https://github.com/eventespresso/cafe/pull/1940)
- - [REM tickets do not fully retain their state when editing (Barista#1368) (#1942)](https://github.com/eventespresso/cafe/pull/1942)
- - [PayPal Commerce - if no country has been set use state iso (#1956)](https://github.com/eventespresso/cafe/pull/1956)
- - [Add Post Variable to Events List Event Class Filter (#1960)](https://github.com/eventespresso/cafe/pull/1960)
- - [Fix readme and changelog (#1959)](https://github.com/eventespresso/cafe/pull/1959)
+ - [Add Serialized Model Protection (#1914)](https://github.com/eventespresso/cafe/pull/1914)
+ - [Improve SessionStartHandler Error Handling (#1967)](https://github.com/eventespresso/cafe/pull/1967)
  - MOD
 
 #### Deprecated
@@ -30,7 +26,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  - RMV
 
 #### Security
- - SEC
+ - [Fix Model Cap Restriction Generation (#1975)](https://github.com/eventespresso/cafe/pull/1975)
+
+
+
+### [5.0.45]
+
+#### Added
+ - NEW
+
+#### Fixed
+ - [Dont send address to PayPal if country code is not  a 2 character ISO 3166 code (#1947)](https://github.com/eventespresso/cafe/pull/1947)
+
+#### Changed
+ - [Trailing 0 Removed from Ticket Price Calculator (Barista#1426) (#1940)](https://github.com/eventespresso/cafe/pull/1940)
+ - [REM tickets do not fully retain their state when editing (Barista#1368) (#1942)](https://github.com/eventespresso/cafe/pull/1942)
+ - [PayPal Commerce - if no country has been set use state iso (#1956)](https://github.com/eventespresso/cafe/pull/1956)
+ - [Add Post Variable to Events List Event Class Filter (#1960)](https://github.com/eventespresso/cafe/pull/1960)
+ - [Fix readme and changelog (#1959)](https://github.com/eventespresso/cafe/pull/1959)
+ - [Add Serialized Model Protection (#1914)](https://github.com/eventespresso/cafe/pull/1914)
+ - [Improve SessionStartHandler Error Handling (#1967)](https://github.com/eventespresso/cafe/pull/1967)
+
+#### Security
+ - [Fix Model Cap Restriction Generation (#1975)](https://github.com/eventespresso/cafe/pull/1975)
 
 
 

VERSION

@@ -1 +1 @@
-5.0.45
+5.0.46

caffeinated/core/libraries/messages/message_type/newsletter/EE_Newsletter_message_type.class.php

@@ -14,18 +14,18 @@ class EE_Newsletter_message_type extends EE_message_type
 {
     public function __construct()
     {
-        $this->name = 'newsletter';
-        $this->description = esc_html__(
+        $this->name              = 'newsletter';
+        $this->description       = esc_html__(
             'Batch message type messages are triggered manually by the admin for sending notifications to a selected group of recipients. This should only be used for more general notification type messages that contain information specific for the recipients. For "newsletter" type messages we recommend using an email list service like MailChimp, because sending non-related mail-outs to contacts increases the risk of your site domain getting added to spam lists, which will prevent messages getting to users.',
             'event_espresso'
         );
-        $this->label = array(
+        $this->label             = [
             'singular' => esc_html__('batch', 'event_espresso'),
             'plural'   => esc_html__('batches', 'event_espresso'),
-        );
-        $this->_master_templates = array(
+        ];
+        $this->_master_templates = [
             'email' => 'registration',
-        );
+        ];
 
         parent::__construct();
     }
@@ -36,7 +36,7 @@ public function __construct()
      */
     protected function _set_admin_pages()
     {
-        $this->admin_registered_pages = array(); // no admin pages to register this with.
+        $this->admin_registered_pages = []; // no admin pages to register this with.
     }
 
 
@@ -45,22 +45,23 @@ protected function _set_admin_pages()
      */
     protected function _set_data_handler()
     {
-        $this->_data_handler = 'Registrations';
+        $this->_data_handler   = 'Registrations';
         $this->_single_message = $this->_data instanceof EE_Registration;
     }
 
 
     /**
      * Returns the data for the given context for this message type.
+     *
      * @param string          $context
      * @param EE_Registration $registration
      * @param int             $id
-     * @return array|mixed
+     * @return array
      */
     protected function _get_data_for_context($context, EE_Registration $registration, $id)
     {
         // newsletter message type data handler is 'Registrations' and it expects an array of EE_Registration objects.
-        return array($registration);
+        return [$registration];
     }
 
 
@@ -69,7 +70,7 @@ protected function _get_data_for_context($context, EE_Registration $registration
      */
     protected function _set_admin_settings_fields()
     {
-        $this->_admin_settings_fields = array();
+        $this->_admin_settings_fields = [];
     }
 
 
@@ -78,18 +79,18 @@ protected function _set_admin_settings_fields()
      */
     protected function _set_contexts()
     {
-        $this->_context_label = array(
+        $this->_context_label = [
             'label'       => esc_html__('recipient', 'event_espresso'),
             'plural'      => esc_html__('recipients', 'event_espresso'),
             'description' => esc_html__('Recipient\'s are who will receive the message.', 'event_espresso'),
-        );
+        ];
 
-        $this->_contexts = array(
-            'attendee' => array(
+        $this->_contexts = [
+            'attendee' => [
                 'label'       => esc_html__('Registrant', 'event_espresso'),
                 'description' => esc_html__('This template goes to selected registrants.', 'event_espresso'),
-            ),
-        );
+            ],
+        ];
     }
 
 
@@ -98,18 +99,18 @@ protected function _set_contexts()
      * For the newsletter message type we only have two valid shortcode libraries in use, recipient details and
      * organization.  That's it!
      *
-     * @since   4.3.0
      * @return  void
+     * @since   4.3.0
      */
     protected function _set_valid_shortcodes()
     {
         parent::_set_valid_shortcodes();
 
-        $included_shortcodes = array(
+        $included_shortcodes = [
             'recipient_details',
             'organization',
             'newsletter',
-        );
+        ];
 
         foreach ($this->_valid_shortcodes as $context => $shortcodes) {
             foreach ($shortcodes as $key => $shortcode) {
@@ -128,19 +129,16 @@ protected function _set_valid_shortcodes()
      *
      * @return array
      * @throws EE_Error
-     * @throws InvalidArgumentException
      * @throws ReflectionException
-     * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
-     * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
      */
     protected function _attendee_addressees()
     {
-        $addressee = array();
+        $addressee = [];
 
         // looping through registrations
-        foreach ($this->_data->registrations as $reg_id => $details) {
+        foreach ($this->_data->registrations as $details) {
             // set $attendee array to blank on each loop
-            $aee = array();
+            $aee = [];
 
             // need to get the attendee from this registration.
             $attendee = isset($details['att_obj']) && $details['att_obj'] instanceof EE_Attendee
@@ -152,25 +150,23 @@ protected function _attendee_addressees()
             }
 
             // set $aee from attendee object
-            $aee['att_obj'] = $attendee;
-            $aee['reg_objs'] = isset($this->_data->attendees[ $attendee->ID() ]['reg_objs'])
+            $aee['att_obj']        = $attendee;
+            $aee['reg_objs']       = isset($this->_data->attendees[ $attendee->ID() ]['reg_objs'])
                 ? $this->_data->attendees[ $attendee->ID() ]['reg_objs']
-                : array();
+                : [];
             $aee['attendee_email'] = $attendee->email();
-            $aee['tkt_objs'] = isset($this->_data->attendees[ $attendee->ID() ]['tkt_objs'])
+            $aee['tkt_objs']       = isset($this->_data->attendees[ $attendee->ID() ]['tkt_objs'])
                 ? $this->_data->attendees[ $attendee->ID() ]['tkt_objs']
-                : array();
+                : [];
 
             if (isset($this->_data->attendees[ $attendee->ID() ]['evt_objs'])) {
                 $aee['evt_objs'] = $this->_data->attendees[ $attendee->ID() ]['evt_objs'];
-                $aee['events'] = $this->_data->attendees[ $attendee->ID() ]['evt_objs'];
+                $aee['events']   = $this->_data->attendees[ $attendee->ID() ]['evt_objs'];
             } else {
-                $aee['evt_objs'] = $aee['events'] = array();
+                $aee['evt_objs'] = $aee['events'] = [];
             }
 
-            $aee['reg_obj'] = isset($details['reg_obj'])
-                ? $details['reg_obj']
-                : null;
+            $aee['reg_obj']   = $details['reg_obj'] ?? null;
             $aee['attendees'] = $this->_data->attendees;
 
             // merge in the primary attendee data
@@ -186,6 +182,7 @@ protected function _attendee_addressees()
         return $addressee;
     }
 
+
     /**
      * Allows a message type to specifically exclude template fields for the provided messenger.
      * Filtered so this can be programmatically altered as well.
@@ -195,11 +192,9 @@ protected function _attendee_addressees()
      */
     public function excludedFieldsForMessenger($messenger_name)
     {
-        $excluded_fields = array(
-            'email' => array('cc')
-        );
-        return isset($excluded_fields[ $messenger_name ])
-            ? $excluded_fields[ $messenger_name ]
-            : parent::excludedFieldsForMessenger($messenger_name);
+        $excluded_fields = [
+            'email' => ['cc'],
+        ];
+        return $excluded_fields[ $messenger_name ] ?? parent::excludedFieldsForMessenger($messenger_name);
     }
 }