Completed
Branch BUG-8698-ticket-sellouts+8511 (392c3d)
by
unknown
16:54 queued 13s
created
core/data_migration_scripts/EE_Data_Migration_Script_Stage.core.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
  * _migration_step() (ie, it its a count of rows in the old attendees table in _count_records_to_migrate(), it should also be OLD attendee rows migrated
35 35
  * on each call to _migration_step().
36 36
  */
37
-abstract class EE_Data_Migration_Script_Stage extends EE_Data_Migration_Class_Base{
37
+abstract class EE_Data_Migration_Script_Stage extends EE_Data_Migration_Class_Base {
38 38
 	/**
39 39
 	 * The migration script this is a stage of
40 40
 	 * @var EE_Data_Migration_Script_Base
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 	 * called by EE_Data_Migration_Script_Base's __construct() method so children don't have to
48 48
 	 * @param EE_Data_Migration_Script_Base $migration_script
49 49
 	 */
50
-	public function _construct_finalize($migration_script){
50
+	public function _construct_finalize($migration_script) {
51 51
 		$this->_migration_script = $migration_script;
52 52
 	}
53 53
 
@@ -58,13 +58,13 @@  discard block
 block discarded – undo
58 58
 	 * @param int $num_items_to_migrate
59 59
 	 * @return int
60 60
 	 */
61
-	public function migration_step($num_items_to_migrate=50){
61
+	public function migration_step($num_items_to_migrate = 50) {
62 62
 		//before we run the migration step, we want ot take note of warnings that get outputted
63 63
 		ob_start();
64 64
 		$items_migrated = $this->_migration_step($num_items_to_migrate);
65 65
 		$output = ob_get_contents();
66 66
 		ob_end_clean();
67
-		if( $output ){
67
+		if ($output) {
68 68
 			$this->add_error($output);
69 69
 		}
70 70
 		$this->_records_migrated += $items_migrated;
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 	 * @param int $num_items_to_migrate
83 83
 	 * @return int number of items ACTUALLY migrated
84 84
 	 */
85
-	abstract protected function _migration_step($num_items_to_migrate=50);
85
+	abstract protected function _migration_step($num_items_to_migrate = 50);
86 86
 
87 87
 	/**
88 88
 	 * Counts the records that have been migrated so far
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 	 * returns an array of strings describing errors
97 97
 	 * @return array
98 98
 	 */
99
-	public function get_errors(){
99
+	public function get_errors() {
100 100
 		return $this->_errors;
101 101
 	}
102 102
 
@@ -106,9 +106,9 @@  discard block
 block discarded – undo
106 106
 	 * to have been made from the properties_as_array() function.
107 107
 	 * @param array $array_of_properties like what's produced from properties_as_array() method
108 108
 	 */
109
-	public function instantiate_from_array_of_properties($array_of_properties){
109
+	public function instantiate_from_array_of_properties($array_of_properties) {
110 110
 		unset($array_of_properties['class']);
111
-		foreach($array_of_properties as $property_name => $property_value){
111
+		foreach ($array_of_properties as $property_name => $property_value) {
112 112
 			$this->$property_name = $property_value;
113 113
 		}
114 114
 	}
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
 	 * Gets the script this is a stage of
118 118
 	 * @return EE_Data_Migration_Script_Base
119 119
 	 */
120
-	protected function get_migration_script(){
120
+	protected function get_migration_script() {
121 121
 		return $this->_migration_script;
122 122
 	}
123 123
 }
Please login to merge, or discard this patch.
core/data_migration_scripts/EE_Data_Migration_Script_Stage_Table.core.php 2 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -21,12 +21,12 @@
 block discarded – undo
21 21
 	protected $_old_table;
22 22
 
23 23
 /**
24
-	 * Set in the constructor to add this sql to both the counting query in
25
-	 * EE_Data_Migration_Script_Stage_Table::_count_records_to_migrate() and
26
-	 * EE_Data_Migration_Script_Stage_Table::_get_rows().
27
-	 * Eg "where column_name like '%some_value%'"
28
-	 * @var string
29
-	 */
24
+ * Set in the constructor to add this sql to both the counting query in
25
+ * EE_Data_Migration_Script_Stage_Table::_count_records_to_migrate() and
26
+ * EE_Data_Migration_Script_Stage_Table::_get_rows().
27
+ * Eg "where column_name like '%some_value%'"
28
+ * @var string
29
+ */
30 30
 	protected $_extra_where_sql;
31 31
 
32 32
 
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -41,14 +41,14 @@  discard block
 block discarded – undo
41 41
 	 * @param int $num_items
42 42
 	 * @return int number of items ACTUALLY migrated
43 43
 	 */
44
-	function _migration_step($num_items=50){
45
-		$rows = $this->_get_rows( $num_items );
44
+	function _migration_step($num_items = 50) {
45
+		$rows = $this->_get_rows($num_items);
46 46
 		$items_actually_migrated = 0;
47
-		foreach($rows as $old_row){
47
+		foreach ($rows as $old_row) {
48 48
 			$this->_migrate_old_row($old_row);
49 49
 			$items_actually_migrated++;
50 50
 		}
51
-		if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){
51
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
52 52
 			$this->set_completed();
53 53
 		}
54 54
 		return $items_actually_migrated;
@@ -60,11 +60,11 @@  discard block
 block discarded – undo
60 60
 	 * @param int $limit
61 61
 	 * @return array of arrays like $wpdb->get_results($sql, ARRAY_A)
62 62
 	 */
63
-	protected function _get_rows( $limit ){
63
+	protected function _get_rows($limit) {
64 64
 		global $wpdb;
65 65
 		$start_at_record = $this->count_records_migrated();
66
-		$query = "SELECT * FROM {$this->_old_table} {$this->_extra_where_sql} " . $wpdb->prepare("LIMIT %d, %d",$start_at_record,$limit);
67
-		return $wpdb->get_results($query,ARRAY_A);
66
+		$query = "SELECT * FROM {$this->_old_table} {$this->_extra_where_sql} ".$wpdb->prepare("LIMIT %d, %d", $start_at_record, $limit);
67
+		return $wpdb->get_results($query, ARRAY_A);
68 68
 	}
69 69
 
70 70
 
@@ -75,8 +75,8 @@  discard block
 block discarded – undo
75 75
 	 */
76 76
 	function _count_records_to_migrate() {
77 77
 		global $wpdb;
78
-		$query =  "SELECT COUNT(*) FROM {$this->_old_table} {$this->_extra_where_sql}";
79
-		$count = $wpdb->get_var( $query );
78
+		$query = "SELECT COUNT(*) FROM {$this->_old_table} {$this->_extra_where_sql}";
79
+		$count = $wpdb->get_var($query);
80 80
 		return $count;
81 81
 	}
82 82
 
Please login to merge, or discard this patch.
core/db_classes/EE_Answer.class.php 2 patches
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
2
-	exit( 'No direct script access allowed' );
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3 3
 }
4 4
 /**
5 5
  * Event Espresso
@@ -31,9 +31,9 @@  discard block
 block discarded – undo
31 31
 	 * @param array $props_n_values
32 32
 	 * @return EE_Answer
33 33
 	 */
34
-	public static function new_instance( $props_n_values = array() ) {
35
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
36
-		return $has_object ? $has_object : new self( $props_n_values );
34
+	public static function new_instance($props_n_values = array()) {
35
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
36
+		return $has_object ? $has_object : new self($props_n_values);
37 37
 	}
38 38
 
39 39
 
@@ -43,8 +43,8 @@  discard block
 block discarded – undo
43 43
 	 * @param array $props_n_values
44 44
 	 * @return EE_Answer
45 45
 	 */
46
-	public static function new_instance_from_db( $props_n_values = array() ) {
47
-		return new self( $props_n_values, TRUE );
46
+	public static function new_instance_from_db($props_n_values = array()) {
47
+		return new self($props_n_values, TRUE);
48 48
 	}
49 49
 
50 50
 
@@ -55,8 +55,8 @@  discard block
 block discarded – undo
55 55
 	 * @access        public
56 56
 	 * @param int $QST_ID
57 57
 	 */
58
-	public function set_question( $QST_ID = 0 ) {
59
-		$this->set( 'QST_ID', $QST_ID );
58
+	public function set_question($QST_ID = 0) {
59
+		$this->set('QST_ID', $QST_ID);
60 60
 	}
61 61
 
62 62
 
@@ -67,8 +67,8 @@  discard block
 block discarded – undo
67 67
 	 * @access        public
68 68
 	 * @param int $REG_ID
69 69
 	 */
70
-	public function set_registration( $REG_ID = 0 ) {
71
-		$this->set( 'REG_ID', $REG_ID );
70
+	public function set_registration($REG_ID = 0) {
71
+		$this->set('REG_ID', $REG_ID);
72 72
 	}
73 73
 
74 74
 
@@ -79,8 +79,8 @@  discard block
 block discarded – undo
79 79
 	 * @access        public
80 80
 	 * @param mixed $ANS_value
81 81
 	 */
82
-	public function set_value( $ANS_value = '' ) {
83
-		$this->set( 'ANS_value', $ANS_value );
82
+	public function set_value($ANS_value = '') {
83
+		$this->set('ANS_value', $ANS_value);
84 84
 	}
85 85
 
86 86
 
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 	 * @return        int
93 93
 	 */
94 94
 	public function registration_ID() {
95
-		return $this->get( 'REG_ID' );
95
+		return $this->get('REG_ID');
96 96
 	}
97 97
 
98 98
 
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 	 * @return        int
105 105
 	 */
106 106
 	public function question_ID() {
107
-		return $this->get( 'QST_ID' );
107
+		return $this->get('QST_ID');
108 108
 	}
109 109
 
110 110
 
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 	 * @return        string
117 117
 	 */
118 118
 	public function value() {
119
-		return $this->get( 'ANS_value' );
119
+		return $this->get('ANS_value');
120 120
 	}
121 121
 
122 122
 
@@ -126,8 +126,8 @@  discard block
 block discarded – undo
126 126
 	 * @param null $schema
127 127
 	 * @return string
128 128
 	 */
129
-	public function pretty_value( $schema = NULL ) {
130
-		return $this->get_pretty( 'ANS_value', $schema );
129
+	public function pretty_value($schema = NULL) {
130
+		return $this->get_pretty('ANS_value', $schema);
131 131
 	}
132 132
 
133 133
 
@@ -136,8 +136,8 @@  discard block
 block discarded – undo
136 136
 	 * Echoes out a pretty value (even for multi-choice options)
137 137
 	 * @param string $schema
138 138
 	 */
139
-	public function e_value( $schema = NULL ) {
140
-		$this->e( 'ANS_value', $schema );
139
+	public function e_value($schema = NULL) {
140
+		$this->e('ANS_value', $schema);
141 141
 	}
142 142
 
143 143
 
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 	 * @return EE_Question
148 148
 	 */
149 149
 	public function question() {
150
-		return $this->get_first_related( 'Question' );
150
+		return $this->get_first_related('Question');
151 151
 	}
152 152
 
153 153
 
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
 	 * @return EE_Registration
158 158
 	 */
159 159
 	public function registration() {
160
-		return $this->get_first_related( 'Registration' );
160
+		return $this->get_first_related('Registration');
161 161
 	}
162 162
 }
163 163
 
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@
 block discarded – undo
77 77
 	 *    Set Answer value
78 78
 	 *
79 79
 	 * @access        public
80
-	 * @param mixed $ANS_value
80
+	 * @param string $ANS_value
81 81
 	 */
82 82
 	public function set_value( $ANS_value = '' ) {
83 83
 		$this->set( 'ANS_value', $ANS_value );
Please login to merge, or discard this patch.
core/db_classes/EE_Change_Log.class.php 3 patches
Braces   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if (!defined('EVENT_ESPRESSO_VERSION')) {
4 4
 	exit('No direct script access allowed');
5
+}
5 6
 
6 7
 /**
7 8
  * Event Espresso
@@ -152,7 +153,7 @@  discard block
 block discarded – undo
152 153
 		$is_model_name = EE_Registry::instance()->is_model_name($model_name_of_related_obj);
153 154
 		if( ! $is_model_name ){
154 155
 			return null;
155
-		}else{
156
+		} else{
156 157
 			return $this->get_first_related($model_name_of_related_obj);
157 158
 		}
158 159
 	}
@@ -169,13 +170,13 @@  discard block
 block discarded – undo
169 170
 		if($object instanceof EE_Base_Class){
170 171
 			$this->set_OBJ_type($object->get_model()->get_this_model_name());
171 172
 			$this->set_OBJ_ID($object->ID());
172
-		}else{
173
+		} else{
173 174
 			$this->set_OBJ_type(NULL);
174 175
 			$this->set_OBJ_ID(NULL);
175 176
 		}
176 177
 		if($save){
177 178
 			return $this->save();
178
-		}else{
179
+		} else{
179 180
 			return NULL;
180 181
 		}
181 182
 	}
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
4 4
 	exit('No direct script access allowed');
5 5
 
6 6
 /**
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
  *
26 26
  * ------------------------------------------------------------------------
27 27
  */
28
-class EE_Change_Log extends EE_Base_Class{
28
+class EE_Change_Log extends EE_Base_Class {
29 29
 
30 30
 	/**
31 31
 	 *
@@ -36,9 +36,9 @@  discard block
 block discarded – undo
36 36
 	 *                             		    date_format and the second value is the time format
37 37
 	 * @return EE_Attendee
38 38
 	 */
39
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
40
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
41
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
39
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
40
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
41
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
42 42
 	}
43 43
 
44 44
 
@@ -49,8 +49,8 @@  discard block
 block discarded – undo
49 49
 	 *                          		the website will be used.
50 50
 	 * @return EE_Attendee
51 51
 	 */
52
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
53
-		return new self( $props_n_values, TRUE, $timezone );
52
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
53
+		return new self($props_n_values, TRUE, $timezone);
54 54
 	}
55 55
 	/**
56 56
 	 * Gets message
@@ -147,12 +147,12 @@  discard block
 block discarded – undo
147 147
 	 * Gets the model object attached to this log
148 148
 	 * @return EE_Base_Class
149 149
 	 */
150
-	function object(){
150
+	function object() {
151 151
 		$model_name_of_related_obj = $this->OBJ_type();
152 152
 		$is_model_name = EE_Registry::instance()->is_model_name($model_name_of_related_obj);
153
-		if( ! $is_model_name ){
153
+		if ( ! $is_model_name) {
154 154
 			return null;
155
-		}else{
155
+		} else {
156 156
 			return $this->get_first_related($model_name_of_related_obj);
157 157
 		}
158 158
 	}
@@ -165,17 +165,17 @@  discard block
 block discarded – undo
165 165
 	 * @param boolean $save
166 166
 	 * @return boolean if $save=true, NULL is $save=false
167 167
 	 */
168
-	function set_object($object, $save = TRUE ) {
169
-		if($object instanceof EE_Base_Class){
168
+	function set_object($object, $save = TRUE) {
169
+		if ($object instanceof EE_Base_Class) {
170 170
 			$this->set_OBJ_type($object->get_model()->get_this_model_name());
171 171
 			$this->set_OBJ_ID($object->ID());
172
-		}else{
172
+		} else {
173 173
 			$this->set_OBJ_type(NULL);
174 174
 			$this->set_OBJ_ID(NULL);
175 175
 		}
176
-		if($save){
176
+		if ($save) {
177 177
 			return $this->save();
178
-		}else{
178
+		} else {
179 179
 			return NULL;
180 180
 		}
181 181
 	}
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
 	 * @param array $props_n_values  incoming values from the database
48 48
 	 * @param string $timezone  incoming timezone as set by the model.  If not set the timezone for
49 49
 	 *                          		the website will be used.
50
-	 * @return EE_Attendee
50
+	 * @return EE_Change_Log
51 51
 	 */
52 52
 	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
53 53
 		return new self( $props_n_values, TRUE, $timezone );
Please login to merge, or discard this patch.
core/db_classes/EE_Country.class.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
2
-	exit( 'No direct script access allowed' );
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3 3
 }
4 4
 /**
5 5
  * Event Espresso
@@ -30,9 +30,9 @@  discard block
 block discarded – undo
30 30
 	 * @param array $props_n_values
31 31
 	 * @return EE_Country|mixed
32 32
 	 */
33
-	public static function new_instance( $props_n_values = array() ) {
34
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
35
-		return $has_object ? $has_object : new self( $props_n_values );
33
+	public static function new_instance($props_n_values = array()) {
34
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
35
+		return $has_object ? $has_object : new self($props_n_values);
36 36
 	}
37 37
 
38 38
 
@@ -41,8 +41,8 @@  discard block
 block discarded – undo
41 41
 	 * @param array $props_n_values
42 42
 	 * @return EE_Country
43 43
 	 */
44
-	public static function new_instance_from_db( $props_n_values = array() ) {
45
-		return new self( $props_n_values, TRUE );
44
+	public static function new_instance_from_db($props_n_values = array()) {
45
+		return new self($props_n_values, TRUE);
46 46
 	}
47 47
 
48 48
 
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 	 * @return string
55 55
 	 */
56 56
 	public function name() {
57
-		return $this->get( 'CNT_name' );
57
+		return $this->get('CNT_name');
58 58
 	}
59 59
 
60 60
 
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 	 * @return string
65 65
 	 */
66 66
 	public function currency_code() {
67
-		return $this->get( 'CNT_cur_code' );
67
+		return $this->get('CNT_cur_code');
68 68
 	}
69 69
 
70 70
 
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 	 * @return string
75 75
 	 */
76 76
 	public function currency_sign() {
77
-		$CNT_cur_sign = $this->get( 'CNT_cur_sign' );
77
+		$CNT_cur_sign = $this->get('CNT_cur_sign');
78 78
 		return $CNT_cur_sign ? $CNT_cur_sign : '&#164;';
79 79
 	}
80 80
 
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 	 * @return string
86 86
 	 */
87 87
 	public function currency_name_single() {
88
-		return $this->get( 'CNT_cur_single' );
88
+		return $this->get('CNT_cur_single');
89 89
 	}
90 90
 
91 91
 
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 	 * @return string
96 96
 	 */
97 97
 	public function currency_name_plural() {
98
-		return $this->get( 'CNT_cur_plural' );
98
+		return $this->get('CNT_cur_plural');
99 99
 	}
100 100
 
101 101
 
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 	 * @return boolean
106 106
 	 */
107 107
 	public function currency_sign_before() {
108
-		return $this->get( 'CNT_cur_sign_b4' );
108
+		return $this->get('CNT_cur_sign_b4');
109 109
 	}
110 110
 
111 111
 
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 	 * @return integer
116 116
 	 */
117 117
 	public function currency_decimal_places() {
118
-		return $this->get( 'CNT_cur_dec_plc' );
118
+		return $this->get('CNT_cur_dec_plc');
119 119
 	}
120 120
 
121 121
 
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 	 * @return string
126 126
 	 */
127 127
 	public function currency_decimal_mark() {
128
-		return $this->get( 'CNT_cur_dec_mrk' );
128
+		return $this->get('CNT_cur_dec_mrk');
129 129
 	}
130 130
 
131 131
 
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
 	 * @return string
136 136
 	 */
137 137
 	public function currency_thousands_separator() {
138
-		return $this->get( 'CNT_cur_thsnds' );
138
+		return $this->get('CNT_cur_thsnds');
139 139
 	}
140 140
 }
141 141
 /* End of file EE_Country.class.php */
Please login to merge, or discard this patch.
core/db_classes/EE_Datetime.class.php 3 patches
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -708,12 +708,10 @@
 block discarded – undo
708 708
 		if ( date( 'm', $this->get_raw( 'DTT_EVT_start' ) ) != date( 'm', $this->get_raw( 'DTT_EVT_end' ) ) ) {
709 709
 			$display_date = $this->start_date( 'M j\, Y g:i a' ) . ' - ' . $this->end_date( 'M j\, Y g:i a' );
710 710
 			//next condition is if its the same month but different day
711
-		}
712
-		else {
711
+		} else {
713 712
 			if ( date( 'm', $this->get_raw( 'DTT_EVT_start' ) ) == date( 'm', $this->get_raw( 'DTT_EVT_end' ) ) && date( 'd', $this->get_raw( 'DTT_EVT_start' ) ) != date( 'd', $this->get_raw( 'DTT_EVT_end' ) ) ) {
714 713
 				$display_date = $this->start_date( 'M j\, g:i a' ) . ' - ' . $this->end_date( 'M j\, g:i a Y' );
715
-			}
716
-			else {
714
+			} else {
717 715
 				$display_date = $this->start_date( 'F j\, Y' ) . ' @ ' . $this->start_date( 'g:i a' ) . ' - ' . $this->end_date( 'g:i a' );
718 716
 			}
719 717
 		}
Please login to merge, or discard this patch.
Spacing   +137 added lines, -137 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
2
-	exit( 'No direct script access allowed' );
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3 3
 }
4 4
 /**
5 5
  * Event Espresso
@@ -74,9 +74,9 @@  discard block
 block discarded – undo
74 74
 	 *                             		    date_format and the second value is the time format
75 75
 	 * @return EE_Datetime
76 76
 	 */
77
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
78
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
79
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
77
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
78
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
79
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
80 80
 	}
81 81
 
82 82
 
@@ -87,8 +87,8 @@  discard block
 block discarded – undo
87 87
 	 *                          		the website will be used.
88 88
 	 * @return EE_Datetime
89 89
 	 */
90
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
91
-		return new self( $props_n_values, TRUE, $timezone );
90
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
91
+		return new self($props_n_values, TRUE, $timezone);
92 92
 	}
93 93
 
94 94
 
@@ -96,8 +96,8 @@  discard block
 block discarded – undo
96 96
 	/**
97 97
 	 * @param $name
98 98
 	 */
99
-	public function set_name( $name ) {
100
-		$this->set( 'DTT_name', $name );
99
+	public function set_name($name) {
100
+		$this->set('DTT_name', $name);
101 101
 	}
102 102
 
103 103
 
@@ -105,8 +105,8 @@  discard block
 block discarded – undo
105 105
 	/**
106 106
 	 * @param $description
107 107
 	 */
108
-	public function set_description( $description ) {
109
-		$this->set( 'DTT_description', $description );
108
+	public function set_description($description) {
109
+		$this->set('DTT_description', $description);
110 110
 	}
111 111
 
112 112
 
@@ -119,8 +119,8 @@  discard block
 block discarded – undo
119 119
 	 * @access        public
120 120
 	 * @param        string $date a string representation of the event's date ex:  Dec. 25, 2025 or 12-25-2025
121 121
 	 */
122
-	public function set_start_date( $date ) {
123
-		$this->_set_date_for( $date, 'DTT_EVT_start' );
122
+	public function set_start_date($date) {
123
+		$this->_set_date_for($date, 'DTT_EVT_start');
124 124
 	}
125 125
 
126 126
 
@@ -133,8 +133,8 @@  discard block
 block discarded – undo
133 133
 	 * @access        public
134 134
 	 * @param        string $time a string representation of the event time ex:  9am  or  7:30 PM
135 135
 	 */
136
-	public function set_start_time( $time ) {
137
-		$this->_set_time_for( $time, 'DTT_EVT_start' );
136
+	public function set_start_time($time) {
137
+		$this->_set_time_for($time, 'DTT_EVT_start');
138 138
 	}
139 139
 
140 140
 
@@ -147,8 +147,8 @@  discard block
 block discarded – undo
147 147
 	 * @access        public
148 148
 	 * @param        string $date a string representation of the event's date ex:  Dec. 25, 2025 or 12-25-2025
149 149
 	 */
150
-	public function set_end_date( $date ) {
151
-		$this->_set_date_for( $date, 'DTT_EVT_end' );
150
+	public function set_end_date($date) {
151
+		$this->_set_date_for($date, 'DTT_EVT_end');
152 152
 	}
153 153
 
154 154
 
@@ -161,8 +161,8 @@  discard block
 block discarded – undo
161 161
 	 * @access        public
162 162
 	 * @param        string $time a string representation of the event time ex:  9am  or  7:30 PM
163 163
 	 */
164
-	public function set_end_time( $time ) {
165
-		$this->_set_time_for( $time, 'DTT_EVT_end' );
164
+	public function set_end_time($time) {
165
+		$this->_set_time_for($time, 'DTT_EVT_end');
166 166
 	}
167 167
 
168 168
 
@@ -175,8 +175,8 @@  discard block
 block discarded – undo
175 175
 	 * @access        public
176 176
 	 * @param        int $reg_limit
177 177
 	 */
178
-	public function set_reg_limit( $reg_limit ) {
179
-		$this->set( 'DTT_reg_limit', $reg_limit );
178
+	public function set_reg_limit($reg_limit) {
179
+		$this->set('DTT_reg_limit', $reg_limit);
180 180
 	}
181 181
 
182 182
 
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
 	 * @return        mixed        int on success, FALSE on fail
189 189
 	 */
190 190
 	public function sold() {
191
-		return $this->get_raw( 'DTT_sold' );
191
+		return $this->get_raw('DTT_sold');
192 192
 	}
193 193
 
194 194
 
@@ -199,10 +199,10 @@  discard block
 block discarded – undo
199 199
 	 * @access        public
200 200
 	 * @param        int $sold
201 201
 	 */
202
-	public function set_sold( $sold ) {
202
+	public function set_sold($sold) {
203 203
 		// sold can not go below zero
204
-		$sold = max( 0, $sold );
205
-		$this->set( 'DTT_sold', $sold );
204
+		$sold = max(0, $sold);
205
+		$this->set('DTT_sold', $sold);
206 206
 	}
207 207
 
208 208
 
@@ -211,11 +211,11 @@  discard block
 block discarded – undo
211 211
 	 * increments sold by amount passed by $qty
212 212
 	 * @param int $qty
213 213
 	 */
214
-	function increase_sold( $qty = 1 ) {
214
+	function increase_sold($qty = 1) {
215 215
 		$sold = $this->sold() + $qty;
216 216
 		// remove ticket reservation
217
-		$this->decrease_reserved( $qty );
218
-		$this->set_sold( $sold );
217
+		$this->decrease_reserved($qty);
218
+		$this->set_sold($sold);
219 219
 	}
220 220
 
221 221
 
@@ -224,9 +224,9 @@  discard block
 block discarded – undo
224 224
 	 * decrements (subtracts) sold amount passed by $qty
225 225
 	 * @param int $qty
226 226
 	 */
227
-	function decrease_sold( $qty = 1 ) {
227
+	function decrease_sold($qty = 1) {
228 228
 		$sold = $this->sold() - $qty;
229
-		$this->set_sold( $sold );
229
+		$this->set_sold($sold);
230 230
 	}
231 231
 
232 232
 
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
 	 * @return int
238 238
 	 */
239 239
 	function reserved() {
240
-		return $this->get_raw( 'DTT_reserved' );
240
+		return $this->get_raw('DTT_reserved');
241 241
 	}
242 242
 
243 243
 
@@ -248,10 +248,10 @@  discard block
 block discarded – undo
248 248
 	 * @param int $reserved
249 249
 	 * @return boolean
250 250
 	 */
251
-	function set_reserved( $reserved ) {
251
+	function set_reserved($reserved) {
252 252
 		// reserved can not go below zero
253
-		$reserved = max( 0, intval( $reserved ) );
254
-		$this->set( 'DTT_reserved', $reserved );
253
+		$reserved = max(0, intval($reserved));
254
+		$this->set('DTT_reserved', $reserved);
255 255
 	}
256 256
 
257 257
 
@@ -262,9 +262,9 @@  discard block
 block discarded – undo
262 262
 	 * @param int $qty
263 263
 	 * @return boolean
264 264
 	 */
265
-	function increase_reserved( $qty = 1 ) {
266
-		$reserved = $this->reserved() + absint( $qty );
267
-		return $this->set_reserved( $reserved );
265
+	function increase_reserved($qty = 1) {
266
+		$reserved = $this->reserved() + absint($qty);
267
+		return $this->set_reserved($reserved);
268 268
 	}
269 269
 
270 270
 
@@ -275,9 +275,9 @@  discard block
 block discarded – undo
275 275
 	 * @param int $qty
276 276
 	 * @return boolean
277 277
 	 */
278
-	function decrease_reserved( $qty = 1 ) {
279
-		$reserved = $this->reserved() - absint( $qty );
280
-		return $this->set_reserved( $reserved );
278
+	function decrease_reserved($qty = 1) {
279
+		$reserved = $this->reserved() - absint($qty);
280
+		return $this->set_reserved($reserved);
281 281
 	}
282 282
 
283 283
 
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
298 298
 	 * @return string
299 299
 	 */
300 300
 	public function name() {
301
-		return $this->get( 'DTT_name' );
301
+		return $this->get('DTT_name');
302 302
 	}
303 303
 
304 304
 
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
 	 * @return string
309 309
 	 */
310 310
 	public function description() {
311
-		return $this->get( 'DTT_description' );
311
+		return $this->get('DTT_description');
312 312
 	}
313 313
 
314 314
 
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
 	 * @return boolean          TRUE if is primary, FALSE if not.
319 319
 	 */
320 320
 	public function is_primary() {
321
-		return $this->get( 'DTT_is_primary' );
321
+		return $this->get('DTT_is_primary');
322 322
 	}
323 323
 
324 324
 
@@ -328,7 +328,7 @@  discard block
 block discarded – undo
328 328
 	 * @return int         The order of the datetime for this event.
329 329
 	 */
330 330
 	public function order() {
331
-		return $this->get( 'DTT_order' );
331
+		return $this->get('DTT_order');
332 332
 	}
333 333
 
334 334
 
@@ -338,7 +338,7 @@  discard block
 block discarded – undo
338 338
 	 * @return int
339 339
 	 */
340 340
 	public function parent() {
341
-		return $this->get( 'DTT_parent' );
341
+		return $this->get('DTT_parent');
342 342
 	}
343 343
 
344 344
 
@@ -354,10 +354,10 @@  discard block
 block discarded – undo
354 354
 	 * @param    bool   $echo         - whether we echo or return (note echoing uses "pretty" formats, otherwise we use the standard formats)
355 355
 	 * @return    string|bool|void  string on success, FALSE on fail
356 356
 	 */
357
-	private function _show_datetime( $date_or_time = NULL, $start_or_end = 'start', $dt_frmt = '', $tm_frmt = '', $echo = FALSE ) {
357
+	private function _show_datetime($date_or_time = NULL, $start_or_end = 'start', $dt_frmt = '', $tm_frmt = '', $echo = FALSE) {
358 358
 		$field_name = "DTT_EVT_{$start_or_end}";
359
-		$dtt = $this->_get_datetime( $field_name, $dt_frmt, $tm_frmt, $date_or_time, $echo );
360
-		if ( ! $echo ) {
359
+		$dtt = $this->_get_datetime($field_name, $dt_frmt, $tm_frmt, $date_or_time, $echo);
360
+		if ( ! $echo) {
361 361
 			return $dtt;
362 362
 		}
363 363
 		return '';
@@ -373,8 +373,8 @@  discard block
 block discarded – undo
373 373
 	 * @param null $dt_frmt - string representation of date format defaults to 'F j, Y'
374 374
 	 * @return        mixed        string on success, FALSE on fail
375 375
 	 */
376
-	public function start_date( $dt_frmt = NULL ) {
377
-		return $this->_show_datetime( 'D', 'start', $dt_frmt );
376
+	public function start_date($dt_frmt = NULL) {
377
+		return $this->_show_datetime('D', 'start', $dt_frmt);
378 378
 	}
379 379
 
380 380
 
@@ -383,8 +383,8 @@  discard block
 block discarded – undo
383 383
 	 * Echoes start_date()
384 384
 	 * @param string $dt_frmt
385 385
 	 */
386
-	public function e_start_date( $dt_frmt = NULL ) {
387
-		$this->_show_datetime( 'D', 'start', $dt_frmt, NULL, TRUE );
386
+	public function e_start_date($dt_frmt = NULL) {
387
+		$this->_show_datetime('D', 'start', $dt_frmt, NULL, TRUE);
388 388
 	}
389 389
 
390 390
 
@@ -397,8 +397,8 @@  discard block
 block discarded – undo
397 397
 	 * @param null $dt_frmt - string representation of date format defaults to 'F j, Y'
398 398
 	 * @return        mixed        string on success, FALSE on fail
399 399
 	 */
400
-	public function end_date( $dt_frmt = NULL ) {
401
-		return $this->_show_datetime( 'D', 'end', $dt_frmt );
400
+	public function end_date($dt_frmt = NULL) {
401
+		return $this->_show_datetime('D', 'end', $dt_frmt);
402 402
 	}
403 403
 
404 404
 
@@ -407,8 +407,8 @@  discard block
 block discarded – undo
407 407
 	 * Echoes the end date. See end_date()
408 408
 	 * @param string $dt_frmt
409 409
 	 */
410
-	public function e_end_date( $dt_frmt = NULL ) {
411
-		$this->_show_datetime( 'D', 'end', $dt_frmt, NULL, TRUE );
410
+	public function e_end_date($dt_frmt = NULL) {
411
+		$this->_show_datetime('D', 'end', $dt_frmt, NULL, TRUE);
412 412
 	}
413 413
 
414 414
 
@@ -421,11 +421,11 @@  discard block
 block discarded – undo
421 421
 	 * @param        string $conjunction - conjunction junction what's your function ? this string joins the start date with the end date ie: Jan 01 "to" Dec 31
422 422
 	 * @return        mixed        string on success, FALSE on fail
423 423
 	 */
424
-	public function date_range( $dt_frmt = NULL, $conjunction = ' - ' ) {
425
-		$dt_frmt = ! empty( $dt_frmt ) ? $dt_frmt : $this->_dt_frmt;
426
-		$start = str_replace( ' ', '&nbsp;', $this->get_i18n_datetime( 'DTT_EVT_start', $dt_frmt ) );
427
-		$end = str_replace( ' ', '&nbsp;', $this->get_i18n_datetime( 'DTT_EVT_end', $dt_frmt ) );
428
-		return $start != $end ? $start . $conjunction . $end : $start;
424
+	public function date_range($dt_frmt = NULL, $conjunction = ' - ') {
425
+		$dt_frmt = ! empty($dt_frmt) ? $dt_frmt : $this->_dt_frmt;
426
+		$start = str_replace(' ', '&nbsp;', $this->get_i18n_datetime('DTT_EVT_start', $dt_frmt));
427
+		$end = str_replace(' ', '&nbsp;', $this->get_i18n_datetime('DTT_EVT_end', $dt_frmt));
428
+		return $start != $end ? $start.$conjunction.$end : $start;
429 429
 	}
430 430
 
431 431
 
@@ -434,8 +434,8 @@  discard block
 block discarded – undo
434 434
 	 * @param null   $dt_frmt
435 435
 	 * @param string $conjunction
436 436
 	 */
437
-	public function e_date_range( $dt_frmt = NULL, $conjunction = ' - ' ) {
438
-		echo $this->date_range( $dt_frmt, $conjunction );
437
+	public function e_date_range($dt_frmt = NULL, $conjunction = ' - ') {
438
+		echo $this->date_range($dt_frmt, $conjunction);
439 439
 	}
440 440
 
441 441
 
@@ -447,8 +447,8 @@  discard block
 block discarded – undo
447 447
 	 * @param        string $tm_format - string representation of time format defaults to 'g:i a'
448 448
 	 * @return        mixed        string on success, FALSE on fail
449 449
 	 */
450
-	public function start_time( $tm_format = NULL ) {
451
-		return $this->_show_datetime( 'T', 'start', NULL, $tm_format );
450
+	public function start_time($tm_format = NULL) {
451
+		return $this->_show_datetime('T', 'start', NULL, $tm_format);
452 452
 	}
453 453
 
454 454
 
@@ -456,8 +456,8 @@  discard block
 block discarded – undo
456 456
 	/**
457 457
 	 * @param null $tm_format
458 458
 	 */
459
-	public function e_start_time( $tm_format = NULL ) {
460
-		$this->_show_datetime( 'T', 'start', NULL, $tm_format, TRUE );
459
+	public function e_start_time($tm_format = NULL) {
460
+		$this->_show_datetime('T', 'start', NULL, $tm_format, TRUE);
461 461
 	}
462 462
 
463 463
 
@@ -469,8 +469,8 @@  discard block
 block discarded – undo
469 469
 	 * @param        string $tm_format - string representation of time format defaults to 'g:i a'
470 470
 	 * @return        mixed        string on success, FALSE on fail
471 471
 	 */
472
-	public function end_time( $tm_format = NULL ) {
473
-		return $this->_show_datetime( 'T', 'end', NULL, $tm_format );
472
+	public function end_time($tm_format = NULL) {
473
+		return $this->_show_datetime('T', 'end', NULL, $tm_format);
474 474
 	}
475 475
 
476 476
 
@@ -478,8 +478,8 @@  discard block
 block discarded – undo
478 478
 	/**
479 479
 	 * @param null $tm_format
480 480
 	 */
481
-	public function e_end_time( $tm_format = NULL ) {
482
-		$this->_show_datetime( 'T', 'end', NULL, $tm_format, TRUE );
481
+	public function e_end_time($tm_format = NULL) {
482
+		$this->_show_datetime('T', 'end', NULL, $tm_format, TRUE);
483 483
 	}
484 484
 
485 485
 
@@ -492,12 +492,12 @@  discard block
 block discarded – undo
492 492
 	 * @param        string $conjunction - conjunction junction what's your function ? this string joins the start date with the end date ie: Jan 01 "to" Dec 31
493 493
 	 * @return        mixed        string on success, FALSE on fail
494 494
 	 */
495
-	public function time_range( $tm_format = NULL, $conjunction = ' - ' ) {
496
-		$tm_format = !empty( $tm_format ) ? $tm_format : $this->_tm_frmt;
495
+	public function time_range($tm_format = NULL, $conjunction = ' - ') {
496
+		$tm_format = ! empty($tm_format) ? $tm_format : $this->_tm_frmt;
497 497
 
498
-		$start = str_replace( ' ', '&nbsp;', $this->get_i18n_datetime( 'DTT_EVT_start', $tm_format ) );
499
-		$end = str_replace( ' ', '&nbsp;', $this->get_i18n_datetime( 'DTT_EVT_end',  $tm_format ) );
500
-		return $start != $end ? $start . $conjunction . $end : $start;
498
+		$start = str_replace(' ', '&nbsp;', $this->get_i18n_datetime('DTT_EVT_start', $tm_format));
499
+		$end = str_replace(' ', '&nbsp;', $this->get_i18n_datetime('DTT_EVT_end', $tm_format));
500
+		return $start != $end ? $start.$conjunction.$end : $start;
501 501
 	}
502 502
 
503 503
 
@@ -506,8 +506,8 @@  discard block
 block discarded – undo
506 506
 	 * @param null   $tm_format
507 507
 	 * @param string $conjunction
508 508
 	 */
509
-	public function e_time_range( $tm_format = NULL, $conjunction = ' - ' ) {
510
-		echo $this->time_range( $tm_format, $conjunction );
509
+	public function e_time_range($tm_format = NULL, $conjunction = ' - ') {
510
+		echo $this->time_range($tm_format, $conjunction);
511 511
 	}
512 512
 
513 513
 
@@ -520,8 +520,8 @@  discard block
 block discarded – undo
520 520
 	 * @param 	string 	$tm_format - string representation of time format defaults to 'g:i a'
521 521
 	 * @return 	mixed 	string on success, FALSE on fail
522 522
 	 */
523
-	public function start_date_and_time( $dt_format = NULL, $tm_format = NULL ) {
524
-		return $this->_show_datetime( '', 'start', $dt_format, $tm_format );
523
+	public function start_date_and_time($dt_format = NULL, $tm_format = NULL) {
524
+		return $this->_show_datetime('', 'start', $dt_format, $tm_format);
525 525
 	}
526 526
 
527 527
 
@@ -530,8 +530,8 @@  discard block
 block discarded – undo
530 530
 	 * @param null $dt_frmt
531 531
 	 * @param null $tm_format
532 532
 	 */
533
-	public function e_start_date_and_time( $dt_frmt = NULL, $tm_format = NULL ) {
534
-		$this->_show_datetime( '', 'start', $dt_frmt, $tm_format, TRUE );
533
+	public function e_start_date_and_time($dt_frmt = NULL, $tm_format = NULL) {
534
+		$this->_show_datetime('', 'start', $dt_frmt, $tm_format, TRUE);
535 535
 	}
536 536
 
537 537
 
@@ -545,11 +545,11 @@  discard block
 block discarded – undo
545 545
 	 * @param bool   $round_up
546 546
 	 * @return float|int|mixed
547 547
 	 */
548
-	public function length( $units = 'seconds', $round_up = FALSE ) {
549
-		$start = $this->get_raw( 'DTT_EVT_start' );
550
-		$end = $this->get_raw( 'DTT_EVT_end' );
548
+	public function length($units = 'seconds', $round_up = FALSE) {
549
+		$start = $this->get_raw('DTT_EVT_start');
550
+		$end = $this->get_raw('DTT_EVT_end');
551 551
 		$length_in_units = $end - $start;
552
-		switch ( $units ) {
552
+		switch ($units) {
553 553
 			//NOTE: We purposefully don't use "break;" in order to chain the divisions
554 554
 			/** @noinspection PhpMissingBreakStatementInspection */
555 555
 			case 'days':
@@ -562,10 +562,10 @@  discard block
 block discarded – undo
562 562
 				$length_in_units /= 60;
563 563
 			case 'seconds':
564 564
 			default:
565
-				$length_in_units = ceil( $length_in_units );
565
+				$length_in_units = ceil($length_in_units);
566 566
 		}
567
-		if ( $round_up ) {
568
-			$length_in_units = max( $length_in_units, 1 );
567
+		if ($round_up) {
568
+			$length_in_units = max($length_in_units, 1);
569 569
 		}
570 570
 		return $length_in_units;
571 571
 	}
@@ -580,8 +580,8 @@  discard block
 block discarded – undo
580 580
 	 * @param bool | string 	$tm_format - string representation of time format defaults to 'g:i a'
581 581
 	 * @return 	mixed        		string on success, FALSE on fail
582 582
 	 */
583
-	public function end_date_and_time( $dt_frmt = FALSE, $tm_format = FALSE ) {
584
-		return $this->_show_datetime( '', 'end', $dt_frmt, $tm_format );
583
+	public function end_date_and_time($dt_frmt = FALSE, $tm_format = FALSE) {
584
+		return $this->_show_datetime('', 'end', $dt_frmt, $tm_format);
585 585
 	}
586 586
 
587 587
 
@@ -590,8 +590,8 @@  discard block
 block discarded – undo
590 590
 	 * @param bool $dt_frmt
591 591
 	 * @param bool $tm_format
592 592
 	 */
593
-	public function e_end_date_and_time( $dt_frmt = FALSE, $tm_format = FALSE ) {
594
-		$this->_show_datetime( '', 'end', $dt_frmt, $tm_format, TRUE );
593
+	public function e_end_date_and_time($dt_frmt = FALSE, $tm_format = FALSE) {
594
+		$this->_show_datetime('', 'end', $dt_frmt, $tm_format, TRUE);
595 595
 	}
596 596
 
597 597
 
@@ -603,7 +603,7 @@  discard block
 block discarded – undo
603 603
 	 * @return        int
604 604
 	 */
605 605
 	public function start() {
606
-		return $this->get_raw( 'DTT_EVT_start' );
606
+		return $this->get_raw('DTT_EVT_start');
607 607
 	}
608 608
 
609 609
 
@@ -615,7 +615,7 @@  discard block
 block discarded – undo
615 615
 	 * @return        int
616 616
 	 */
617 617
 	public function end() {
618
-		return $this->get_raw( 'DTT_EVT_end' );
618
+		return $this->get_raw('DTT_EVT_end');
619 619
 	}
620 620
 
621 621
 
@@ -627,7 +627,7 @@  discard block
 block discarded – undo
627 627
 	 * @return        mixed        int on success, FALSE on fail
628 628
 	 */
629 629
 	public function reg_limit() {
630
-		return $this->get_raw( 'DTT_reg_limit' );
630
+		return $this->get_raw('DTT_reg_limit');
631 631
 	}
632 632
 
633 633
 
@@ -656,15 +656,15 @@  discard block
 block discarded – undo
656 656
 	 * 																	the spaces remaining for this particular datetime, hence the flag.
657 657
 	 * @return 	int
658 658
 	 */
659
-	public function spaces_remaining( $consider_tickets = FALSE ) {
659
+	public function spaces_remaining($consider_tickets = FALSE) {
660 660
 		// tickets remaining available for purchase
661 661
 		//no need for special checks for infinite, because if DTT_reg_limit == EE_INF, then EE_INF - x = EE_INF
662 662
 		$dtt_remaining = $this->reg_limit() - $this->sold();
663
-		if ( ! $consider_tickets ) {
663
+		if ( ! $consider_tickets) {
664 664
 			return $dtt_remaining;
665 665
 		}
666 666
 		$tickets_remaining = $this->tickets_remaining();
667
-		return min( $dtt_remaining, $tickets_remaining );
667
+		return min($dtt_remaining, $tickets_remaining);
668 668
 	}
669 669
 
670 670
 
@@ -675,19 +675,19 @@  discard block
 block discarded – undo
675 675
 	 * @param array $query_params like EEM_Base::get_all's
676 676
 	 * @return int
677 677
 	 */
678
-	public function tickets_remaining( $query_params = array() ) {
678
+	public function tickets_remaining($query_params = array()) {
679 679
 		$sum = 0;
680
-		$tickets = $this->tickets( $query_params );
681
-		if ( ! empty( $tickets ) ) {
682
-			foreach ( $tickets as $ticket ) {
683
-				if ( $ticket instanceof EE_Ticket ) {
680
+		$tickets = $this->tickets($query_params);
681
+		if ( ! empty($tickets)) {
682
+			foreach ($tickets as $ticket) {
683
+				if ($ticket instanceof EE_Ticket) {
684 684
 					// get the actual amount of tickets that can be sold
685
-					$qty = $ticket->qty( 'saleable' );
686
-					if ( $qty === EE_INF ) {
685
+					$qty = $ticket->qty('saleable');
686
+					if ($qty === EE_INF) {
687 687
 						return EE_INF;
688 688
 					}
689 689
 					// no negative ticket quantities plz
690
-					if ( $qty > 0 ) {
690
+					if ($qty > 0) {
691 691
 						$sum += $qty;
692 692
 					}
693 693
 				}
@@ -704,8 +704,8 @@  discard block
 block discarded – undo
704 704
 	 * @param array $query_params like EEM_Base::get_all's
705 705
 	 * @return int
706 706
 	 */
707
-	public function sum_tickets_initially_available( $query_params = array() ) {
708
-		return $this->sum_related( 'Ticket', $query_params, 'TKT_qty' );
707
+	public function sum_tickets_initially_available($query_params = array()) {
708
+		return $this->sum_related('Ticket', $query_params, 'TKT_qty');
709 709
 	}
710 710
 
711 711
 
@@ -717,7 +717,7 @@  discard block
 block discarded – undo
717 717
 	 * @return int
718 718
 	 */
719 719
 	public function total_tickets_available_at_this_datetime() {
720
-		return $this->spaces_remaining( true );
720
+		return $this->spaces_remaining(true);
721 721
 	}
722 722
 
723 723
 
@@ -728,7 +728,7 @@  discard block
 block discarded – undo
728 728
 	 * @return boolean
729 729
 	 */
730 730
 	public function is_upcoming() {
731
-		return ( $this->get_raw( 'DTT_EVT_start' ) > time() );
731
+		return ($this->get_raw('DTT_EVT_start') > time());
732 732
 	}
733 733
 
734 734
 
@@ -738,7 +738,7 @@  discard block
 block discarded – undo
738 738
 	 * @return boolean
739 739
 	 */
740 740
 	public function is_active() {
741
-		return ( $this->get_raw( 'DTT_EVT_start' ) < time() && $this->get_raw( 'DTT_EVT_end' ) > time() );
741
+		return ($this->get_raw('DTT_EVT_start') < time() && $this->get_raw('DTT_EVT_end') > time());
742 742
 	}
743 743
 
744 744
 
@@ -748,7 +748,7 @@  discard block
 block discarded – undo
748 748
 	 * @return boolean
749 749
 	 */
750 750
 	public function is_expired() {
751
-		return ( $this->get_raw( 'DTT_EVT_end' ) < time() );
751
+		return ($this->get_raw('DTT_EVT_end') < time());
752 752
 	}
753 753
 
754 754
 
@@ -759,16 +759,16 @@  discard block
 block discarded – undo
759 759
 	 */
760 760
 	public function get_active_status() {
761 761
 		$total_tickets_for_this_dtt = $this->total_tickets_available_at_this_datetime();
762
-		if ( $total_tickets_for_this_dtt !== FALSE && $total_tickets_for_this_dtt < 1 ) {
762
+		if ($total_tickets_for_this_dtt !== FALSE && $total_tickets_for_this_dtt < 1) {
763 763
 			return EE_Datetime::sold_out;
764 764
 		}
765
-		if ( $this->is_expired() ) {
765
+		if ($this->is_expired()) {
766 766
 			return EE_Datetime::expired;
767 767
 		}
768
-		if ( $this->is_upcoming() ) {
768
+		if ($this->is_upcoming()) {
769 769
 			return EE_Datetime::upcoming;
770 770
 		}
771
-		if ( $this->is_active() ) {
771
+		if ($this->is_active()) {
772 772
 			return EE_Datetime::active;
773 773
 		}
774 774
 		return NULL;
@@ -782,24 +782,24 @@  discard block
 block discarded – undo
782 782
 	 * @param  boolean $use_dtt_name if TRUE then we'll use DTT->name() if its not empty.
783 783
 	 * @return string
784 784
 	 */
785
-	public function get_dtt_display_name( $use_dtt_name = FALSE ) {
786
-		if ( $use_dtt_name ) {
785
+	public function get_dtt_display_name($use_dtt_name = FALSE) {
786
+		if ($use_dtt_name) {
787 787
 			$dtt_name = $this->name();
788
-			if ( !empty( $dtt_name ) ) {
788
+			if ( ! empty($dtt_name)) {
789 789
 				return $dtt_name;
790 790
 			}
791 791
 		}
792 792
 		//first condition is to see if the months are different
793
-		if ( date( 'm', $this->get_raw( 'DTT_EVT_start' ) ) != date( 'm', $this->get_raw( 'DTT_EVT_end' ) ) ) {
794
-			$display_date = $this->start_date( 'M j\, Y g:i a' ) . ' - ' . $this->end_date( 'M j\, Y g:i a' );
793
+		if (date('m', $this->get_raw('DTT_EVT_start')) != date('m', $this->get_raw('DTT_EVT_end'))) {
794
+			$display_date = $this->start_date('M j\, Y g:i a').' - '.$this->end_date('M j\, Y g:i a');
795 795
 			//next condition is if its the same month but different day
796 796
 		}
797 797
 		else {
798
-			if ( date( 'm', $this->get_raw( 'DTT_EVT_start' ) ) == date( 'm', $this->get_raw( 'DTT_EVT_end' ) ) && date( 'd', $this->get_raw( 'DTT_EVT_start' ) ) != date( 'd', $this->get_raw( 'DTT_EVT_end' ) ) ) {
799
-				$display_date = $this->start_date( 'M j\, g:i a' ) . ' - ' . $this->end_date( 'M j\, g:i a Y' );
798
+			if (date('m', $this->get_raw('DTT_EVT_start')) == date('m', $this->get_raw('DTT_EVT_end')) && date('d', $this->get_raw('DTT_EVT_start')) != date('d', $this->get_raw('DTT_EVT_end'))) {
799
+				$display_date = $this->start_date('M j\, g:i a').' - '.$this->end_date('M j\, g:i a Y');
800 800
 			}
801 801
 			else {
802
-				$display_date = $this->start_date( 'F j\, Y' ) . ' @ ' . $this->start_date( 'g:i a' ) . ' - ' . $this->end_date( 'g:i a' );
802
+				$display_date = $this->start_date('F j\, Y').' @ '.$this->start_date('g:i a').' - '.$this->end_date('g:i a');
803 803
 			}
804 804
 		}
805 805
 		return $display_date;
@@ -813,8 +813,8 @@  discard block
 block discarded – undo
813 813
 *@param array $query_params see EEM_Base::get_all()
814 814
 	 * @return EE_Ticket[]
815 815
 	 */
816
-	public function tickets( $query_params = array() ) {
817
-		return $this->get_many_related( 'Ticket', $query_params );
816
+	public function tickets($query_params = array()) {
817
+		return $this->get_many_related('Ticket', $query_params);
818 818
 	}
819 819
 
820 820
 
@@ -824,21 +824,21 @@  discard block
 block discarded – undo
824 824
 	 * @param array $query_params like EEM_Base::get_all's
825 825
 	 * @return EE_Ticket[]
826 826
 	 */
827
-	public function ticket_types_available_for_purchase( $query_params = array() ) {
827
+	public function ticket_types_available_for_purchase($query_params = array()) {
828 828
 		// first check if datetime is valid
829
-		if ( ! ( $this->is_upcoming() || $this->is_active() ) || $this->sold_out() ) {
829
+		if ( ! ($this->is_upcoming() || $this->is_active()) || $this->sold_out()) {
830 830
 			return array();
831 831
 		}
832
-		if ( empty( $query_params ) ) {
832
+		if (empty($query_params)) {
833 833
 			$query_params = array(
834 834
 				array(
835
-					'TKT_start_date' => array( '<=', EEM_Ticket::instance()->current_time_for_query( 'TKT_start_date' ) ),
836
-					'TKT_end_date'   => array( '>=', EEM_Ticket::instance()->current_time_for_query( 'TKT_end_date' ) ),
835
+					'TKT_start_date' => array('<=', EEM_Ticket::instance()->current_time_for_query('TKT_start_date')),
836
+					'TKT_end_date'   => array('>=', EEM_Ticket::instance()->current_time_for_query('TKT_end_date')),
837 837
 					'TKT_deleted'    => false
838 838
 				)
839 839
 			);
840 840
 		}
841
-		return $this->tickets( $query_params );
841
+		return $this->tickets($query_params);
842 842
 	}
843 843
 
844 844
 
@@ -848,7 +848,7 @@  discard block
 block discarded – undo
848 848
 	 * @return EE_Event
849 849
 	 */
850 850
 	public function event() {
851
-		return $this->get_first_related( 'Event' );
851
+		return $this->get_first_related('Event');
852 852
 	}
853 853
 
854 854
 
@@ -860,13 +860,13 @@  discard block
 block discarded – undo
860 860
 	 */
861 861
 	public function update_sold() {
862 862
 		$count_regs_for_this_datetime = EEM_Registration::instance()->count(
863
-			array( array(
863
+			array(array(
864 864
 				'STS_ID' 					=> EEM_Registration::status_id_approved,
865 865
 				'REG_deleted' 				=> 0,
866 866
 				'Ticket.Datetime.DTT_ID' 	=> $this->ID(),
867
-			) )
867
+			))
868 868
 		);
869
-		$this->set( 'DTT_sold', $count_regs_for_this_datetime );
869
+		$this->set('DTT_sold', $count_regs_for_this_datetime);
870 870
 		$this->save();
871 871
 		return $count_regs_for_this_datetime;
872 872
 	}
Please login to merge, or discard this patch.
Doc Comments   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
246 246
 	 * Sets qty of reserved tickets for this datetime
247 247
 	 *
248 248
 	 * @param int $reserved
249
-	 * @return boolean
249
+	 * @return boolean|null
250 250
 	 */
251 251
 	function set_reserved( $reserved ) {
252 252
 		// reserved can not go below zero
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
 	 * increments reserved by amount passed by $qty
261 261
 	 *
262 262
 	 * @param int $qty
263
-	 * @return boolean
263
+	 * @return boolean|null
264 264
 	 */
265 265
 	function increase_reserved( $qty = 1 ) {
266 266
 		$reserved = $this->reserved() + absint( $qty );
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
273 273
 	 * decrements (subtracts) reserved by amount passed by $qty
274 274
 	 *
275 275
 	 * @param int $qty
276
-	 * @return boolean
276
+	 * @return boolean|null
277 277
 	 */
278 278
 	function decrease_reserved( $qty = 1 ) {
279 279
 		$reserved = $this->reserved() - absint( $qty );
@@ -352,7 +352,7 @@  discard block
 block discarded – undo
352 352
 	 * @param    string $dt_frmt
353 353
 	 * @param    string $tm_frmt
354 354
 	 * @param    bool   $echo         - whether we echo or return (note echoing uses "pretty" formats, otherwise we use the standard formats)
355
-	 * @return    string|bool|void  string on success, FALSE on fail
355
+	 * @return    null|string  string on success, FALSE on fail
356 356
 	 */
357 357
 	private function _show_datetime( $date_or_time = NULL, $start_or_end = 'start', $dt_frmt = '', $tm_frmt = '', $echo = FALSE ) {
358 358
 		$field_name = "DTT_EVT_{$start_or_end}";
@@ -370,8 +370,8 @@  discard block
 block discarded – undo
370 370
 	 * last-used format, or '' to use the default date format
371 371
 	 *
372 372
 	 * @access        public
373
-	 * @param null $dt_frmt - string representation of date format defaults to 'F j, Y'
374
-	 * @return        mixed        string on success, FALSE on fail
373
+	 * @param string $dt_frmt - string representation of date format defaults to 'F j, Y'
374
+	 * @return        null|string        string on success, FALSE on fail
375 375
 	 */
376 376
 	public function start_date( $dt_frmt = NULL ) {
377 377
 		return $this->_show_datetime( 'D', 'start', $dt_frmt );
@@ -394,8 +394,8 @@  discard block
 block discarded – undo
394 394
 	 * last-used format, or '' to use the default date format
395 395
 	 *
396 396
 	 * @access        public
397
-	 * @param null $dt_frmt - string representation of date format defaults to 'F j, Y'
398
-	 * @return        mixed        string on success, FALSE on fail
397
+	 * @param string $dt_frmt - string representation of date format defaults to 'F j, Y'
398
+	 * @return        null|string        string on success, FALSE on fail
399 399
 	 */
400 400
 	public function end_date( $dt_frmt = NULL ) {
401 401
 		return $this->_show_datetime( 'D', 'end', $dt_frmt );
@@ -419,7 +419,7 @@  discard block
 block discarded – undo
419 419
 	 * @access        public
420 420
 	 * @param null          $dt_frmt - string representation of date format defaults to WP settings
421 421
 	 * @param        string $conjunction - conjunction junction what's your function ? this string joins the start date with the end date ie: Jan 01 "to" Dec 31
422
-	 * @return        mixed        string on success, FALSE on fail
422
+	 * @return        string        string on success, FALSE on fail
423 423
 	 */
424 424
 	public function date_range( $dt_frmt = NULL, $conjunction = ' - ' ) {
425 425
 		$dt_frmt = ! empty( $dt_frmt ) ? $dt_frmt : $this->_dt_frmt;
@@ -445,7 +445,7 @@  discard block
 block discarded – undo
445 445
 	 *
446 446
 	 * @access        public
447 447
 	 * @param        string $tm_format - string representation of time format defaults to 'g:i a'
448
-	 * @return        mixed        string on success, FALSE on fail
448
+	 * @return        null|string        string on success, FALSE on fail
449 449
 	 */
450 450
 	public function start_time( $tm_format = NULL ) {
451 451
 		return $this->_show_datetime( 'T', 'start', NULL, $tm_format );
@@ -467,7 +467,7 @@  discard block
 block discarded – undo
467 467
 	 *
468 468
 	 * @access        public
469 469
 	 * @param        string $tm_format - string representation of time format defaults to 'g:i a'
470
-	 * @return        mixed        string on success, FALSE on fail
470
+	 * @return        null|string        string on success, FALSE on fail
471 471
 	 */
472 472
 	public function end_time( $tm_format = NULL ) {
473 473
 		return $this->_show_datetime( 'T', 'end', NULL, $tm_format );
@@ -490,7 +490,7 @@  discard block
 block discarded – undo
490 490
 	 * @access        public
491 491
 	 * @param        string $tm_format   - string representation of time format defaults to 'g:i a'
492 492
 	 * @param        string $conjunction - conjunction junction what's your function ? this string joins the start date with the end date ie: Jan 01 "to" Dec 31
493
-	 * @return        mixed        string on success, FALSE on fail
493
+	 * @return        string        string on success, FALSE on fail
494 494
 	 */
495 495
 	public function time_range( $tm_format = NULL, $conjunction = ' - ' ) {
496 496
 		$tm_format = !empty( $tm_format ) ? $tm_format : $this->_tm_frmt;
@@ -518,7 +518,7 @@  discard block
 block discarded – undo
518 518
 	 * @access        public
519 519
 	 * @param 	string 	$dt_format - string representation of date format defaults to 'F j, Y'
520 520
 	 * @param 	string 	$tm_format - string representation of time format defaults to 'g:i a'
521
-	 * @return 	mixed 	string on success, FALSE on fail
521
+	 * @return 	null|string 	string on success, FALSE on fail
522 522
 	 */
523 523
 	public function start_date_and_time( $dt_format = NULL, $tm_format = NULL ) {
524 524
 		return $this->_show_datetime( '', 'start', $dt_format, $tm_format );
@@ -578,7 +578,7 @@  discard block
 block discarded – undo
578 578
 	 * @access        public
579 579
 	 * @param bool | string 	$dt_frmt- string representation of date format defaults to 'F j, Y'
580 580
 	 * @param bool | string 	$tm_format - string representation of time format defaults to 'g:i a'
581
-	 * @return 	mixed        		string on success, FALSE on fail
581
+	 * @return 	null|string        		string on success, FALSE on fail
582 582
 	 */
583 583
 	public function end_date_and_time( $dt_frmt = FALSE, $tm_format = FALSE ) {
584 584
 		return $this->_show_datetime( '', 'end', $dt_frmt, $tm_format );
Please login to merge, or discard this patch.
core/db_classes/EE_Event_Message_Template.class.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -22,9 +22,9 @@  discard block
 block discarded – undo
22 22
 	 * @param null  $timezone
23 23
 	 * @return EE_Event_Message_Template|mixed
24 24
 	 */
25
-	public static function new_instance( $props_n_values = array(), $timezone = NULL ) {
26
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone );
27
-		return $has_object ? $has_object : new self( $props_n_values, FALSE, $timezone );
25
+	public static function new_instance($props_n_values = array(), $timezone = NULL) {
26
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone);
27
+		return $has_object ? $has_object : new self($props_n_values, FALSE, $timezone);
28 28
 	}
29 29
 
30 30
 
@@ -34,8 +34,8 @@  discard block
 block discarded – undo
34 34
 	 * @param null  $timezone
35 35
 	 * @return EE_Event_Message_Template
36 36
 	 */
37
-	public static function new_instance_from_db ( $props_n_values = array(), $timezone = NULL ) {
38
-		return new self( $props_n_values, TRUE, $timezone );
37
+	public static function new_instance_from_db($props_n_values = array(), $timezone = NULL) {
38
+		return new self($props_n_values, TRUE, $timezone);
39 39
 	}
40 40
 
41 41
 }
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@
 block discarded – undo
1
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3
+}
2 4
 /**
3 5
  * Event Espresso
4 6
  *
Please login to merge, or discard this patch.
core/db_classes/EE_Event_Question_Group.class.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,18 +1,18 @@  discard block
 block discarded – undo
1
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
2
-	exit( 'No direct script access allowed' );
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3 3
 }
4 4
 /**
5 5
  * Required  by EEM_Event_Question_Group in case someone queries for all its model objects
6 6
  */
7
-class EE_Event_Question_Group extends EE_Base_Class{
7
+class EE_Event_Question_Group extends EE_Base_Class {
8 8
 
9 9
 	/**
10 10
 	 * @param array $props_n_values
11 11
 	 * @return EE_Event_Question_Group|mixed
12 12
 	 */
13
-	public static function new_instance( $props_n_values = array() ) {
14
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
15
-		return $has_object ? $has_object : new self( $props_n_values);
13
+	public static function new_instance($props_n_values = array()) {
14
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
15
+		return $has_object ? $has_object : new self($props_n_values);
16 16
 	}
17 17
 
18 18
 
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 	 * @param array $props_n_values
22 22
 	 * @return EE_Event_Question_Group
23 23
 	 */
24
-	public static function new_instance_from_db ( $props_n_values = array() ) {
25
-		return new self( $props_n_values, TRUE );
24
+	public static function new_instance_from_db($props_n_values = array()) {
25
+		return new self($props_n_values, TRUE);
26 26
 	}
27 27
 }
28 28
\ No newline at end of file
Please login to merge, or discard this patch.
core/db_classes/EE_Event_Venue.class.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -2,15 +2,15 @@  discard block
 block discarded – undo
2 2
 /**
3 3
  * Required  by EEM_Event_Question_Group in case someone queries for all its model objects
4 4
  */
5
-class EE_Event_Venue extends EE_Base_Class{
5
+class EE_Event_Venue extends EE_Base_Class {
6 6
 
7 7
 	/**
8 8
 	 * @param array $props_n_values
9 9
 	 * @return EE_Event_Venue|mixed
10 10
 	 */
11
-	public static function new_instance( $props_n_values = array() ) {
12
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
13
-		return $has_object ? $has_object : new self( $props_n_values);
11
+	public static function new_instance($props_n_values = array()) {
12
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
13
+		return $has_object ? $has_object : new self($props_n_values);
14 14
 	}
15 15
 
16 16
 
@@ -19,8 +19,8 @@  discard block
 block discarded – undo
19 19
 	 * @param array $props_n_values
20 20
 	 * @return EE_Event_Venue
21 21
 	 */
22
-	public static function new_instance_from_db ( $props_n_values = array() ) {
23
-		return new self( $props_n_values, TRUE );
22
+	public static function new_instance_from_db($props_n_values = array()) {
23
+		return new self($props_n_values, TRUE);
24 24
 	}
25 25
 
26 26
 }
27 27
\ No newline at end of file
Please login to merge, or discard this patch.