eventespresso / event-espresso-core

core/data_migration_scripts/EE_Data_Migration_Script_Stage.core.php

Spacing +9 added lines, -9 removed lines

@@ -34,7 +34,7 @@ 
  * _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
  * on each call to _migration_step().
  */
-abstract class EE_Data_Migration_Script_Stage extends EE_Data_Migration_Class_Base{
+abstract class EE_Data_Migration_Script_Stage extends EE_Data_Migration_Class_Base {
 	/**
 	 * The migration script this is a stage of
 	 * @var EE_Data_Migration_Script_Base
@@ -47,7 +47,7 @@ 
 	 * called by EE_Data_Migration_Script_Base's __construct() method so children don't have to
 	 * @param EE_Data_Migration_Script_Base $migration_script
 	 */
-	public function _construct_finalize($migration_script){
+	public function _construct_finalize($migration_script) {
 		$this->_migration_script = $migration_script;
 	}
 
@@ -58,13 +58,13 @@ 
 	 * @param int $num_items_to_migrate
 	 * @return int
 	 */
-	public function migration_step($num_items_to_migrate=50){
+	public function migration_step($num_items_to_migrate = 50) {
 		//before we run the migration step, we want ot take note of warnings that get outputted
 		ob_start();
 		$items_migrated = $this->_migration_step($num_items_to_migrate);
 		$output = ob_get_contents();
 		ob_end_clean();
-		if( $output ){
+		if ($output) {
 			$this->add_error($output);
 		}
 		$this->_records_migrated += $items_migrated;
@@ -82,7 +82,7 @@ 
 	 * @param int $num_items_to_migrate
 	 * @return int number of items ACTUALLY migrated
 	 */
-	abstract protected function _migration_step($num_items_to_migrate=50);
+	abstract protected function _migration_step($num_items_to_migrate = 50);
 
 	/**
 	 * Counts the records that have been migrated so far
@@ -96,7 +96,7 @@ 
 	 * returns an array of strings describing errors
 	 * @return array
 	 */
-	public function get_errors(){
+	public function get_errors() {
 		return $this->_errors;
 	}
 
@@ -106,9 +106,9 @@ 
 	 * to have been made from the properties_as_array() function.
 	 * @param array $array_of_properties like what's produced from properties_as_array() method
 	 */
-	public function instantiate_from_array_of_properties($array_of_properties){
+	public function instantiate_from_array_of_properties($array_of_properties) {
 		unset($array_of_properties['class']);
-		foreach($array_of_properties as $property_name => $property_value){
+		foreach ($array_of_properties as $property_name => $property_value) {
 			$this->$property_name = $property_value;
 		}
 	}
@@ -117,7 +117,7 @@ 
 	 * Gets the script this is a stage of
 	 * @return EE_Data_Migration_Script_Base
 	 */
-	protected function get_migration_script(){
+	protected function get_migration_script() {
 		return $this->_migration_script;
 	}
 }

core/data_migration_scripts/EE_Data_Migration_Script_Stage_Table.core.php

Indentation +6 added lines, -6 removed lines

@@ -21,12 +21,12 @@
 	protected $_old_table;
 
 /**
-	 * Set in the constructor to add this sql to both the counting query in
-	 * EE_Data_Migration_Script_Stage_Table::_count_records_to_migrate() and
-	 * EE_Data_Migration_Script_Stage_Table::_get_rows().
-	 * Eg "where column_name like '%some_value%'"
-	 * @var string
-	 */
+ * Set in the constructor to add this sql to both the counting query in
+ * EE_Data_Migration_Script_Stage_Table::_count_records_to_migrate() and
+ * EE_Data_Migration_Script_Stage_Table::_get_rows().
+ * Eg "where column_name like '%some_value%'"
+ * @var string
+ */
 	protected $_extra_where_sql;
 
 

Spacing +9 added lines, -9 removed lines

@@ -41,14 +41,14 @@ 
 	 * @param int $num_items
 	 * @return int number of items ACTUALLY migrated
 	 */
-	function _migration_step($num_items=50){
-		$rows = $this->_get_rows( $num_items );
+	function _migration_step($num_items = 50) {
+		$rows = $this->_get_rows($num_items);
 		$items_actually_migrated = 0;
-		foreach($rows as $old_row){
+		foreach ($rows as $old_row) {
 			$this->_migrate_old_row($old_row);
 			$items_actually_migrated++;
 		}
-		if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
 			$this->set_completed();
 		}
 		return $items_actually_migrated;
@@ -60,11 +60,11 @@ 
 	 * @param int $limit
 	 * @return array of arrays like $wpdb->get_results($sql, ARRAY_A)
 	 */
-	protected function _get_rows( $limit ){
+	protected function _get_rows($limit) {
 		global $wpdb;
 		$start_at_record = $this->count_records_migrated();
-		$query = "SELECT * FROM {$this->_old_table} {$this->_extra_where_sql} " . $wpdb->prepare("LIMIT %d, %d",$start_at_record,$limit);
-		return $wpdb->get_results($query,ARRAY_A);
+		$query = "SELECT * FROM {$this->_old_table} {$this->_extra_where_sql} ".$wpdb->prepare("LIMIT %d, %d", $start_at_record, $limit);
+		return $wpdb->get_results($query, ARRAY_A);
 	}
 
 
@@ -75,8 +75,8 @@ 
 	 */
 	function _count_records_to_migrate() {
 		global $wpdb;
-		$query =  "SELECT COUNT(*) FROM {$this->_old_table} {$this->_extra_where_sql}";
-		$count = $wpdb->get_var( $query );
+		$query = "SELECT COUNT(*) FROM {$this->_old_table} {$this->_extra_where_sql}";
+		$count = $wpdb->get_var($query);
 		return $count;
 	}
 

core/db_classes/EE_CPT_Base.class.php

Spacing +56 added lines, -56 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -47,8 +47,8 @@ 
 	 * @param int    $parent_term_taxonomy_id optional
 	 * @return EE_Term_Taxonomy
 	 */
-	function add_event_category( $category_name, $category_description = NULL, $parent_term_taxonomy_id = NULL ) {
-		return $this->get_model()->add_event_category( $this, $category_name, $category_description, $parent_term_taxonomy_id );
+	function add_event_category($category_name, $category_description = NULL, $parent_term_taxonomy_id = NULL) {
+		return $this->get_model()->add_event_category($this, $category_name, $category_description, $parent_term_taxonomy_id);
 	}
 
 
@@ -58,8 +58,8 @@ 
 	 * @param string $category_name
 	 * @return bool
 	 */
-	function remove_event_category( $category_name ) {
-		return $this->get_model()->remove_event_category( $this, $category_name );
+	function remove_event_category($category_name) {
+		return $this->get_model()->remove_event_category($this, $category_name);
 	}
 
 
@@ -70,14 +70,14 @@ 
 	 * @param EE_Term_Taxonomy $term_taxonomy
 	 * @return EE_Base_Class the relation was removed from
 	 */
-	function remove_relation_to_term_taxonomy( $term_taxonomy ) {
-		if ( !$term_taxonomy ) {
-			EE_Error::add_error( sprintf( __( "No Term_Taxonomy provided which to remove from model object of type %s and id %d", "event_espresso" ), get_class( $this ), $this->ID() ), __FILE__, __FUNCTION__, __LINE__ );
+	function remove_relation_to_term_taxonomy($term_taxonomy) {
+		if ( ! $term_taxonomy) {
+			EE_Error::add_error(sprintf(__("No Term_Taxonomy provided which to remove from model object of type %s and id %d", "event_espresso"), get_class($this), $this->ID()), __FILE__, __FUNCTION__, __LINE__);
 			return NULL;
 		}
-		$term_taxonomy->set_count( $term_taxonomy->count() - 1 );
+		$term_taxonomy->set_count($term_taxonomy->count() - 1);
 		$term_taxonomy->save();
-		return $this->_remove_relation_to( $term_taxonomy, 'Term_Taxonomy' );
+		return $this->_remove_relation_to($term_taxonomy, 'Term_Taxonomy');
 	}
 
 
@@ -101,7 +101,7 @@ 
 	 * @return int
 	 */
 	public function parent() {
-		return $this->get( 'parent' );
+		return $this->get('parent');
 	}
 
 
@@ -111,7 +111,7 @@ 
 	 * @return string
 	 */
 	public function status() {
-		return $this->get( 'status' );
+		return $this->get('status');
 	}
 
 
@@ -119,8 +119,8 @@ 
 	/**
 	 * @param string $status
 	 */
-	public function set_status( $status ) {
-		$this->set( 'status', $status );
+	public function set_status($status) {
+		$this->set('status', $status);
 	}
 
 
@@ -134,12 +134,12 @@ 
 	 * @param string|array $attr Optional. Query string or array of attributes.
 	 * @return string HTML image element
 	 */
-	protected function _get_feature_image( $size, $attr ) {
+	protected function _get_feature_image($size, $attr) {
 		//first let's see if we already have the _feature_image property set AND if it has a cached element on it FOR the given size
-		$attr_key = is_array( $attr ) ? implode( '_', $attr ) : $attr;
-		$cache_key = is_array( $size ) ? implode( '_', $size ) . $attr_key : $size . $attr_key;
-		$this->_feature_image[ $cache_key ] = isset( $this->_feature_image[ $cache_key ] ) ? $this->_feature_image[ $cache_key ] : $this->get_model()->get_feature_image( $this->ID(), $size, $attr );
-		return $this->_feature_image[ $cache_key ];
+		$attr_key = is_array($attr) ? implode('_', $attr) : $attr;
+		$cache_key = is_array($size) ? implode('_', $size).$attr_key : $size.$attr_key;
+		$this->_feature_image[$cache_key] = isset($this->_feature_image[$cache_key]) ? $this->_feature_image[$cache_key] : $this->get_model()->get_feature_image($this->ID(), $size, $attr);
+		return $this->_feature_image[$cache_key];
 	}
 
 
@@ -150,8 +150,8 @@ 
 	 * @param string|array $attr
 	 * @return string of html
 	 */
-	public function feature_image( $size = 'thumbnail', $attr = '' ) {
-		return $this->_get_feature_image( $size, $attr );
+	public function feature_image($size = 'thumbnail', $attr = '') {
+		return $this->_get_feature_image($size, $attr);
 	}
 
 
@@ -161,9 +161,9 @@ 
 	 * @param  string|array $size can either be a string: 'thumbnail', 'medium', 'large', 'full' OR 2-item array representing width and height in pixels eg. array(32,32).
 	 * @return string|boolean          the url of the image or false if not found
 	 */
-	public function feature_image_url( $size = 'thumbnail' ) {
-		$attachment = wp_get_attachment_image_src( get_post_thumbnail_id( $this->ID() ), $size );
-		return !empty( $attachment ) ? $attachment[ 0 ] : FALSE;
+	public function feature_image_url($size = 'thumbnail') {
+		$attachment = wp_get_attachment_image_src(get_post_thumbnail_id($this->ID()), $size);
+		return ! empty($attachment) ? $attachment[0] : FALSE;
 	}
 
 
@@ -176,37 +176,37 @@ 
 	 * @internal param array|string $related_obj_names if included this will be used to restore for related obj if not included then we just do restore on the meta.  We will accept an array of related_obj_names for restoration here.
 	 * @return void
 	 */
-	public function restore_revision( $revision_id, $related_obj_names = array(), $where_query = array() ) {
+	public function restore_revision($revision_id, $related_obj_names = array(), $where_query = array()) {
 		//get revision object
-		$revision_obj = $this->get_model()->get_one_by_ID( $revision_id );
-		if ( $revision_obj instanceof EE_CPT_Base ) {
+		$revision_obj = $this->get_model()->get_one_by_ID($revision_id);
+		if ($revision_obj instanceof EE_CPT_Base) {
 			//no related_obj_name so we assume we're saving a revision on this object.
-			if ( empty( $related_obj_names ) ) {
+			if (empty($related_obj_names)) {
 				$fields = $this->get_model()->get_meta_table_fields();
-				foreach ( $fields as $field ) {
-					$this->set( $field, $revision_obj->get( $field ) );
+				foreach ($fields as $field) {
+					$this->set($field, $revision_obj->get($field));
 				}
 				$this->save();
 			}
-			$related_obj_names = (array)$related_obj_names;
-			foreach ( $related_obj_names as $related_name ) {
+			$related_obj_names = (array) $related_obj_names;
+			foreach ($related_obj_names as $related_name) {
 				//related_obj_name so we're saving a revision on an object related to this object
 				//do we have $where_query params for this related object?  If we do then we include that.
-				$cols_n_values = isset( $where_query[ $related_name ] ) ? $where_query[ $related_name ] : array();
-				$where_params = !empty( $cols_n_values ) ? array( $cols_n_values ) : array();
-				$related_objs = $this->get_many_related( $related_name, $where_params );
-				$revision_related_objs = $revision_obj->get_many_related( $related_name, $where_params );
+				$cols_n_values = isset($where_query[$related_name]) ? $where_query[$related_name] : array();
+				$where_params = ! empty($cols_n_values) ? array($cols_n_values) : array();
+				$related_objs = $this->get_many_related($related_name, $where_params);
+				$revision_related_objs = $revision_obj->get_many_related($related_name, $where_params);
 				//load helper
-				EE_Registry::instance()->load_helper( 'Array' );
+				EE_Registry::instance()->load_helper('Array');
 				//remove related objs from this object that are not in revision
 				//array_diff *should* work cause I think objects are indexed by ID?
-				$related_to_remove = EEH_Array::object_array_diff( $related_objs, $revision_related_objs );
-				foreach ( $related_to_remove as $rr ) {
-					$this->_remove_relation_to( $rr, $related_name, $cols_n_values );
+				$related_to_remove = EEH_Array::object_array_diff($related_objs, $revision_related_objs);
+				foreach ($related_to_remove as $rr) {
+					$this->_remove_relation_to($rr, $related_name, $cols_n_values);
 				}
 				//add all related objs attached to revision to this object
-				foreach ( $revision_related_objs as $r_obj ) {
-					$this->_add_relation_to( $r_obj, $related_name, $cols_n_values );
+				foreach ($revision_related_objs as $r_obj) {
+					$this->_add_relation_to($r_obj, $related_name, $cols_n_values);
 				}
 			}
 		}
@@ -222,8 +222,8 @@ 
 	 * <li>If $single is set to false, or left blank, the function returns an array containing all values of the specified key.</li>
 	 * <li>If $single is set to true, the function returns the first value of the specified key (not in an array</li></ul>
 	 */
-	public function get_post_meta( $meta_key = NULL, $single = FALSE ) {
-		return get_post_meta( $this->ID(), $meta_key, $single );
+	public function get_post_meta($meta_key = NULL, $single = FALSE) {
+		return get_post_meta($this->ID(), $meta_key, $single);
 	}
 
 
@@ -236,11 +236,11 @@ 
 	 * @throws EE_Error
 	 * @return mixed Returns meta_id if the meta doesn't exist, otherwise returns true on success and false on failure. NOTE: If the meta_value passed to this function is the same as the value that is already in the database, this function returns false.
 	 */
-	public function update_post_meta( $meta_key, $meta_value, $prev_value = NULL ) {
-		if ( !$this->ID() ) {
-			throw new EE_Error( sprintf( __( "You must save this custom post type before adding or updating a post meta field", "event_espresso" ) ) );
+	public function update_post_meta($meta_key, $meta_value, $prev_value = NULL) {
+		if ( ! $this->ID()) {
+			throw new EE_Error(sprintf(__("You must save this custom post type before adding or updating a post meta field", "event_espresso")));
 		}
-		return update_post_meta( $this->ID(), $meta_key, $meta_value, $prev_value );
+		return update_post_meta($this->ID(), $meta_key, $meta_value, $prev_value);
 	}
 
 
@@ -253,11 +253,11 @@ 
 	 * @throws EE_Error
 	 * @return boolean Boolean true, except if the $unique argument was set to true and a custom field with the given key already exists, in which case false is returned.
 	 */
-	public function add_post_meta( $meta_key, $meta_value, $unique = FALSE ) {
-		if ( !$this->ID() ) {
-			throw new EE_Error( sprintf( __( "You must save this custom post type before adding or updating a post meta field", "event_espresso" ) ) );
+	public function add_post_meta($meta_key, $meta_value, $unique = FALSE) {
+		if ( ! $this->ID()) {
+			throw new EE_Error(sprintf(__("You must save this custom post type before adding or updating a post meta field", "event_espresso")));
 		}
-		return add_post_meta( $this->ID(), $meta_key, $meta_value, $unique );
+		return add_post_meta($this->ID(), $meta_key, $meta_value, $unique);
 	}
 
 
@@ -267,7 +267,7 @@ 
 	 * @return string
 	 */
 	public function get_permalink() {
-		return get_permalink( $this->ID() );
+		return get_permalink($this->ID());
 	}
 
 
@@ -277,8 +277,8 @@ 
 	 * @param array $query_params
 	 * @return EE_Term_Taxonomy
 	 */
-	public function term_taxonomies( $query_params = array() ) {
-		return $this->get_many_related( 'Term_Taxonomy', $query_params );
+	public function term_taxonomies($query_params = array()) {
+		return $this->get_many_related('Term_Taxonomy', $query_params);
 	}
 
 

Indentation +12 added lines, -12 removed lines

@@ -2,18 +2,18 @@
 	exit( 'No direct script access allowed' );
 }
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for WordPress
- *
- * @ package        Event Espresso
- * @ author        Event Espresso
- * @ copyright    (c) 2008-2011 Event Espresso  All Rights Reserved.
- * @ license        {@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
- * @ link                {@link http://www.eventespresso.com}
- * @ since            4.0
- *
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for WordPress
+	 *
+	 * @ package        Event Espresso
+	 * @ author        Event Espresso
+	 * @ copyright    (c) 2008-2011 Event Espresso  All Rights Reserved.
+	 * @ license        {@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
+	 * @ link                {@link http://www.eventespresso.com}
+	 * @ since            4.0
+	 *
+	 */
 
 
 

Doc Comments +7 added lines, -7 removed lines

@@ -98,7 +98,7 @@ 
 	 * The main purpose of this method is to return the parent for the model object
 	 *
 	 * @access public
-	 * @return int
+	 * @return boolean
 	 */
 	public function parent() {
 		return $this->get( 'parent' );
@@ -108,7 +108,7 @@ 
 
 	/**
 	 * return the _status property
-	 * @return string
+	 * @return boolean
 	 */
 	public function status() {
 		return $this->get( 'status' );
@@ -130,7 +130,7 @@ 
 	 *
 	 * @link   http://codex.wordpress.org/Function_Reference/get_the_post_thumbnail
 	 * @access protected
-	 * @param string|array $size (optional) Image size. Defaults to 'post-thumbnail' but can also be a 2-item array representing width and height in pixels (i.e. array(32,32) ).
+	 * @param string $size (optional) Image size. Defaults to 'post-thumbnail' but can also be a 2-item array representing width and height in pixels (i.e. array(32,32) ).
 	 * @param string|array $attr Optional. Query string or array of attributes.
 	 * @return string HTML image element
 	 */
@@ -158,7 +158,7 @@ 
 
 	/**
 	 * This uses the wp "wp_get_attachment_image_src()" function to return the feature image for the current class using the given size params.
-	 * @param  string|array $size can either be a string: 'thumbnail', 'medium', 'large', 'full' OR 2-item array representing width and height in pixels eg. array(32,32).
+	 * @param  integer[] $size can either be a string: 'thumbnail', 'medium', 'large', 'full' OR 2-item array representing width and height in pixels eg. array(32,32).
 	 * @return string|boolean          the url of the image or false if not found
 	 */
 	public function feature_image_url( $size = 'thumbnail' ) {
@@ -172,7 +172,7 @@ 
 	 * This is a method for restoring this_obj using details from the given $revision_id
 	 *
 	 * @param int $revision_id 		ID of the revision we're getting data from
-	 * @param array $related_obj_names if included this will be used to restore for related obj
+	 * @param string[] $related_obj_names if included this will be used to restore for related obj
 	 *                                 if not included then we just do restore on the meta.
 	 *                                 We will accept an array of related_obj_names for restoration here.
 	 * @param array $where_query       You can optionally include an array of key=>value pairs
@@ -227,7 +227,7 @@ 
 	 * Wrapper for get_post_meta, http://codex.wordpress.org/Function_Reference/get_post_meta
 	 * @param string  $meta_key
 	 * @param boolean $single
-	 * @return mixed <ul><li>If only $id is set it will return all meta values in an associative array.</li>
+	 * @return string|null <ul><li>If only $id is set it will return all meta values in an associative array.</li>
 	 * <li>If $single is set to false, or left blank, the function returns an array containing all values of the specified key.</li>
 	 * <li>If $single is set to true, the function returns the first value of the specified key (not in an array</li></ul>
 	 */
@@ -284,7 +284,7 @@ 
 	/**
 	 * Gets all the term-taxonomies for this CPT
 	 * @param array $query_params
-	 * @return EE_Term_Taxonomy
+	 * @return EE_Base_Class[]
 	 */
 	public function term_taxonomies( $query_params = array() ) {
 		return $this->get_many_related( 'Term_Taxonomy', $query_params );

core/db_classes/EE_Event_Message_Template.class.php

Spacing +5 added lines, -5 removed lines

@@ -22,9 +22,9 @@ 
 	 * @param null  $timezone
 	 * @return EE_Event_Message_Template|mixed
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = NULL ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone );
-		return $has_object ? $has_object : new self( $props_n_values, FALSE, $timezone );
+	public static function new_instance($props_n_values = array(), $timezone = NULL) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone);
+		return $has_object ? $has_object : new self($props_n_values, FALSE, $timezone);
 	}
 
 
@@ -34,8 +34,8 @@ 
 	 * @param null  $timezone
 	 * @return EE_Event_Message_Template
 	 */
-	public static function new_instance_from_db ( $props_n_values = array(), $timezone = NULL ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = NULL) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 }

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

core/db_classes/EE_Event_Question_Group.class.php

Spacing +8 added lines, -8 removed lines

@@ -1,18 +1,18 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Required  by EEM_Event_Question_Group in case someone queries for all its model objects
  */
-class EE_Event_Question_Group extends EE_Base_Class{
+class EE_Event_Question_Group extends EE_Base_Class {
 
 	/**
 	 * @param array $props_n_values
 	 * @return EE_Event_Question_Group|mixed
 	 */
-	public static function new_instance( $props_n_values = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values);
+	public static function new_instance($props_n_values = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values);
 	}
 
 
@@ -21,7 +21,7 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Event_Question_Group
 	 */
-	public static function new_instance_from_db ( $props_n_values = array() ) {
-		return new self( $props_n_values, TRUE );
+	public static function new_instance_from_db($props_n_values = array()) {
+		return new self($props_n_values, TRUE);
 	}
 }
\ No newline at end of file

Indentation +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?php
 /**
- * Required  by EEM_Event_Question_Group in case someone queries for all its model objects
- */
+	 * Required  by EEM_Event_Question_Group in case someone queries for all its model objects
+	 */
 class EE_Event_Venue extends EE_Base_Class{
 
 	/**

core/db_classes/EE_Event_Venue.class.php

Indentation +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?php
 /**
- * Required  by EEM_Event_Question_Group in case someone queries for all its model objects
- */
+	 * Required  by EEM_Event_Question_Group in case someone queries for all its model objects
+	 */
 class EE_Event_Venue extends EE_Base_Class{
 
 	/**

Spacing +6 added lines, -6 removed lines

@@ -2,15 +2,15 @@ 
 /**
  * Required  by EEM_Event_Question_Group in case someone queries for all its model objects
  */
-class EE_Event_Venue extends EE_Base_Class{
+class EE_Event_Venue extends EE_Base_Class {
 
 	/**
 	 * @param array $props_n_values
 	 * @return EE_Event_Venue|mixed
 	 */
-	public static function new_instance( $props_n_values = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values);
+	public static function new_instance($props_n_values = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values);
 	}
 
 
@@ -19,8 +19,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Event_Venue
 	 */
-	public static function new_instance_from_db ( $props_n_values = array() ) {
-		return new self( $props_n_values, TRUE );
+	public static function new_instance_from_db($props_n_values = array()) {
+		return new self($props_n_values, TRUE);
 	}
 
 }
\ No newline at end of file

core/db_classes/EE_Payment_Method.class.php

Spacing +45 added lines, -45 removed lines

@@ -1,5 +1,5 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 /**
  * Event Espresso
  *
@@ -23,7 +23,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_Payment_Method extends EE_Base_Class{
+class EE_Payment_Method extends EE_Base_Class {
 
 	/**
 	 * Payment Method type object, which has all the info about this type of payment method,
@@ -39,9 +39,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Payment_Method
 	 */
-	public static function new_instance( $props_n_values = array()) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values, FALSE );
+	public static function new_instance($props_n_values = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values, FALSE);
 	}
 
 
@@ -51,8 +51,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Payment_Method
 	 */
-	public static function new_instance_from_db ( $props_n_values = array()) {
-		return new self( $props_n_values, TRUE );
+	public static function new_instance_from_db($props_n_values = array()) {
+		return new self($props_n_values, TRUE);
 	}
 
 
@@ -81,7 +81,7 @@ 
 	 * @return boolean
 	 */
 	function active() {
-		return array_intersect(array_keys(EEM_Payment_Method::instance()->scopes()),$this->scope());
+		return array_intersect(array_keys(EEM_Payment_Method::instance()->scopes()), $this->scope());
 	}
 
 
@@ -90,10 +90,10 @@ 
 	 * Sets this PM as active by making it usable within the CART scope. Offline gateways
 	 * are also usable from the admin-scope as well. DOES NOT SAVE it
 	 */
-	function set_active(){
+	function set_active() {
 		$default_scopes = array(EEM_Payment_Method::scope_cart);
-		if($this->type_obj() &&
-			$this->type_obj()->payment_occurs() == EE_PMT_Base::offline){
+		if ($this->type_obj() &&
+			$this->type_obj()->payment_occurs() == EE_PMT_Base::offline) {
 			$default_scopes[] = EEM_Payment_Method::scope_admin;
 		}
 		$this->set_scope($default_scopes);
@@ -104,7 +104,7 @@ 
 	/**
 	 * Makes this payment method apply to NO scopes at all. DOES NOT SAVE it.
 	 */
-	function deactivate(){
+	function deactivate() {
 		$this->set_scope(array());
 	}
 
@@ -295,8 +295,8 @@ 
 	 * @param type $field_value
 	 * @param type $use_default
 	 */
-	function set( $field_name, $field_value, $use_default = FALSE ){
-		if( $field_name == 'PMD_type' ){
+	function set($field_name, $field_value, $use_default = FALSE) {
+		if ($field_name == 'PMD_type') {
 			//the type has probably changed, so forget about its old type object
 			$this->_type_obj = NULL;
 		}
@@ -370,26 +370,26 @@ 
 	 * @return EE_PMT_Base
 	 * @throws EE_Error
 	 */
-	public function type_obj(){
-		if( ! $this->_type_obj ) {
-			EE_Registry::instance()->load_lib( 'Payment_Method_Manager' );
-			if ( EE_Payment_Method_Manager::instance()->payment_method_type_exists( $this->type() )) {
-				$class_name = EE_Payment_Method_Manager::instance()->payment_method_class_from_type( $this->type() );
-				if ( ! class_exists( $class_name )) {
+	public function type_obj() {
+		if ( ! $this->_type_obj) {
+			EE_Registry::instance()->load_lib('Payment_Method_Manager');
+			if (EE_Payment_Method_Manager::instance()->payment_method_type_exists($this->type())) {
+				$class_name = EE_Payment_Method_Manager::instance()->payment_method_class_from_type($this->type());
+				if ( ! class_exists($class_name)) {
 					throw new EE_Error(
 						sprintf(
-							__( 'An attempt to use the "%1$s" payment method failed, so it was deactivated.%2$sWas the "%1$s" Plugin recently deactivated? It can be reactivated on the %3$sPlugins Admin Page%4$s', 'event_espresso' ),
+							__('An attempt to use the "%1$s" payment method failed, so it was deactivated.%2$sWas the "%1$s" Plugin recently deactivated? It can be reactivated on the %3$sPlugins Admin Page%4$s', 'event_espresso'),
 							$class_name,
 							'<br />',
-							'<a href="' . admin_url('plugins.php') . '">',
+							'<a href="'.admin_url('plugins.php').'">',
 							'</a>'
 						)
 					);
 				}
-				$r = new ReflectionClass( $class_name );
-					$this->_type_obj = $r->newInstanceArgs( array( $this ));
+				$r = new ReflectionClass($class_name);
+					$this->_type_obj = $r->newInstanceArgs(array($this));
 			} else {
-				throw new EE_Error( sprintf( __( 'A payment method of type "%1$s" does not exist. Only ones existing are: %2$s', 'event_espresso' ), $this->type(), implode(',', EE_Payment_Method_Manager::instance()->payment_method_type_names() ) ) );
+				throw new EE_Error(sprintf(__('A payment method of type "%1$s" does not exist. Only ones existing are: %2$s', 'event_espresso'), $this->type(), implode(',', EE_Payment_Method_Manager::instance()->payment_method_type_names())));
 			}
 		}
 		return $this->_type_obj;
@@ -402,18 +402,18 @@ 
 	 * and the extra meta. Mostly used for passing off ot gateways.	 *
 	 * @return array
 	 */
-	public function settings_array(){
+	public function settings_array() {
 		$fields = $this->model_field_array();
 		$extra_meta = $this->all_extra_meta_array();
 		//remove the model's prefix from the fields
 		$combined_settings_array = array();
-		foreach($fields as $key => $value){
-			if(strpos($key, 'PMD_')===0){
+		foreach ($fields as $key => $value) {
+			if (strpos($key, 'PMD_') === 0) {
 				$key_sans_model_prefix = str_replace('PMD_', '', $key);
 				$combined_settings_array [$key_sans_model_prefix] = $value;
 			}
 		}
-		$combined_settings_array = array_merge( $extra_meta,$combined_settings_array );
+		$combined_settings_array = array_merge($extra_meta, $combined_settings_array);
 		return $combined_settings_array;
 	}
 
@@ -425,12 +425,12 @@ 
 	 * @param string $css_class
 	 * @return string of HTML for displaying the button
 	 */
-	public function button_html( $url = '', $css_class = '' ){
+	public function button_html($url = '', $css_class = '') {
 		$payment_occurs = $this->type_obj()->payment_occurs();
 		return '
-		 <div id="' . $this->slug() . '-payment-option-dv" class="'. $payment_occurs .'-payment-gateway reg-page-payment-option-dv' . $css_class . '">
-			<a id="payment-gateway-button-' . $this->slug() . '" class="reg-page-payment-option-lnk" rel="' . $this->slug() . '" href="' . $url . '" >
-				<img src="' . $this->button_url() . '" alt="' . sprintf( esc_attr__( 'Pay using %s', 'event_espresso' ), $this->get_pretty('PMD_name','form_input') ) . '" />
+		 <div id="' . $this->slug().'-payment-option-dv" class="'.$payment_occurs.'-payment-gateway reg-page-payment-option-dv'.$css_class.'">
+			<a id="payment-gateway-button-' . $this->slug().'" class="reg-page-payment-option-lnk" rel="'.$this->slug().'" href="'.$url.'" >
+				<img src="' . $this->button_url().'" alt="'.sprintf(esc_attr__('Pay using %s', 'event_espresso'), $this->get_pretty('PMD_name', 'form_input')).'" />
 			</a>
 		</div>
 ';
@@ -443,7 +443,7 @@ 
 	 * (as defined by the gateway and the currently active currencies)
 	 * @return EE_Currency[]
 	 */
-	public function get_all_usable_currencies(){
+	public function get_all_usable_currencies() {
 		return EEM_Currency::instance()->get_all_currencies_usable_by($this->type_obj());
 	}
 
@@ -452,9 +452,9 @@ 
 	 * @param string $currency_code currency ID (code)
 	 * @return boolean
 	 */
-	public function usable_for_currency( $currency_code ) {
-		foreach( $this->get_all_usable_currencies() as $currency_obj ) {
-			if( $currency_obj->ID() == $currency_code ){
+	public function usable_for_currency($currency_code) {
+		foreach ($this->get_all_usable_currencies() as $currency_obj) {
+			if ($currency_obj->ID() == $currency_code) {
 				return TRUE;
 			}
 		}
@@ -467,7 +467,7 @@ 
 	 * Returns TRUE if this payment method's gateway is an instance of EE_Onsite_Gateway
 	 * @return bool
 	 */
-	public function is_on_site(){
+	public function is_on_site() {
 		return $this->type_obj()->payment_occurs() == EE_PMT_Base::onsite;
 	}
 
@@ -477,7 +477,7 @@ 
 	 * Returns TRUE if this payment method's gateway is an instance of EE_Offsite_Gateway
 	 * @return bool
 	 */
-	public function is_off_site(){
+	public function is_off_site() {
 		return $this->type_obj()->payment_occurs() == EE_PMT_Base::offsite;
 	}
 
@@ -487,7 +487,7 @@ 
 	 * Returns TRUE if this payment method does not utilize a gateway
 	 * @return bool
 	 */
-	public function is_off_line(){
+	public function is_off_line() {
 		return $this->type_obj()->payment_occurs() == EE_PMT_Base::offline;
 	}
 
@@ -497,10 +497,10 @@ 
 	 * to load the required classes, and don't need them at the time of unserialization
 	 * @return array
 	 */
-	public function __sleep(){
-		$properties =  get_object_vars( $this );
-		unset( $properties[ '_type_obj' ] );
-		return array_keys( $properties );
+	public function __sleep() {
+		$properties = get_object_vars($this);
+		unset($properties['_type_obj']);
+		return array_keys($properties);
 	}
 
 

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if (!defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 /**
  * Event Espresso

Doc Comments +10 added lines, -10 removed lines

@@ -112,7 +112,7 @@ 
 
 	/**
 	 * Gets button_url
-	 * @return string
+	 * @return boolean
 	 */
 	function button_url() {
 		return $this->get('PMD_button_url');
@@ -152,7 +152,7 @@ 
 
 	/**
 	 * Gets description
-	 * @return string
+	 * @return boolean
 	 */
 	function description() {
 		return $this->get('PMD_desc');
@@ -172,7 +172,7 @@ 
 
 	/**
 	 * Gets name
-	 * @return string
+	 * @return boolean
 	 */
 	function name() {
 		return $this->get('PMD_name');
@@ -212,7 +212,7 @@ 
 
 	/**
 	 * Gets order
-	 * @return int
+	 * @return boolean
 	 */
 	function order() {
 		return $this->get('PMD_order');
@@ -232,7 +232,7 @@ 
 
 	/**
 	 * Gets slug
-	 * @return string
+	 * @return boolean
 	 */
 	function slug() {
 		return $this->get('PMD_slug');
@@ -252,7 +252,7 @@ 
 
 	/**
 	 * Gets type
-	 * @return string
+	 * @return boolean
 	 */
 	function type() {
 		return $this->get('PMD_type');
@@ -272,7 +272,7 @@ 
 
 	/**
 	 * Gets wp_user
-	 * @return int
+	 * @return boolean
 	 */
 	function wp_user() {
 		return $this->get('PMD_wp_user');
@@ -307,7 +307,7 @@ 
 
 	/**
 	 * Gets admin_name
-	 * @return string
+	 * @return boolean
 	 */
 	function admin_name() {
 		return $this->get('PMD_admin_name');
@@ -327,7 +327,7 @@ 
 
 	/**
 	 * Gets admin_desc
-	 * @return string
+	 * @return boolean
 	 */
 	function admin_desc() {
 		return $this->get('PMD_admin_desc');
@@ -347,7 +347,7 @@ 
 
 	/**
 	 * Gets scope
-	 * @return array
+	 * @return boolean
 	 */
 	function scope() {
 		return $this->get('PMD_scope');

core/db_classes/EE_Question_Group_Question.class.php

Indentation +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?php
 /**
- * Required  by EEM_Question_Group_Question in case someone queries for all its model objects
- */
+	 * Required  by EEM_Question_Group_Question in case someone queries for all its model objects
+	 */
 class EE_Question_Group_Question extends EE_Base_Class{
 
 	/**

Spacing +6 added lines, -6 removed lines

@@ -2,15 +2,15 @@ 
 /**
  * Required  by EEM_Question_Group_Question in case someone queries for all its model objects
  */
-class EE_Question_Group_Question extends EE_Base_Class{
+class EE_Question_Group_Question extends EE_Base_Class {
 
 	/**
 	 * @param array $props_n_values
 	 * @return EE_Question_Group_Question|mixed
 	 */
-	public static function new_instance( $props_n_values = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values );
+	public static function new_instance($props_n_values = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values);
 	}
 
 
@@ -19,7 +19,7 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Question_Group_Question
 	 */
-	public static function new_instance_from_db ( $props_n_values = array() ) {
-		return new self( $props_n_values, TRUE );
+	public static function new_instance_from_db($props_n_values = array()) {
+		return new self($props_n_values, TRUE);
 	}
 }
\ No newline at end of file

core/db_classes/EE_Soft_Delete_Base_Class.class.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -33,7 +33,7 @@ 
 	 * @return boolean success
 	 */
 	public function delete() {
-		return $this->delete_or_restore( TRUE );
+		return $this->delete_or_restore(TRUE);
 	}
 
 
@@ -43,7 +43,7 @@ 
 	 * @return boolean success
 	 */
 	public function delete_permanently() {
-		return $this->get_model()->delete_permanently_by_ID( $this->ID() );
+		return $this->get_model()->delete_permanently_by_ID($this->ID());
 	}
 
 
@@ -53,9 +53,9 @@ 
 	 * @param bool $delete true=>delete, false=>restore
 	 * @return bool
 	 */
-	public function delete_or_restore( $delete = TRUE ) {
+	public function delete_or_restore($delete = TRUE) {
 		$model = $this->get_model();
-		return $model->delete_or_restore_by_ID( $delete, $this->ID() );
+		return $model->delete_or_restore_by_ID($delete, $this->ID());
 	}
 
 
@@ -65,6 +65,6 @@ 
 	 * @return boolean
 	 */
 	public function restore() {
-		return $this->delete_or_restore( FALSE );
+		return $this->delete_or_restore(FALSE);
 	}
 }
\ No newline at end of file

Indentation +12 added lines, -12 removed lines

@@ -2,18 +2,18 @@
 	exit( 'No direct script access allowed' );
 }
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for WordPress
- *
- * @ package 		Event Espresso
- * @ author 		Event Espresso
- * @ copyright 	(c) 2008-2011 Event Espresso  All Rights Reserved.
- * @ license 		{@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
- * @ link 				{@link http://www.eventespresso.com}
- * @ since 			4.0
- *
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for WordPress
+	 *
+	 * @ package 		Event Espresso
+	 * @ author 		Event Espresso
+	 * @ copyright 	(c) 2008-2011 Event Espresso  All Rights Reserved.
+	 * @ license 		{@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
+	 * @ link 				{@link http://www.eventespresso.com}
+	 * @ since 			4.0
+	 *
+	 */