eventespresso / event-espresso-core

core/services/orm/tree_traversal/BaseNode.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
      */
     public function visit($model_objects_to_identify)
     {
-        if (! $this->isDiscovered()) {
+        if ( ! $this->isDiscovered()) {
             $this->discover();
         }
         if ($this->isComplete()) {

Doc Comments +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
     /**
      * Make sure we encode whether its complete or not, but don't use such a long name.
      * @since $VID:$
-     * @return array
+     * @return string[]
      */
     public function __sleep()
     {

Indentation +88 added lines, -88 removed lines

@@ -31,105 +31,105 @@
  */
 abstract class BaseNode
 {
-    /**
-     * @var boolean
-     */
-    protected $complete;
+	/**
+	 * @var boolean
+	 */
+	protected $complete;
 
 
-    /**
-     * @var array of model names we don't want to traverse
-     */
-    protected $dont_traverse_models;
+	/**
+	 * @var array of model names we don't want to traverse
+	 */
+	protected $dont_traverse_models;
 
-    /**
-     * Whether this item has already been initialized
-     */
-    abstract protected function isDiscovered();
+	/**
+	 * Whether this item has already been initialized
+	 */
+	abstract protected function isDiscovered();
 
-    /**
-     * Determines if the work is done yet or not. Requires you to have first discovered what work exists by calling
-     * discover().
-     * @since $VID:$
-     * @return boolean
-     */
-    abstract public function isComplete();
+	/**
+	 * Determines if the work is done yet or not. Requires you to have first discovered what work exists by calling
+	 * discover().
+	 * @since $VID:$
+	 * @return boolean
+	 */
+	abstract public function isComplete();
 
-    /**
-     * Discovers what work needs to be done to complete traversing this node and its children.
-     * Note that this is separate from the constructor, so we can create child nodes without
-     * discovering them immediately.
-     * @since $VID:$
-     * @return mixed
-     */
-    abstract protected function discover();
+	/**
+	 * Discovers what work needs to be done to complete traversing this node and its children.
+	 * Note that this is separate from the constructor, so we can create child nodes without
+	 * discovering them immediately.
+	 * @since $VID:$
+	 * @return mixed
+	 */
+	abstract protected function discover();
 
-    /**
-     * Identifies model objects, up to the limit $model_objects_to_identify.
-     * @since $VID:$
-     * @param int $model_objects_to_identify
-     * @return int units of work done
-     */
-    abstract protected function work($model_objects_to_identify);
+	/**
+	 * Identifies model objects, up to the limit $model_objects_to_identify.
+	 * @since $VID:$
+	 * @param int $model_objects_to_identify
+	 * @return int units of work done
+	 */
+	abstract protected function work($model_objects_to_identify);
 
-    /**
-     * Shows the entity/relation node as an array.
-     * @since $VID:$
-     * @return array
-     */
-    abstract public function toArray();
+	/**
+	 * Shows the entity/relation node as an array.
+	 * @since $VID:$
+	 * @return array
+	 */
+	abstract public function toArray();
 
-    /**
-     * Discovers how much work there is to do, double-checks the work isn't already finished, and then does the work.
-     * Note: do not call when site is in maintenance mode level 2.
-     *
-     * @since $VID:$
-     * @param $model_objects_to_identify
-     * @return int number of model objects we want to identify during this call. On subsequent calls we'll continue
-     * where we left off.
-     */
-    public function visit($model_objects_to_identify)
-    {
-        if (! $this->isDiscovered()) {
-            $this->discover();
-        }
-        if ($this->isComplete()) {
-            return 0;
-        }
-        return $this->work($model_objects_to_identify);
-    }
+	/**
+	 * Discovers how much work there is to do, double-checks the work isn't already finished, and then does the work.
+	 * Note: do not call when site is in maintenance mode level 2.
+	 *
+	 * @since $VID:$
+	 * @param $model_objects_to_identify
+	 * @return int number of model objects we want to identify during this call. On subsequent calls we'll continue
+	 * where we left off.
+	 */
+	public function visit($model_objects_to_identify)
+	{
+		if (! $this->isDiscovered()) {
+			$this->discover();
+		}
+		if ($this->isComplete()) {
+			return 0;
+		}
+		return $this->work($model_objects_to_identify);
+	}
 
-    /**
-     * Gets the IDs of completely identified model objects that can be deleted.
-     * @since $VID:$
-     * @return mixed
-     */
-    abstract public function getIds();
+	/**
+	 * Gets the IDs of completely identified model objects that can be deleted.
+	 * @since $VID:$
+	 * @return mixed
+	 */
+	abstract public function getIds();
 
-    /**
-     * Make sure we encode whether its complete or not, but don't use such a long name.
-     * @since $VID:$
-     * @return array
-     */
-    public function __sleep()
-    {
-        $this->c = $this->complete;
-        $this->dtm = $this->dont_traverse_models;
-        return [
-            'c',
-            'dtm'
-        ];
-    }
+	/**
+	 * Make sure we encode whether its complete or not, but don't use such a long name.
+	 * @since $VID:$
+	 * @return array
+	 */
+	public function __sleep()
+	{
+		$this->c = $this->complete;
+		$this->dtm = $this->dont_traverse_models;
+		return [
+			'c',
+			'dtm'
+		];
+	}
 
-    /**
-     * Use the dynamic property to set the "complete" property.
-     * @since $VID:$
-     */
-    public function __wakeup()
-    {
-        $this->complete = $this->c;
-        $this->dont_traverse_models = $this->dtm;
-    }
+	/**
+	 * Use the dynamic property to set the "complete" property.
+	 * @since $VID:$
+	 */
+	public function __wakeup()
+	{
+		$this->complete = $this->c;
+		$this->dont_traverse_models = $this->dtm;
+	}
 }
 // End of file BaseNode.php
 // Location: EventEspresso\core\services\orm\tree_traversal/BaseNode.php

core/services/orm/tree_traversal/RelationNode.php

Doc Comments +1 added lines, -1 removed lines

@@ -130,7 +130,7 @@
      * Visits the provided nodes and keeps track of how much work was done, making sure to not go over budget.
      * @since $VID:$
      * @param ModelObjNode[] $model_obj_nodes
-     * @param $work_budget
+     * @param integer $work_budget
      * @return int
      */
     protected function visitAlreadyDiscoveredNodes($model_obj_nodes, $work_budget)

Unused Use Statements -3 removed lines

@@ -2,15 +2,12 @@
 
 namespace EventEspresso\core\services\orm\tree_traversal;
 
-use EE_Base_Class;
 use EE_Error;
 use EE_Has_Many_Any_Relation;
-use EE_Model_Relation_Base;
 use EE_Registry;
 use EEM_Base;
 use EventEspresso\core\exceptions\InvalidDataTypeException;
 use EventEspresso\core\exceptions\InvalidInterfaceException;
-use EventEspresso\core\services\payment_methods\forms\PayPalSettingsForm;
 use InvalidArgumentException;
 use ReflectionException;
 

Spacing +7 added lines, -7 removed lines

@@ -93,8 +93,8 @@ 
             // Add entity nodes for each of the model objects we fetched.
             foreach ($related_model_objs as $related_model_obj) {
                 $entity_node = new ModelObjNode($related_model_obj->ID(), $related_model_obj->get_model(), $this->dont_traverse_models);
-                $this->nodes[ $related_model_obj->ID() ] = $entity_node;
-                $new_item_nodes[ $related_model_obj->ID() ] = $entity_node;
+                $this->nodes[$related_model_obj->ID()] = $entity_node;
+                $new_item_nodes[$related_model_obj->ID()] = $entity_node;
             }
             $num_identified += count($new_item_nodes);
             if ($num_identified < $model_objects_to_identify) {
@@ -120,7 +120,7 @@ 
     protected function allChildrenComplete()
     {
         foreach ($this->nodes as $model_obj_node) {
-            if (! $model_obj_node->isComplete()) {
+            if ( ! $model_obj_node->isComplete()) {
                 return false;
             }
         }
@@ -137,7 +137,7 @@ 
     protected function visitAlreadyDiscoveredNodes($model_obj_nodes, $work_budget)
     {
         $work_done = 0;
-        if (! $model_obj_nodes) {
+        if ( ! $model_obj_nodes) {
             return 0;
         }
         foreach ($model_obj_nodes as $model_obj_node) {
@@ -199,7 +199,7 @@ 
      */
     protected function whereQueryParams()
     {
-        $where_params =  [
+        $where_params = [
             $this->related_model->get_foreign_key_to(
                 $this->main_model->get_this_model_name()
             )->get_name() => $this->id
@@ -212,7 +212,7 @@ 
             $relation_settings = null;
         }
         if ($relation_settings instanceof EE_Has_Many_Any_Relation) {
-            $where_params[ $this->related_model->get_field_containing_related_model_name()->get_name() ] = $this->main_model->get_this_model_name();
+            $where_params[$this->related_model->get_field_containing_related_model_name()->get_name()] = $this->main_model->get_this_model_name();
         }
         return $where_params;
     }
@@ -228,7 +228,7 @@ 
             'objs' => []
         ];
         foreach ($this->nodes as $id => $model_obj_node) {
-            $tree['objs'][ $id ] = $model_obj_node->toArray();
+            $tree['objs'][$id] = $model_obj_node->toArray();
         }
         return $tree;
     }

Indentation +264 added lines, -264 removed lines

@@ -28,289 +28,289 @@
 class RelationNode extends BaseNode
 {
 
-    /**
-     * @var string|int
-     */
-    protected $id;
+	/**
+	 * @var string|int
+	 */
+	protected $id;
 
-    /**
-     * @var EEM_Base
-     */
-    protected $main_model;
+	/**
+	 * @var EEM_Base
+	 */
+	protected $main_model;
 
-    /**
-     * @var int
-     */
-    protected $count;
+	/**
+	 * @var int
+	 */
+	protected $count;
 
-    /**
-     * @var EEM_Base
-     */
-    protected $related_model;
+	/**
+	 * @var EEM_Base
+	 */
+	protected $related_model;
 
-    /**
-     * @var ModelObjNode[]
-     */
-    protected $nodes;
+	/**
+	 * @var ModelObjNode[]
+	 */
+	protected $nodes;
 
-    /**
-     * RelationNode constructor.
-     * @param $main_model_obj_id
-     * @param EEM_Base $main_model
-     * @param EEM_Base $related_model
-     * @param array $dont_traverse_models array of model names we DON'T want to traverse
-     */
-    public function __construct(
-        $main_model_obj_id,
-        EEM_Base $main_model,
-        EEM_Base $related_model,
-        array $dont_traverse_models = []
-    ) {
-        $this->id = $main_model_obj_id;
-        $this->main_model = $main_model;
-        $this->related_model = $related_model;
-        $this->nodes = [];
-        $this->dont_traverse_models = $dont_traverse_models;
-    }
+	/**
+	 * RelationNode constructor.
+	 * @param $main_model_obj_id
+	 * @param EEM_Base $main_model
+	 * @param EEM_Base $related_model
+	 * @param array $dont_traverse_models array of model names we DON'T want to traverse
+	 */
+	public function __construct(
+		$main_model_obj_id,
+		EEM_Base $main_model,
+		EEM_Base $related_model,
+		array $dont_traverse_models = []
+	) {
+		$this->id = $main_model_obj_id;
+		$this->main_model = $main_model;
+		$this->related_model = $related_model;
+		$this->nodes = [];
+		$this->dont_traverse_models = $dont_traverse_models;
+	}
 
 
-    /**
-     * Here is where most of the work happens. We've counted how many related model objects exist, here we identify
-     * them (ie, learn their IDs). But its recursive, so we'll also find their related dependent model objects etc.
-     * @since $VID:$
-     * @param int $model_objects_to_identify
-     * @return int
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    protected function work($model_objects_to_identify)
-    {
-        $num_identified = $this->visitAlreadyDiscoveredNodes($this->nodes, $model_objects_to_identify);
-        if ($num_identified < $model_objects_to_identify) {
-            $related_model_objs = $this->related_model->get_all(
-                [
-                    $this->whereQueryParams(),
-                    'limit' => [
-                        count($this->nodes),
-                        $model_objects_to_identify - $num_identified
-                    ]
-                ]
-            );
-            $new_item_nodes = [];
+	/**
+	 * Here is where most of the work happens. We've counted how many related model objects exist, here we identify
+	 * them (ie, learn their IDs). But its recursive, so we'll also find their related dependent model objects etc.
+	 * @since $VID:$
+	 * @param int $model_objects_to_identify
+	 * @return int
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	protected function work($model_objects_to_identify)
+	{
+		$num_identified = $this->visitAlreadyDiscoveredNodes($this->nodes, $model_objects_to_identify);
+		if ($num_identified < $model_objects_to_identify) {
+			$related_model_objs = $this->related_model->get_all(
+				[
+					$this->whereQueryParams(),
+					'limit' => [
+						count($this->nodes),
+						$model_objects_to_identify - $num_identified
+					]
+				]
+			);
+			$new_item_nodes = [];
 
-            // Add entity nodes for each of the model objects we fetched.
-            foreach ($related_model_objs as $related_model_obj) {
-                $entity_node = new ModelObjNode($related_model_obj->ID(), $related_model_obj->get_model(), $this->dont_traverse_models);
-                $this->nodes[ $related_model_obj->ID() ] = $entity_node;
-                $new_item_nodes[ $related_model_obj->ID() ] = $entity_node;
-            }
-            $num_identified += count($new_item_nodes);
-            if ($num_identified < $model_objects_to_identify) {
-                // And lastly do the work.
-                $num_identified += $this->visitAlreadyDiscoveredNodes(
-                    $new_item_nodes,
-                    $model_objects_to_identify - $num_identified
-                );
-            }
-        }
+			// Add entity nodes for each of the model objects we fetched.
+			foreach ($related_model_objs as $related_model_obj) {
+				$entity_node = new ModelObjNode($related_model_obj->ID(), $related_model_obj->get_model(), $this->dont_traverse_models);
+				$this->nodes[ $related_model_obj->ID() ] = $entity_node;
+				$new_item_nodes[ $related_model_obj->ID() ] = $entity_node;
+			}
+			$num_identified += count($new_item_nodes);
+			if ($num_identified < $model_objects_to_identify) {
+				// And lastly do the work.
+				$num_identified += $this->visitAlreadyDiscoveredNodes(
+					$new_item_nodes,
+					$model_objects_to_identify - $num_identified
+				);
+			}
+		}
 
-        if (count($this->nodes) >= $this->count && $this->allChildrenComplete()) {
-            $this->complete = true;
-        }
-        return $num_identified;
-    }
+		if (count($this->nodes) >= $this->count && $this->allChildrenComplete()) {
+			$this->complete = true;
+		}
+		return $num_identified;
+	}
 
-    /**
-     * Checks if all the identified child nodes are complete or not.
-     * @since $VID:$
-     * @return bool
-     */
-    protected function allChildrenComplete()
-    {
-        foreach ($this->nodes as $model_obj_node) {
-            if (! $model_obj_node->isComplete()) {
-                return false;
-            }
-        }
-        return true;
-    }
+	/**
+	 * Checks if all the identified child nodes are complete or not.
+	 * @since $VID:$
+	 * @return bool
+	 */
+	protected function allChildrenComplete()
+	{
+		foreach ($this->nodes as $model_obj_node) {
+			if (! $model_obj_node->isComplete()) {
+				return false;
+			}
+		}
+		return true;
+	}
 
-    /**
-     * Visits the provided nodes and keeps track of how much work was done, making sure to not go over budget.
-     * @since $VID:$
-     * @param ModelObjNode[] $model_obj_nodes
-     * @param $work_budget
-     * @return int
-     */
-    protected function visitAlreadyDiscoveredNodes($model_obj_nodes, $work_budget)
-    {
-        $work_done = 0;
-        if (! $model_obj_nodes) {
-            return 0;
-        }
-        foreach ($model_obj_nodes as $model_obj_node) {
-            if ($work_done >= $work_budget) {
-                break;
-            }
-            $work_done += $model_obj_node->visit($work_budget - $work_done);
-        }
-        return $work_done;
-    }
+	/**
+	 * Visits the provided nodes and keeps track of how much work was done, making sure to not go over budget.
+	 * @since $VID:$
+	 * @param ModelObjNode[] $model_obj_nodes
+	 * @param $work_budget
+	 * @return int
+	 */
+	protected function visitAlreadyDiscoveredNodes($model_obj_nodes, $work_budget)
+	{
+		$work_done = 0;
+		if (! $model_obj_nodes) {
+			return 0;
+		}
+		foreach ($model_obj_nodes as $model_obj_node) {
+			if ($work_done >= $work_budget) {
+				break;
+			}
+			$work_done += $model_obj_node->visit($work_budget - $work_done);
+		}
+		return $work_done;
+	}
 
-    /**
-     * Whether this item has already been initialized
-     */
-    protected function isDiscovered()
-    {
-        return $this->count !== null;
-    }
+	/**
+	 * Whether this item has already been initialized
+	 */
+	protected function isDiscovered()
+	{
+		return $this->count !== null;
+	}
 
-    /**
-     * @since $VID:$
-     * @return boolean
-     */
-    public function isComplete()
-    {
-        if ($this->complete === null) {
-            if (count($this->nodes) === $this->count) {
-                $this->complete = true;
-            } else {
-                $this->complete = false;
-            }
-        }
-        return $this->complete;
-    }
+	/**
+	 * @since $VID:$
+	 * @return boolean
+	 */
+	public function isComplete()
+	{
+		if ($this->complete === null) {
+			if (count($this->nodes) === $this->count) {
+				$this->complete = true;
+			} else {
+				$this->complete = false;
+			}
+		}
+		return $this->complete;
+	}
 
-    /**
-     * Discovers how many related model objects exist.
-     * @since $VID:$
-     * @return mixed|void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    protected function discover()
-    {
-        $this->count = $this->related_model->count([$this->whereQueryParams()]);
-    }
+	/**
+	 * Discovers how many related model objects exist.
+	 * @since $VID:$
+	 * @return mixed|void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	protected function discover()
+	{
+		$this->count = $this->related_model->count([$this->whereQueryParams()]);
+	}
 
-    /**
-     * @since $VID:$
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     */
-    protected function whereQueryParams()
-    {
-        $where_params =  [
-            $this->related_model->get_foreign_key_to(
-                $this->main_model->get_this_model_name()
-            )->get_name() => $this->id
-        ];
-        try {
-            $relation_settings = $this->main_model->related_settings_for($this->related_model->get_this_model_name());
-        } catch (EE_Error $e) {
-            // This will happen for has-and-belongs-to-many relations, when this node's related model is that join table
-            // which hasn't been explicitly declared in the main model object's model's relations.
-            $relation_settings = null;
-        }
-        if ($relation_settings instanceof EE_Has_Many_Any_Relation) {
-            $where_params[ $this->related_model->get_field_containing_related_model_name()->get_name() ] = $this->main_model->get_this_model_name();
-        }
-        return $where_params;
-    }
-    /**
-     * @since $VID:$
-     * @return array
-     */
-    public function toArray()
-    {
-        $tree = [
-            'count' => $this->count,
-            'complete' => $this->isComplete(),
-            'objs' => []
-        ];
-        foreach ($this->nodes as $id => $model_obj_node) {
-            $tree['objs'][ $id ] = $model_obj_node->toArray();
-        }
-        return $tree;
-    }
+	/**
+	 * @since $VID:$
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 */
+	protected function whereQueryParams()
+	{
+		$where_params =  [
+			$this->related_model->get_foreign_key_to(
+				$this->main_model->get_this_model_name()
+			)->get_name() => $this->id
+		];
+		try {
+			$relation_settings = $this->main_model->related_settings_for($this->related_model->get_this_model_name());
+		} catch (EE_Error $e) {
+			// This will happen for has-and-belongs-to-many relations, when this node's related model is that join table
+			// which hasn't been explicitly declared in the main model object's model's relations.
+			$relation_settings = null;
+		}
+		if ($relation_settings instanceof EE_Has_Many_Any_Relation) {
+			$where_params[ $this->related_model->get_field_containing_related_model_name()->get_name() ] = $this->main_model->get_this_model_name();
+		}
+		return $where_params;
+	}
+	/**
+	 * @since $VID:$
+	 * @return array
+	 */
+	public function toArray()
+	{
+		$tree = [
+			'count' => $this->count,
+			'complete' => $this->isComplete(),
+			'objs' => []
+		];
+		foreach ($this->nodes as $id => $model_obj_node) {
+			$tree['objs'][ $id ] = $model_obj_node->toArray();
+		}
+		return $tree;
+	}
 
-    /**
-     * Gets the IDs of all the model objects to delete; indexed first by model object name.
-     * @since $VID:$
-     * @return array
-     */
-    public function getIds()
-    {
-        if (empty($this->nodes)) {
-            return [];
-        }
-        $ids = [
-            $this->related_model->get_this_model_name() => array_combine(
-                array_keys($this->nodes),
-                array_keys($this->nodes)
-            )
-        ];
-        foreach ($this->nodes as $model_obj_node) {
-            $ids = array_replace_recursive($ids, $model_obj_node->getIds());
-        }
-        return $ids;
-    }
+	/**
+	 * Gets the IDs of all the model objects to delete; indexed first by model object name.
+	 * @since $VID:$
+	 * @return array
+	 */
+	public function getIds()
+	{
+		if (empty($this->nodes)) {
+			return [];
+		}
+		$ids = [
+			$this->related_model->get_this_model_name() => array_combine(
+				array_keys($this->nodes),
+				array_keys($this->nodes)
+			)
+		];
+		foreach ($this->nodes as $model_obj_node) {
+			$ids = array_replace_recursive($ids, $model_obj_node->getIds());
+		}
+		return $ids;
+	}
 
-    /**
-     * Returns the number of sub-nodes found (ie, related model objects across this relation.)
-     * @since $VID:$
-     * @return int
-     */
-    public function countSubNodes()
-    {
-        return count($this->nodes);
-    }
+	/**
+	 * Returns the number of sub-nodes found (ie, related model objects across this relation.)
+	 * @since $VID:$
+	 * @return int
+	 */
+	public function countSubNodes()
+	{
+		return count($this->nodes);
+	}
 
-    /**
-     * Don't serialize the models. Just record their names on some dynamic properties.
-     * @since $VID:$
-     */
-    public function __sleep()
-    {
-        $this->m = $this->main_model->get_this_model_name();
-        $this->rm = $this->related_model->get_this_model_name();
-        return array_merge(
-            [
-                'm',
-                'rm',
-                'id',
-                'count',
-                'nodes',
-            ],
-            parent::__sleep()
-        );
-    }
+	/**
+	 * Don't serialize the models. Just record their names on some dynamic properties.
+	 * @since $VID:$
+	 */
+	public function __sleep()
+	{
+		$this->m = $this->main_model->get_this_model_name();
+		$this->rm = $this->related_model->get_this_model_name();
+		return array_merge(
+			[
+				'm',
+				'rm',
+				'id',
+				'count',
+				'nodes',
+			],
+			parent::__sleep()
+		);
+	}
 
-    /**
-     * Use the dynamic properties to instantiate the models we use.
-     * @since $VID:$
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function __wakeup()
-    {
-        $this->main_model = EE_Registry::instance()->load_model($this->m);
-        $this->related_model = EE_Registry::instance()->load_model($this->rm);
-        parent::__wakeup();
-    }
+	/**
+	 * Use the dynamic properties to instantiate the models we use.
+	 * @since $VID:$
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function __wakeup()
+	{
+		$this->main_model = EE_Registry::instance()->load_model($this->m);
+		$this->related_model = EE_Registry::instance()->load_model($this->rm);
+		parent::__wakeup();
+	}
 }
 // End of file RelationNode.php
 // Location: EventEspresso\core\services\orm\tree_traversal/RelationNode.php

core/libraries/batch/JobHandlers/ExecuteBatchDeletion.php

Unused Use Statements -8 removed lines

@@ -4,21 +4,13 @@
 
 use EE_Change_Log;
 use EE_Registry;
-use EEM_Event;
-use EEM_Price;
-use EEM_Ticket;
-use EventEspresso\core\exceptions\InvalidClassException;
-use EventEspresso\core\exceptions\InvalidDataTypeException;
-use EventEspresso\core\exceptions\InvalidInterfaceException;
 use EventEspresso\core\exceptions\UnexpectedEntityException;
-use EventEspresso\core\services\loaders\LoaderFactory;
 use EventEspresso\core\services\orm\tree_traversal\NodeGroupDao;
 use EventEspresso\core\services\orm\tree_traversal\ModelObjNode;
 use EventEspressoBatchRequest\Helpers\BatchRequestException;
 use EventEspressoBatchRequest\Helpers\JobParameters;
 use EventEspressoBatchRequest\Helpers\JobStepResponse;
 use EventEspressoBatchRequest\JobHandlerBaseClasses\JobHandler;
-use InvalidArgumentException;
 
 /**
  * Class EventDeletion

Indentation +148 added lines, -148 removed lines

@@ -32,158 +32,158 @@
  */
 class ExecuteBatchDeletion extends JobHandler
 {
-    /**
-     * @var NodeGroupDao
-     */
-    protected $model_obj_node_group_persister;
-    public function __construct(NodeGroupDao $model_obj_node_group_persister)
-    {
-        $this->model_obj_node_group_persister = $model_obj_node_group_persister;
-    }
+	/**
+	 * @var NodeGroupDao
+	 */
+	protected $model_obj_node_group_persister;
+	public function __construct(NodeGroupDao $model_obj_node_group_persister)
+	{
+		$this->model_obj_node_group_persister = $model_obj_node_group_persister;
+	}
 
 
-    // phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    /**
-     *
-     * @param JobParameters $job_parameters
-     * @throws BatchRequestException
-     * @return JobStepResponse
-     */
-    public function create_job(JobParameters $job_parameters)
-    {
-        $deletion_job_code = $job_parameters->request_datum('deletion_job_code', null);
-        $roots = $this->model_obj_node_group_persister->getModelObjNodesInGroup($deletion_job_code);
-        if ($roots === null) {
-            throw new UnexpectedEntityException($roots, 'array', esc_html__('The job seems to be stale. Please press the back button in your browser twice.', 'event_espresso'));
-        }
-        $models_and_ids_to_delete = [];
-        foreach ($roots as $root) {
-            if (! $root instanceof ModelObjNode) {
-                throw new UnexpectedEntityException($root, 'ModelObjNode');
-            }
-            $models_and_ids_to_delete = array_replace_recursive($models_and_ids_to_delete, $root->getIds());
-        }
-        $job_parameters->set_extra_data(
-            [
-                'models_and_ids_to_delete' => $models_and_ids_to_delete
-            ]
-        );
-        // Find the job's actual size.
-        $job_size = 0;
-        foreach ($models_and_ids_to_delete as $model_name => $ids) {
-            $job_size += count($ids);
-        }
-        $job_parameters->set_job_size($job_size);
-        return new JobStepResponse(
-            $job_parameters,
-            esc_html__('Beginning to delete items...', 'event_espresso')
-        );
-    }
+	// phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	/**
+	 *
+	 * @param JobParameters $job_parameters
+	 * @throws BatchRequestException
+	 * @return JobStepResponse
+	 */
+	public function create_job(JobParameters $job_parameters)
+	{
+		$deletion_job_code = $job_parameters->request_datum('deletion_job_code', null);
+		$roots = $this->model_obj_node_group_persister->getModelObjNodesInGroup($deletion_job_code);
+		if ($roots === null) {
+			throw new UnexpectedEntityException($roots, 'array', esc_html__('The job seems to be stale. Please press the back button in your browser twice.', 'event_espresso'));
+		}
+		$models_and_ids_to_delete = [];
+		foreach ($roots as $root) {
+			if (! $root instanceof ModelObjNode) {
+				throw new UnexpectedEntityException($root, 'ModelObjNode');
+			}
+			$models_and_ids_to_delete = array_replace_recursive($models_and_ids_to_delete, $root->getIds());
+		}
+		$job_parameters->set_extra_data(
+			[
+				'models_and_ids_to_delete' => $models_and_ids_to_delete
+			]
+		);
+		// Find the job's actual size.
+		$job_size = 0;
+		foreach ($models_and_ids_to_delete as $model_name => $ids) {
+			$job_size += count($ids);
+		}
+		$job_parameters->set_job_size($job_size);
+		return new JobStepResponse(
+			$job_parameters,
+			esc_html__('Beginning to delete items...', 'event_espresso')
+		);
+	}
 
-    /**
-     * Performs another step of the job
-     * @param JobParameters $job_parameters
-     * @param int $batch_size
-     * @return JobStepResponse
-     * @throws BatchRequestException
-     */
-    public function continue_job(JobParameters $job_parameters, $batch_size = 50)
-    {
-        // We already have the items IDs. So deleting is really fast. Let's speed it up.
-        $batch_size *= 10;
-        $units_processed = 0;
-        $models_and_ids_to_delete = $job_parameters->extra_datum('models_and_ids_to_delete', []);
-        // Build a new list of everything leftover after this request's of deletions.
-        $models_and_ids_remaining = [];
-        foreach ($models_and_ids_to_delete as $model_name => $ids_to_delete) {
-            if ($units_processed < $batch_size) {
-                $model = EE_Registry::instance()->load_model($model_name);
-                $ids_to_delete_this_query = array_slice($ids_to_delete, 0, $batch_size - $units_processed, true);
-                if ($model->has_primary_key_field()) {
-                    $where_conditions = [
-                        $model->primary_key_name() => [
-                            'IN',
-                            $ids_to_delete_this_query
-                        ]
-                    ];
-                } else {
-                    $where_conditions = [
-                        'OR' => []
-                    ];
-                    foreach ($ids_to_delete_this_query as $index_primary_key_string) {
-                        $keys_n_values = $model->parse_index_primary_key_string($index_primary_key_string);
-                        $where_conditions['OR'][ 'AND*' . $index_primary_key_string ] = $keys_n_values;
-                    }
-                }
-                // Deleting time!
-                // The model's deletion method reports every ROW deleted, and in the case of CPT models that will be
-                // two rows deleted for event CPT item. So don't rely on it for the count of items deleted.
-                $model->delete_permanently(
-                    [
-                        $where_conditions
-                    ],
-                    false
-                );
-                $units_processed += count($ids_to_delete_this_query);
-                $remaining_ids = array_diff_key($ids_to_delete, $ids_to_delete_this_query);
-                // If there's any more from this model, we'll do them next time.
-                if (count($remaining_ids) > 0) {
-                    $models_and_ids_remaining[ $model_name ] = $remaining_ids;
-                }
-            } else {
-                $models_and_ids_remaining[ $model_name ] = $models_and_ids_to_delete[ $model_name ];
-            }
-        }
-        $job_parameters->mark_processed($units_processed);
-        // All done deleting for this request. Is there anything to do next time?
-        if (empty($models_and_ids_remaining)) {
-            $job_parameters->set_status(JobParameters::status_complete);
-            return new JobStepResponse(
-                $job_parameters,
-                esc_html__('Deletion complete.', 'event_espresso')
-            );
-        }
-        $job_parameters->add_extra_data('models_and_ids_to_delete', $models_and_ids_remaining);
-        return new JobStepResponse(
-            $job_parameters,
-            sprintf(
-                esc_html__('Deleted %d items.', 'event_espresso'),
-                $units_processed
-            )
-        );
-    }
+	/**
+	 * Performs another step of the job
+	 * @param JobParameters $job_parameters
+	 * @param int $batch_size
+	 * @return JobStepResponse
+	 * @throws BatchRequestException
+	 */
+	public function continue_job(JobParameters $job_parameters, $batch_size = 50)
+	{
+		// We already have the items IDs. So deleting is really fast. Let's speed it up.
+		$batch_size *= 10;
+		$units_processed = 0;
+		$models_and_ids_to_delete = $job_parameters->extra_datum('models_and_ids_to_delete', []);
+		// Build a new list of everything leftover after this request's of deletions.
+		$models_and_ids_remaining = [];
+		foreach ($models_and_ids_to_delete as $model_name => $ids_to_delete) {
+			if ($units_processed < $batch_size) {
+				$model = EE_Registry::instance()->load_model($model_name);
+				$ids_to_delete_this_query = array_slice($ids_to_delete, 0, $batch_size - $units_processed, true);
+				if ($model->has_primary_key_field()) {
+					$where_conditions = [
+						$model->primary_key_name() => [
+							'IN',
+							$ids_to_delete_this_query
+						]
+					];
+				} else {
+					$where_conditions = [
+						'OR' => []
+					];
+					foreach ($ids_to_delete_this_query as $index_primary_key_string) {
+						$keys_n_values = $model->parse_index_primary_key_string($index_primary_key_string);
+						$where_conditions['OR'][ 'AND*' . $index_primary_key_string ] = $keys_n_values;
+					}
+				}
+				// Deleting time!
+				// The model's deletion method reports every ROW deleted, and in the case of CPT models that will be
+				// two rows deleted for event CPT item. So don't rely on it for the count of items deleted.
+				$model->delete_permanently(
+					[
+						$where_conditions
+					],
+					false
+				);
+				$units_processed += count($ids_to_delete_this_query);
+				$remaining_ids = array_diff_key($ids_to_delete, $ids_to_delete_this_query);
+				// If there's any more from this model, we'll do them next time.
+				if (count($remaining_ids) > 0) {
+					$models_and_ids_remaining[ $model_name ] = $remaining_ids;
+				}
+			} else {
+				$models_and_ids_remaining[ $model_name ] = $models_and_ids_to_delete[ $model_name ];
+			}
+		}
+		$job_parameters->mark_processed($units_processed);
+		// All done deleting for this request. Is there anything to do next time?
+		if (empty($models_and_ids_remaining)) {
+			$job_parameters->set_status(JobParameters::status_complete);
+			return new JobStepResponse(
+				$job_parameters,
+				esc_html__('Deletion complete.', 'event_espresso')
+			);
+		}
+		$job_parameters->add_extra_data('models_and_ids_to_delete', $models_and_ids_remaining);
+		return new JobStepResponse(
+			$job_parameters,
+			sprintf(
+				esc_html__('Deleted %d items.', 'event_espresso'),
+				$units_processed
+			)
+		);
+	}
 
-    /**
-     * Performs any clean-up logic when we know the job is completed
-     * @param JobParameters $job_parameters
-     * @return JobStepResponse
-     */
-    public function cleanup_job(JobParameters $job_parameters)
-    {
-        $this->model_obj_node_group_persister->deleteModelObjNodesInGroup(
-            $job_parameters->request_datum('deletion_job_code')
-        );
-        // For backwards compatibility with how we used to delete events, make sure we still trigger the old action.
-        $models_and_ids_to_delete = $job_parameters->extra_datum('models_and_ids_to_delete', []);
-        foreach ($models_and_ids_to_delete['Event'] as $event_id) {
-            // Create a log entry so we know who and when this event was permanently deleted.
-            (EE_Change_Log::new_instance(
-                [
-                    'OBJ_ID' => $event_id,
-                    'OBJ_type' => 'Event',
-                    'LOG_message' => sprintf(
-                        esc_html__('Event %1$d permanently deleted using ExecuteBatchDeletion.', 'event_espresso'),
-                        $event_id
-                    )
-                ]
-            ))->save();
-            do_action('AHEE__Events_Admin_Page___permanently_delete_event__after_event_deleted', $event_id);
-        }
-        return new JobStepResponse(
-            $job_parameters,
-            esc_html__('All done', 'event_espresso')
-        );
-    }
+	/**
+	 * Performs any clean-up logic when we know the job is completed
+	 * @param JobParameters $job_parameters
+	 * @return JobStepResponse
+	 */
+	public function cleanup_job(JobParameters $job_parameters)
+	{
+		$this->model_obj_node_group_persister->deleteModelObjNodesInGroup(
+			$job_parameters->request_datum('deletion_job_code')
+		);
+		// For backwards compatibility with how we used to delete events, make sure we still trigger the old action.
+		$models_and_ids_to_delete = $job_parameters->extra_datum('models_and_ids_to_delete', []);
+		foreach ($models_and_ids_to_delete['Event'] as $event_id) {
+			// Create a log entry so we know who and when this event was permanently deleted.
+			(EE_Change_Log::new_instance(
+				[
+					'OBJ_ID' => $event_id,
+					'OBJ_type' => 'Event',
+					'LOG_message' => sprintf(
+						esc_html__('Event %1$d permanently deleted using ExecuteBatchDeletion.', 'event_espresso'),
+						$event_id
+					)
+				]
+			))->save();
+			do_action('AHEE__Events_Admin_Page___permanently_delete_event__after_event_deleted', $event_id);
+		}
+		return new JobStepResponse(
+			$job_parameters,
+			esc_html__('All done', 'event_espresso')
+		);
+	}
 }
 // End of file EventDeletion.php
 // Location: EventEspressoBatchRequest\JobHandlers/EventDeletion.php

Spacing +4 added lines, -4 removed lines

@@ -58,7 +58,7 @@ 
         }
         $models_and_ids_to_delete = [];
         foreach ($roots as $root) {
-            if (! $root instanceof ModelObjNode) {
+            if ( ! $root instanceof ModelObjNode) {
                 throw new UnexpectedEntityException($root, 'ModelObjNode');
             }
             $models_and_ids_to_delete = array_replace_recursive($models_and_ids_to_delete, $root->getIds());
@@ -112,7 +112,7 @@ 
                     ];
                     foreach ($ids_to_delete_this_query as $index_primary_key_string) {
                         $keys_n_values = $model->parse_index_primary_key_string($index_primary_key_string);
-                        $where_conditions['OR'][ 'AND*' . $index_primary_key_string ] = $keys_n_values;
+                        $where_conditions['OR']['AND*'.$index_primary_key_string] = $keys_n_values;
                     }
                 }
                 // Deleting time!
@@ -128,10 +128,10 @@ 
                 $remaining_ids = array_diff_key($ids_to_delete, $ids_to_delete_this_query);
                 // If there's any more from this model, we'll do them next time.
                 if (count($remaining_ids) > 0) {
-                    $models_and_ids_remaining[ $model_name ] = $remaining_ids;
+                    $models_and_ids_remaining[$model_name] = $remaining_ids;
                 }
             } else {
-                $models_and_ids_remaining[ $model_name ] = $models_and_ids_to_delete[ $model_name ];
+                $models_and_ids_remaining[$model_name] = $models_and_ids_to_delete[$model_name];
             }
         }
         $job_parameters->mark_processed($units_processed);

core/services/orm/tree_traversal/NodeGroupDao.php

Indentation +100 added lines, -100 removed lines

@@ -22,112 +22,112 @@
  */
 class NodeGroupDao
 {
-    /**
-     * @since $VID:$
-     * @return mixed|void
-     */
-    public function generateGroupCode()
-    {
-        return wp_generate_password(6, false);
-    }
+	/**
+	 * @since $VID:$
+	 * @return mixed|void
+	 */
+	public function generateGroupCode()
+	{
+		return wp_generate_password(6, false);
+	}
 
-    /**
-     * Gets the string we put in front of the WP Option name used to store the jobs.
-     * @since $VID:$
-     * @return string
-     */
-    private function getOptionPrefix()
-    {
-        return 'ee_deletion_';
-    }
+	/**
+	 * Gets the string we put in front of the WP Option name used to store the jobs.
+	 * @since $VID:$
+	 * @return string
+	 */
+	private function getOptionPrefix()
+	{
+		return 'ee_deletion_';
+	}
 
-    /**
-     * @since $VID:$
-     * @param $code
-     * @return ModelObjNode[]
-     * @throws UnexpectedEntityException
-     */
-    public function getModelObjNodesInGroup($code)
-    {
-        if (! $code) {
-            throw new Exception(esc_html__('We aren’t sure which job you are performing. Please press back in your browser and try again.', 'event_espresso'));
-        }
-        $deletion_data = get_option($this->getOptionPrefix() . $code, []);
-        foreach ($deletion_data as $root) {
-            if (! $root instanceof ModelObjNode) {
-                throw new UnexpectedEntityException($root, 'ModelObjNode');
-            }
-        }
-        return $deletion_data;
-    }
+	/**
+	 * @since $VID:$
+	 * @param $code
+	 * @return ModelObjNode[]
+	 * @throws UnexpectedEntityException
+	 */
+	public function getModelObjNodesInGroup($code)
+	{
+		if (! $code) {
+			throw new Exception(esc_html__('We aren’t sure which job you are performing. Please press back in your browser and try again.', 'event_espresso'));
+		}
+		$deletion_data = get_option($this->getOptionPrefix() . $code, []);
+		foreach ($deletion_data as $root) {
+			if (! $root instanceof ModelObjNode) {
+				throw new UnexpectedEntityException($root, 'ModelObjNode');
+			}
+		}
+		return $deletion_data;
+	}
 
-    /**
-     * Gets an array indicating what database rows are contained in the job.
-     * Each top-level key is a model name, and its value is an array of IDs.
-     * @since $VID:$
-     * @param ModelObjNode[] $model_obj_nodes
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     */
-    public function getModelsAndIdsContainedIn($model_obj_nodes)
-    {
-        $models_and_ids_to_delete = [];
-        foreach ($model_obj_nodes as $root) {
-            $models_and_ids_to_delete = array_replace_recursive($models_and_ids_to_delete, $root->getIds());
-        }
-        return $models_and_ids_to_delete;
-    }
+	/**
+	 * Gets an array indicating what database rows are contained in the job.
+	 * Each top-level key is a model name, and its value is an array of IDs.
+	 * @since $VID:$
+	 * @param ModelObjNode[] $model_obj_nodes
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 */
+	public function getModelsAndIdsContainedIn($model_obj_nodes)
+	{
+		$models_and_ids_to_delete = [];
+		foreach ($model_obj_nodes as $root) {
+			$models_and_ids_to_delete = array_replace_recursive($models_and_ids_to_delete, $root->getIds());
+		}
+		return $models_and_ids_to_delete;
+	}
 
-    /**
-     * Gets an array indicating what database rows are contained in the job.
-     * Each top-level key is a model name, and its value is an array of IDs.
-     * @since $VID:$
-     * @param string $code
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     * @throws UnexpectedEntityException
-     */
-    public function getModelsAndIdsFromGroup($code)
-    {
-        $model_obj_nodes = $this->getModelObjNodesInGroup($code);
-        return $this->getModelsAndIdsContainedIn($model_obj_nodes);
-    }
+	/**
+	 * Gets an array indicating what database rows are contained in the job.
+	 * Each top-level key is a model name, and its value is an array of IDs.
+	 * @since $VID:$
+	 * @param string $code
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 * @throws UnexpectedEntityException
+	 */
+	public function getModelsAndIdsFromGroup($code)
+	{
+		$model_obj_nodes = $this->getModelObjNodesInGroup($code);
+		return $this->getModelsAndIdsContainedIn($model_obj_nodes);
+	}
 
-    /**
-     * Persists the ModelObjNodes for future requests, using the code for reference.
-     * @since $VID:$
-     * @param ModelObjNode[] $model_obj_nodes
-     * @param string $code
-     * @return bool
-     */
-    public function persistModelObjNodesGroup($model_obj_nodes, $code)
-    {
-        return add_option(
-            $this->getOptionPrefix() . $code,
-            $model_obj_nodes,
-            null,
-            'no'
-        );
-    }
+	/**
+	 * Persists the ModelObjNodes for future requests, using the code for reference.
+	 * @since $VID:$
+	 * @param ModelObjNode[] $model_obj_nodes
+	 * @param string $code
+	 * @return bool
+	 */
+	public function persistModelObjNodesGroup($model_obj_nodes, $code)
+	{
+		return add_option(
+			$this->getOptionPrefix() . $code,
+			$model_obj_nodes,
+			null,
+			'no'
+		);
+	}
 
-    /**
-     * Forgets about the group of ModelObjNodes. Doesn't delete the rows in the database they reference though.
-     * @since $VID:$
-     * @param $code
-     * @return bool
-     */
-    public function deleteModelObjNodesInGroup($code)
-    {
-        return delete_option($this->getOptionPrefix() . $code);
-    }
+	/**
+	 * Forgets about the group of ModelObjNodes. Doesn't delete the rows in the database they reference though.
+	 * @since $VID:$
+	 * @param $code
+	 * @return bool
+	 */
+	public function deleteModelObjNodesInGroup($code)
+	{
+		return delete_option($this->getOptionPrefix() . $code);
+	}
 }
 // End of file NodeGroupDao.php
 // Location: EventEspresso\core\services\orm\tree_traversal/NodeGroupDao.php

Spacing +5 added lines, -5 removed lines

@@ -49,12 +49,12 @@ 
      */
     public function getModelObjNodesInGroup($code)
     {
-        if (! $code) {
+        if ( ! $code) {
             throw new Exception(esc_html__('We aren’t sure which job you are performing. Please press back in your browser and try again.', 'event_espresso'));
         }
-        $deletion_data = get_option($this->getOptionPrefix() . $code, []);
+        $deletion_data = get_option($this->getOptionPrefix().$code, []);
         foreach ($deletion_data as $root) {
-            if (! $root instanceof ModelObjNode) {
+            if ( ! $root instanceof ModelObjNode) {
                 throw new UnexpectedEntityException($root, 'ModelObjNode');
             }
         }
@@ -111,7 +111,7 @@ 
     public function persistModelObjNodesGroup($model_obj_nodes, $code)
     {
         return add_option(
-            $this->getOptionPrefix() . $code,
+            $this->getOptionPrefix().$code,
             $model_obj_nodes,
             null,
             'no'
@@ -126,7 +126,7 @@ 
      */
     public function deleteModelObjNodesInGroup($code)
     {
-        return delete_option($this->getOptionPrefix() . $code);
+        return delete_option($this->getOptionPrefix().$code);
     }
 }
 // End of file NodeGroupDao.php

core/domain/services/admin/events/data/ConfirmDeletion.php

Indentation +76 added lines, -76 removed lines

@@ -30,86 +30,86 @@
  */
 class ConfirmDeletion
 {
-    /**
-     * @var NodeGroupDao
-     */
-    private $dao;
+	/**
+	 * @var NodeGroupDao
+	 */
+	private $dao;
 
-    /**
-     * ConfirmDeletion constructor.
-     * @param NodeGroupDao $dao
-     */
-    public function __construct(
-        NodeGroupDao $dao
-    ) {
+	/**
+	 * ConfirmDeletion constructor.
+	 * @param NodeGroupDao $dao
+	 */
+	public function __construct(
+		NodeGroupDao $dao
+	) {
 
-        $this->dao = $dao;
-    }
+		$this->dao = $dao;
+	}
 
-    /**
-     * Redirects to the batch job for deleting events if the form submission is valid, otherwise back to the deletion
-     * preview page.
-     * @since $VID:$
-     * @param $request_data
-     * @param $admin_base_url
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     * @throws UnexpectedEntityException
-     */
-    public function handle($request_data, $admin_base_url)
-    {
-        $deletion_job_code = isset($request_data['deletion_job_code']) ? sanitize_key($request_data['deletion_job_code']) : '';
-        $models_and_ids_to_delete = $this->dao->getModelsAndIdsFromGroup($deletion_job_code);
-        $form = new ConfirmEventDeletionForm($models_and_ids_to_delete['Event']);
-        // Initialize the form from the request, and check if its valid.
-        $form->receive_form_submission($request_data);
-        if ($form->is_valid()) {
-            // Redirect the user to the deletion batch job.
-            EEH_URL::safeRedirectAndExit(
-                EE_Admin_Page::add_query_args_and_nonce(
-                    array(
-                        'page' => 'espresso_batch',
-                        'batch' => EED_Batch::batch_job,
-                        'deletion_job_code' => $deletion_job_code,
-                        'job_handler' => urlencode('EventEspressoBatchRequest\JobHandlers\ExecuteBatchDeletion'),
-                        'return_url' => urlencode(
-                            add_query_arg(
-                                [
-                                    'status' => 'trash'
-                                ],
-                                EVENTS_ADMIN_URL
-                            )
-                        )
-                    ),
-                    admin_url()
-                )
-            );
-        }
-        // Dont' use $form->submission_error_message() because it adds the form input's label in front
-        // of each validation error which ends up looking quite confusing.
-        $validation_errors = $form->get_validation_errors_accumulated();
-        foreach ($validation_errors as $validation_error) {
-            EE_Error::add_error(
-                $validation_error->getMessage(),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-        }
+	/**
+	 * Redirects to the batch job for deleting events if the form submission is valid, otherwise back to the deletion
+	 * preview page.
+	 * @since $VID:$
+	 * @param $request_data
+	 * @param $admin_base_url
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 * @throws UnexpectedEntityException
+	 */
+	public function handle($request_data, $admin_base_url)
+	{
+		$deletion_job_code = isset($request_data['deletion_job_code']) ? sanitize_key($request_data['deletion_job_code']) : '';
+		$models_and_ids_to_delete = $this->dao->getModelsAndIdsFromGroup($deletion_job_code);
+		$form = new ConfirmEventDeletionForm($models_and_ids_to_delete['Event']);
+		// Initialize the form from the request, and check if its valid.
+		$form->receive_form_submission($request_data);
+		if ($form->is_valid()) {
+			// Redirect the user to the deletion batch job.
+			EEH_URL::safeRedirectAndExit(
+				EE_Admin_Page::add_query_args_and_nonce(
+					array(
+						'page' => 'espresso_batch',
+						'batch' => EED_Batch::batch_job,
+						'deletion_job_code' => $deletion_job_code,
+						'job_handler' => urlencode('EventEspressoBatchRequest\JobHandlers\ExecuteBatchDeletion'),
+						'return_url' => urlencode(
+							add_query_arg(
+								[
+									'status' => 'trash'
+								],
+								EVENTS_ADMIN_URL
+							)
+						)
+					),
+					admin_url()
+				)
+			);
+		}
+		// Dont' use $form->submission_error_message() because it adds the form input's label in front
+		// of each validation error which ends up looking quite confusing.
+		$validation_errors = $form->get_validation_errors_accumulated();
+		foreach ($validation_errors as $validation_error) {
+			EE_Error::add_error(
+				$validation_error->getMessage(),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+		}
 
-        EEH_URL::safeRedirectAndExit(
-            EE_Admin_Page::add_query_args_and_nonce(
-                [
-                    'action' => 'preview_deletion',
-                    'deletion_job_code' => $deletion_job_code
-                ],
-                $admin_base_url
-            )
-        );
-    }
+		EEH_URL::safeRedirectAndExit(
+			EE_Admin_Page::add_query_args_and_nonce(
+				[
+					'action' => 'preview_deletion',
+					'deletion_job_code' => $deletion_job_code
+				],
+				$admin_base_url
+			)
+		);
+	}
 }
 // End of file ConfirmDeletion.php
 // Location: EventEspresso\core\domain\services\admin\events\data/ConfirmDeletion.php

core/domain/services/admin/events/data/PreviewDeletion.php

Indentation +116 added lines, -116 removed lines

@@ -31,127 +31,127 @@
  */
 class PreviewDeletion
 {
-    /**
-     * @var NodeGroupDao
-     */
-    protected $dao;
+	/**
+	 * @var NodeGroupDao
+	 */
+	protected $dao;
 
-    /**
-     * @var EEM_Event
-     */
-    protected $event_model;
+	/**
+	 * @var EEM_Event
+	 */
+	protected $event_model;
 
-    /**
-     * @var EEM_Datetime
-     */
-    protected $datetime_model;
+	/**
+	 * @var EEM_Datetime
+	 */
+	protected $datetime_model;
 
-    /**
-     * @var EEM_Registration
-     */
-    protected $registration_model;
+	/**
+	 * @var EEM_Registration
+	 */
+	protected $registration_model;
 
-    /**
-     * PreviewDeletion constructor.
-     * @param NodeGroupDao $dao
-     * @param EEM_Event $event_model
-     * @param EEM_Datetime $datetime_model
-     * @param EEM_Registration $registration_model
-     */
-    public function __construct(
-        NodeGroupDao $dao,
-        EEM_Event $event_model,
-        EEM_Datetime $datetime_model,
-        EEM_Registration $registration_model
-    ) {
-        $this->dao = $dao;
-        $this->event_model = $event_model;
-        $this->datetime_model = $datetime_model;
-        $this->registration_model = $registration_model;
-    }
+	/**
+	 * PreviewDeletion constructor.
+	 * @param NodeGroupDao $dao
+	 * @param EEM_Event $event_model
+	 * @param EEM_Datetime $datetime_model
+	 * @param EEM_Registration $registration_model
+	 */
+	public function __construct(
+		NodeGroupDao $dao,
+		EEM_Event $event_model,
+		EEM_Datetime $datetime_model,
+		EEM_Registration $registration_model
+	) {
+		$this->dao = $dao;
+		$this->event_model = $event_model;
+		$this->datetime_model = $datetime_model;
+		$this->registration_model = $registration_model;
+	}
 
-    /**
-     * Renders the preview deletion page.
-     * @since $VID:$
-     * @param $request_data
-     * @param $admin_base_url
-     * @return array
-     * @throws UnexpectedEntityException
-     * @throws DomainException
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     */
-    public function handle($request_data, $admin_base_url)
-    {
-        $deletion_job_code = isset($request_data['deletion_job_code']) ? sanitize_key($request_data['deletion_job_code']) : '';
-        $models_and_ids_to_delete = $this->dao->getModelsAndIdsFromGroup($deletion_job_code);
-        $event_ids = isset($models_and_ids_to_delete['Event']) ? $models_and_ids_to_delete['Event'] : array();
-        if (empty($event_ids) || !is_array($event_ids)) {
-            throw new EE_Error(
-                esc_html__('No Events were found to delete.', 'event_espresso')
-            );
-        }
-        $datetime_ids = isset($models_and_ids_to_delete['Datetime']) ? $models_and_ids_to_delete['Datetime'] : array();
-        if (!is_array($datetime_ids)) {
-            throw new UnexpectedEntityException($datetime_ids, 'array');
-        }
-        $registration_ids = isset($models_and_ids_to_delete['Registration']) ? $models_and_ids_to_delete['Registration'] : array();
-        if (!is_array($registration_ids)) {
-            throw new UnexpectedEntityException($registration_ids, 'array');
-        }
-        $num_registrations_to_show = 10;
-        $reg_count = count($registration_ids);
-        if ($reg_count > $num_registrations_to_show) {
-            $registration_ids = array_slice($registration_ids, 0, $num_registrations_to_show);
-        }
-        $form = new ConfirmEventDeletionForm($event_ids);
-        $events = $this->event_model->get_all_deleted_and_undeleted(
-            [
-                [
-                    'EVT_ID' => ['IN', $event_ids]
-                ]
-            ]
-        );
-        $datetimes = $this->datetime_model->get_all_deleted_and_undeleted(
-            [
-                [
-                    'DTT_ID' => ['IN', $datetime_ids]
-                ]
-            ]
-        );
-        $registrations = $this->registration_model->get_all_deleted_and_undeleted(
-            [
-                [
-                    'REG_ID' => ['IN', $registration_ids]
-                ]
-            ]
-        );
-        $confirm_deletion_args = [
-            'action' => 'confirm_deletion',
-            'deletion_job_code' => $deletion_job_code
-        ];
-        return [
-            'admin_page_content' => EEH_Template::display_template(
-                EVENTS_TEMPLATE_PATH . 'event_preview_deletion.template.php',
-                [
-                    'form_url' => EE_Admin_Page::add_query_args_and_nonce(
-                        $confirm_deletion_args,
-                        $admin_base_url
-                    ),
-                    'form' => $form,
-                    'events' => $events,
-                    'datetimes' => $datetimes,
-                    'registrations' => $registrations,
-                    'reg_count' => $reg_count,
-                    'num_registrations_to_show' => $num_registrations_to_show
-                ],
-                true
-            )
-        ];
-    }
+	/**
+	 * Renders the preview deletion page.
+	 * @since $VID:$
+	 * @param $request_data
+	 * @param $admin_base_url
+	 * @return array
+	 * @throws UnexpectedEntityException
+	 * @throws DomainException
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 */
+	public function handle($request_data, $admin_base_url)
+	{
+		$deletion_job_code = isset($request_data['deletion_job_code']) ? sanitize_key($request_data['deletion_job_code']) : '';
+		$models_and_ids_to_delete = $this->dao->getModelsAndIdsFromGroup($deletion_job_code);
+		$event_ids = isset($models_and_ids_to_delete['Event']) ? $models_and_ids_to_delete['Event'] : array();
+		if (empty($event_ids) || !is_array($event_ids)) {
+			throw new EE_Error(
+				esc_html__('No Events were found to delete.', 'event_espresso')
+			);
+		}
+		$datetime_ids = isset($models_and_ids_to_delete['Datetime']) ? $models_and_ids_to_delete['Datetime'] : array();
+		if (!is_array($datetime_ids)) {
+			throw new UnexpectedEntityException($datetime_ids, 'array');
+		}
+		$registration_ids = isset($models_and_ids_to_delete['Registration']) ? $models_and_ids_to_delete['Registration'] : array();
+		if (!is_array($registration_ids)) {
+			throw new UnexpectedEntityException($registration_ids, 'array');
+		}
+		$num_registrations_to_show = 10;
+		$reg_count = count($registration_ids);
+		if ($reg_count > $num_registrations_to_show) {
+			$registration_ids = array_slice($registration_ids, 0, $num_registrations_to_show);
+		}
+		$form = new ConfirmEventDeletionForm($event_ids);
+		$events = $this->event_model->get_all_deleted_and_undeleted(
+			[
+				[
+					'EVT_ID' => ['IN', $event_ids]
+				]
+			]
+		);
+		$datetimes = $this->datetime_model->get_all_deleted_and_undeleted(
+			[
+				[
+					'DTT_ID' => ['IN', $datetime_ids]
+				]
+			]
+		);
+		$registrations = $this->registration_model->get_all_deleted_and_undeleted(
+			[
+				[
+					'REG_ID' => ['IN', $registration_ids]
+				]
+			]
+		);
+		$confirm_deletion_args = [
+			'action' => 'confirm_deletion',
+			'deletion_job_code' => $deletion_job_code
+		];
+		return [
+			'admin_page_content' => EEH_Template::display_template(
+				EVENTS_TEMPLATE_PATH . 'event_preview_deletion.template.php',
+				[
+					'form_url' => EE_Admin_Page::add_query_args_and_nonce(
+						$confirm_deletion_args,
+						$admin_base_url
+					),
+					'form' => $form,
+					'events' => $events,
+					'datetimes' => $datetimes,
+					'registrations' => $registrations,
+					'reg_count' => $reg_count,
+					'num_registrations_to_show' => $num_registrations_to_show
+				],
+				true
+			)
+		];
+	}
 }
 // End of file PreviewDeletion.php
 // Location: EventEspresso\core\domain\services\admin\events\data/PreviewDeletion.php

Spacing +4 added lines, -4 removed lines

@@ -89,17 +89,17 @@ 
         $deletion_job_code = isset($request_data['deletion_job_code']) ? sanitize_key($request_data['deletion_job_code']) : '';
         $models_and_ids_to_delete = $this->dao->getModelsAndIdsFromGroup($deletion_job_code);
         $event_ids = isset($models_and_ids_to_delete['Event']) ? $models_and_ids_to_delete['Event'] : array();
-        if (empty($event_ids) || !is_array($event_ids)) {
+        if (empty($event_ids) || ! is_array($event_ids)) {
             throw new EE_Error(
                 esc_html__('No Events were found to delete.', 'event_espresso')
             );
         }
         $datetime_ids = isset($models_and_ids_to_delete['Datetime']) ? $models_and_ids_to_delete['Datetime'] : array();
-        if (!is_array($datetime_ids)) {
+        if ( ! is_array($datetime_ids)) {
             throw new UnexpectedEntityException($datetime_ids, 'array');
         }
         $registration_ids = isset($models_and_ids_to_delete['Registration']) ? $models_and_ids_to_delete['Registration'] : array();
-        if (!is_array($registration_ids)) {
+        if ( ! is_array($registration_ids)) {
             throw new UnexpectedEntityException($registration_ids, 'array');
         }
         $num_registrations_to_show = 10;
@@ -135,7 +135,7 @@ 
         ];
         return [
             'admin_page_content' => EEH_Template::display_template(
-                EVENTS_TEMPLATE_PATH . 'event_preview_deletion.template.php',
+                EVENTS_TEMPLATE_PATH.'event_preview_deletion.template.php',
                 [
                     'form_url' => EE_Admin_Page::add_query_args_and_nonce(
                         $confirm_deletion_args,

core/libraries/batch/JobHandlers/PreviewEventDeletion.php

Spacing +1 added lines, -1 removed lines

@@ -199,7 +199,7 @@
             if ($units_processed >= $batch_size) {
                 break;
             }
-            if (!$root_node instanceof ModelObjNode) {
+            if ( ! $root_node instanceof ModelObjNode) {
                 throw new InvalidClassException('ModelObjNode');
             }
             if ($root_node->isComplete()) {

Indentation +214 added lines, -214 removed lines

@@ -36,149 +36,149 @@ 
 class PreviewEventDeletion extends JobHandler
 {
 
-    /**
-     * @var NodeGroupDao
-     */
-    protected $model_obj_node_group_persister;
+	/**
+	 * @var NodeGroupDao
+	 */
+	protected $model_obj_node_group_persister;
 
-    public function __construct(NodeGroupDao $model_obj_node_group_persister)
-    {
-        $this->model_obj_node_group_persister = $model_obj_node_group_persister;
-    }
+	public function __construct(NodeGroupDao $model_obj_node_group_persister)
+	{
+		$this->model_obj_node_group_persister = $model_obj_node_group_persister;
+	}
 
-    // phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	// phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
 
-    /**
-     *
-     * @param JobParameters $job_parameters
-     * @return JobStepResponse
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     */
-    public function create_job(JobParameters $job_parameters)
-    {
-        // Set the "root" model objects we will want to delete (record their ID and model)
-        $event_ids = $job_parameters->request_datum('EVT_IDs', array());
-        // Find all the root nodes to delete (this isn't just events, because there's other data, like related tickets,
-        // prices, message templates, etc, whose model definition doesn't make them dependent on events. But,
-        // we have no UI to access them independent of events, so they may as well get deleted too.)
-        $roots = [];
-        foreach ($event_ids as $event_id) {
-            $roots[] = new ModelObjNode(
-                $event_id,
-                EEM_Event::instance()
-            );
-            // Also, we want to delete their related, non-global, tickets, prices and message templates
-            $related_non_global_tickets = EEM_Ticket::instance()->get_all_deleted_and_undeleted(
-                [
-                    [
-                        'TKT_is_default' => false,
-                        'Datetime.EVT_ID' => $event_id
-                    ]
-                ]
-            );
-            foreach ($related_non_global_tickets as $ticket) {
-                $roots[] = new ModelObjNode(
-                    $ticket->ID(),
-                    $ticket->get_model(),
-                    ['Registration']
-                );
-            }
-            $related_non_global_prices = EEM_Price::instance()->get_all_deleted_and_undeleted(
-                [
-                    [
-                        'PRC_is_default' => false,
-                        'Ticket.Datetime.EVT_ID' => $event_id
-                    ]
-                ]
-            );
-            foreach ($related_non_global_prices as $price) {
-                $roots[] = new ModelObjNode(
-                    $price->ID(),
-                    $price->get_model()
-                );
-            }
-        }
-        $transactions_ids = $this->getTransactionsToDelete($event_ids);
-        foreach ($transactions_ids as $transaction_id) {
-            $roots[] = new ModelObjNode(
-                $transaction_id,
-                EEM_Transaction::instance(),
-                ['Registration']
-            );
-        }
-        $job_parameters->add_extra_data('roots', $roots);
-        // Set an estimate of how long this will take (we're discovering as we go, so it seems impossible to give
-        // an accurate count.)
-        $estimated_work_per_model_obj = 10;
-        $count_regs = EEM_Registration::instance()->count(
-            [
-                [
-                    'EVT_ID' => ['IN', $event_ids]
-                ]
-            ]
-        );
-        $job_parameters->set_job_size((count($roots) + $count_regs) * $estimated_work_per_model_obj);
-        return new JobStepResponse(
-            $job_parameters,
-            esc_html__('Generating preview of data to be deleted...', 'event_espresso')
-        );
-    }
+	/**
+	 *
+	 * @param JobParameters $job_parameters
+	 * @return JobStepResponse
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 */
+	public function create_job(JobParameters $job_parameters)
+	{
+		// Set the "root" model objects we will want to delete (record their ID and model)
+		$event_ids = $job_parameters->request_datum('EVT_IDs', array());
+		// Find all the root nodes to delete (this isn't just events, because there's other data, like related tickets,
+		// prices, message templates, etc, whose model definition doesn't make them dependent on events. But,
+		// we have no UI to access them independent of events, so they may as well get deleted too.)
+		$roots = [];
+		foreach ($event_ids as $event_id) {
+			$roots[] = new ModelObjNode(
+				$event_id,
+				EEM_Event::instance()
+			);
+			// Also, we want to delete their related, non-global, tickets, prices and message templates
+			$related_non_global_tickets = EEM_Ticket::instance()->get_all_deleted_and_undeleted(
+				[
+					[
+						'TKT_is_default' => false,
+						'Datetime.EVT_ID' => $event_id
+					]
+				]
+			);
+			foreach ($related_non_global_tickets as $ticket) {
+				$roots[] = new ModelObjNode(
+					$ticket->ID(),
+					$ticket->get_model(),
+					['Registration']
+				);
+			}
+			$related_non_global_prices = EEM_Price::instance()->get_all_deleted_and_undeleted(
+				[
+					[
+						'PRC_is_default' => false,
+						'Ticket.Datetime.EVT_ID' => $event_id
+					]
+				]
+			);
+			foreach ($related_non_global_prices as $price) {
+				$roots[] = new ModelObjNode(
+					$price->ID(),
+					$price->get_model()
+				);
+			}
+		}
+		$transactions_ids = $this->getTransactionsToDelete($event_ids);
+		foreach ($transactions_ids as $transaction_id) {
+			$roots[] = new ModelObjNode(
+				$transaction_id,
+				EEM_Transaction::instance(),
+				['Registration']
+			);
+		}
+		$job_parameters->add_extra_data('roots', $roots);
+		// Set an estimate of how long this will take (we're discovering as we go, so it seems impossible to give
+		// an accurate count.)
+		$estimated_work_per_model_obj = 10;
+		$count_regs = EEM_Registration::instance()->count(
+			[
+				[
+					'EVT_ID' => ['IN', $event_ids]
+				]
+			]
+		);
+		$job_parameters->set_job_size((count($roots) + $count_regs) * $estimated_work_per_model_obj);
+		return new JobStepResponse(
+			$job_parameters,
+			esc_html__('Generating preview of data to be deleted...', 'event_espresso')
+		);
+	}
 
-    /**
-     * @since $VID:$
-     * @param EE_Base_Class[] $model_objs
-     * @param array $dont_traverse_models
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    protected function createModelObjNodes($model_objs, array $dont_traverse_models = [])
-    {
-        $nodes = [];
-        foreach ($model_objs as $model_obj) {
-            $nodes[] = new ModelObjNode(
-                $model_obj->ID(),
-                $model_obj->get_model(),
-                $dont_traverse_models
-            );
-        }
-        return $nodes;
-    }
+	/**
+	 * @since $VID:$
+	 * @param EE_Base_Class[] $model_objs
+	 * @param array $dont_traverse_models
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	protected function createModelObjNodes($model_objs, array $dont_traverse_models = [])
+	{
+		$nodes = [];
+		foreach ($model_objs as $model_obj) {
+			$nodes[] = new ModelObjNode(
+				$model_obj->ID(),
+				$model_obj->get_model(),
+				$dont_traverse_models
+			);
+		}
+		return $nodes;
+	}
 
-    /**
-     * Gets all the transactions related to these events that aren't related to other events. They'll be deleted too.
-     * (Ones that are related to other events can stay around until those other events are deleted too.)
-     * @since $VID:$
-     * @param $event_ids
-     * @return array of transaction IDs
-     */
-    protected function getTransactionsToDelete($event_ids)
-    {
-        if (empty($event_ids)) {
-            return [];
-        }
-        global $wpdb;
-        $event_ids = array_map(
-            'intval',
-            $event_ids
-        );
-        $imploded_sanitized_event_ids = implode(',', $event_ids);
-        // Select transactions with registrations for the events $event_ids which also don't have registrations
-        // for any events NOT in $event_ids.
-        // Notice the outer query searched for transactions whose registrations ARE in $event_ids,
-        // whereas the inner query checks if the outer query's transaction has any registrations that are
-        // NOT IN $event_ids (ie, don't have registrations for events we're not just about to delete.)
-        return array_map(
-            'intval',
-            $wpdb->get_col(
-                "SELECT 
+	/**
+	 * Gets all the transactions related to these events that aren't related to other events. They'll be deleted too.
+	 * (Ones that are related to other events can stay around until those other events are deleted too.)
+	 * @since $VID:$
+	 * @param $event_ids
+	 * @return array of transaction IDs
+	 */
+	protected function getTransactionsToDelete($event_ids)
+	{
+		if (empty($event_ids)) {
+			return [];
+		}
+		global $wpdb;
+		$event_ids = array_map(
+			'intval',
+			$event_ids
+		);
+		$imploded_sanitized_event_ids = implode(',', $event_ids);
+		// Select transactions with registrations for the events $event_ids which also don't have registrations
+		// for any events NOT in $event_ids.
+		// Notice the outer query searched for transactions whose registrations ARE in $event_ids,
+		// whereas the inner query checks if the outer query's transaction has any registrations that are
+		// NOT IN $event_ids (ie, don't have registrations for events we're not just about to delete.)
+		return array_map(
+			'intval',
+			$wpdb->get_col(
+				"SELECT 
                       DISTINCT t.TXN_ID
                     FROM 
                       {$wpdb->prefix}esp_transaction t INNER JOIN 
@@ -196,84 +196,84 @@ 
                            tsub.TXN_ID=t.TXN_ID AND
                            rsub.EVT_ID NOT IN ({$imploded_sanitized_event_ids})
                        )"
-            )
-        );
-    }
+			)
+		);
+	}
 
-    /**
-     * Performs another step of the job
-     * @param JobParameters $job_parameters
-     * @param int $batch_size
-     * @return JobStepResponse
-     * @throws BatchRequestException
-     */
-    public function continue_job(JobParameters $job_parameters, $batch_size = 50)
-    {
-        // Serializing and unserializing is what really makes this drag on (eg on localhost, the ajax requests took
-        // about 4 seconds when the batch size was 250, but 3 seconds when the batch size was 50. So like
-        // 50% of the request is just serializing and unserializing.) So, make the batches much bigger.
-        $batch_size *= 3;
-        $units_processed = 0;
-        foreach ($job_parameters->extra_datum('roots', array()) as $root_node) {
-            if ($units_processed >= $batch_size) {
-                break;
-            }
-            if (!$root_node instanceof ModelObjNode) {
-                throw new InvalidClassException('ModelObjNode');
-            }
-            if ($root_node->isComplete()) {
-                continue;
-            }
-            $units_processed += $root_node->visit($batch_size - $units_processed);
-        }
-        $job_parameters->mark_processed($units_processed);
-        // If the most-recently processed root node is complete, we must be all done because we're doing them
-        // sequentially.
-        if (isset($root_node) && $root_node instanceof ModelObjNode && $root_node->isComplete()) {
-            $job_parameters->set_status(JobParameters::status_complete);
-            // Show a full progress bar.
-            $job_parameters->set_units_processed($job_parameters->job_size());
-            $deletion_job_code = $job_parameters->request_datum('deletion_job_code');
-            $this->model_obj_node_group_persister->persistModelObjNodesGroup(
-                $job_parameters->extra_datum('roots'),
-                $deletion_job_code
-            );
-            return new JobStepResponse(
-                $job_parameters,
-                esc_html__('Finished identifying items for deletion.', 'event_espresso'),
-                [
-                    'deletion_job_code' => $deletion_job_code
-                ]
-            );
-        } else {
-            // Because the job size was a guess, it may have likely been provden wrong. We don't want to show more work
-            // done than we originally said there would be. So adjust the estimate.
-            if (($job_parameters->units_processed() / $job_parameters->job_size()) > .8) {
-                $job_parameters->set_job_size($job_parameters->job_size() * 2);
-            }
-            return new JobStepResponse(
-                $job_parameters,
-                sprintf(
-                    esc_html__('Identified %d items for deletion.', 'event_espresso'),
-                    $units_processed
-                )
-            );
-        }
-    }
+	/**
+	 * Performs another step of the job
+	 * @param JobParameters $job_parameters
+	 * @param int $batch_size
+	 * @return JobStepResponse
+	 * @throws BatchRequestException
+	 */
+	public function continue_job(JobParameters $job_parameters, $batch_size = 50)
+	{
+		// Serializing and unserializing is what really makes this drag on (eg on localhost, the ajax requests took
+		// about 4 seconds when the batch size was 250, but 3 seconds when the batch size was 50. So like
+		// 50% of the request is just serializing and unserializing.) So, make the batches much bigger.
+		$batch_size *= 3;
+		$units_processed = 0;
+		foreach ($job_parameters->extra_datum('roots', array()) as $root_node) {
+			if ($units_processed >= $batch_size) {
+				break;
+			}
+			if (!$root_node instanceof ModelObjNode) {
+				throw new InvalidClassException('ModelObjNode');
+			}
+			if ($root_node->isComplete()) {
+				continue;
+			}
+			$units_processed += $root_node->visit($batch_size - $units_processed);
+		}
+		$job_parameters->mark_processed($units_processed);
+		// If the most-recently processed root node is complete, we must be all done because we're doing them
+		// sequentially.
+		if (isset($root_node) && $root_node instanceof ModelObjNode && $root_node->isComplete()) {
+			$job_parameters->set_status(JobParameters::status_complete);
+			// Show a full progress bar.
+			$job_parameters->set_units_processed($job_parameters->job_size());
+			$deletion_job_code = $job_parameters->request_datum('deletion_job_code');
+			$this->model_obj_node_group_persister->persistModelObjNodesGroup(
+				$job_parameters->extra_datum('roots'),
+				$deletion_job_code
+			);
+			return new JobStepResponse(
+				$job_parameters,
+				esc_html__('Finished identifying items for deletion.', 'event_espresso'),
+				[
+					'deletion_job_code' => $deletion_job_code
+				]
+			);
+		} else {
+			// Because the job size was a guess, it may have likely been provden wrong. We don't want to show more work
+			// done than we originally said there would be. So adjust the estimate.
+			if (($job_parameters->units_processed() / $job_parameters->job_size()) > .8) {
+				$job_parameters->set_job_size($job_parameters->job_size() * 2);
+			}
+			return new JobStepResponse(
+				$job_parameters,
+				sprintf(
+					esc_html__('Identified %d items for deletion.', 'event_espresso'),
+					$units_processed
+				)
+			);
+		}
+	}
 
-    /**
-     * Performs any clean-up logic when we know the job is completed
-     * @param JobParameters $job_parameters
-     * @return JobStepResponse
-     */
-    public function cleanup_job(JobParameters $job_parameters)
-    {
-        // Nothing much to do. We can't delete the option with the built tree because we may need it in a moment for the deletion
-        return new JobStepResponse(
-            $job_parameters,
-            esc_html__('All done', 'event_espresso')
-        );
-    }
+	/**
+	 * Performs any clean-up logic when we know the job is completed
+	 * @param JobParameters $job_parameters
+	 * @return JobStepResponse
+	 */
+	public function cleanup_job(JobParameters $job_parameters)
+	{
+		// Nothing much to do. We can't delete the option with the built tree because we may need it in a moment for the deletion
+		return new JobStepResponse(
+			$job_parameters,
+			esc_html__('All done', 'event_espresso')
+		);
+	}
 }
 // End of file EventDeletion.php
 // Location: EventEspressoBatchRequest\JobHandlers/EventDeletion.php

Unused Use Statements -2 removed lines

@@ -9,11 +9,9 @@
 use EEM_Registration;
 use EEM_Ticket;
 use EEM_Transaction;
-use EETests\bootstrap\CoreLoader;
 use EventEspresso\core\exceptions\InvalidClassException;
 use EventEspresso\core\exceptions\InvalidDataTypeException;
 use EventEspresso\core\exceptions\InvalidInterfaceException;
-use EventEspresso\core\services\loaders\LoaderFactory;
 use EventEspresso\core\services\orm\tree_traversal\ModelObjNode;
 use EventEspresso\core\services\orm\tree_traversal\NodeGroupDao;
 use EventEspressoBatchRequest\Helpers\BatchRequestException;

core/services/orm/tree_traversal/ModelObjNode.php

Spacing +4 added lines, -4 removed lines

@@ -68,7 +68,7 @@ 
                 continue;
             }
             if ($relation instanceof EE_Has_Many_Relation) {
-                $this->nodes[ $relationName ] = new RelationNode(
+                $this->nodes[$relationName] = new RelationNode(
                     $this->id,
                     $this->model,
                     $relation->get_other_model(),
@@ -79,7 +79,7 @@ 
                     $relation->get_join_model()->get_this_model_name(),
                     $this->dont_traverse_models
                 )) {
-                $this->nodes[ $relation->get_join_model()->get_this_model_name() ] = new RelationNode(
+                $this->nodes[$relation->get_join_model()->get_this_model_name()] = new RelationNode(
                     $this->id,
                     $this->model,
                     $relation->get_join_model(),
@@ -127,7 +127,7 @@ 
             // To save on space when serializing, only bother keeping a record of relation nodes that actually found
             // related model objects.
             if ($relation_node->isComplete() && $relation_node->countSubNodes() === 0) {
-                unset($this->nodes[ $model_name ]);
+                unset($this->nodes[$model_name]);
             }
             if ($num_identified >= $model_objects_to_identify) {
                 // ...but admit we're wrong if the work exceeded the budget.
@@ -158,7 +158,7 @@ 
             $tree['rels'] = null;
         } else {
             foreach ($this->nodes as $relation_name => $relation_node) {
-                $tree['rels'][ $relation_name ] = $relation_node->toArray();
+                $tree['rels'][$relation_name] = $relation_node->toArray();
             }
         }
         return $tree;

Indentation +186 added lines, -186 removed lines

@@ -22,204 +22,204 @@
  */
 class ModelObjNode extends BaseNode
 {
-    /**
-     * @var int|string
-     */
-    protected $id;
+	/**
+	 * @var int|string
+	 */
+	protected $id;
 
-    /**
-     * @var EEM_Base
-     */
-    protected $model;
+	/**
+	 * @var EEM_Base
+	 */
+	protected $model;
 
-    /**
-     * @var RelationNode[]
-     */
-    protected $nodes;
+	/**
+	 * @var RelationNode[]
+	 */
+	protected $nodes;
 
-    /**
-     * We don't pass the model objects because this needs to serialize to something tiny for effiency.
-     * @param $model_obj_id
-     * @param EEM_Base $model
-     * @param array $dont_traverse_models array of model names we DON'T want to traverse.
-     */
-    public function __construct($model_obj_id, EEM_Base $model, array $dont_traverse_models = [])
-    {
-        $this->id = $model_obj_id;
-        $this->model = $model;
-        $this->dont_traverse_models = $dont_traverse_models;
-    }
+	/**
+	 * We don't pass the model objects because this needs to serialize to something tiny for effiency.
+	 * @param $model_obj_id
+	 * @param EEM_Base $model
+	 * @param array $dont_traverse_models array of model names we DON'T want to traverse.
+	 */
+	public function __construct($model_obj_id, EEM_Base $model, array $dont_traverse_models = [])
+	{
+		$this->id = $model_obj_id;
+		$this->model = $model;
+		$this->dont_traverse_models = $dont_traverse_models;
+	}
 
-    /**
-     * Creates a relation node for each relation of this model's relations.
-     * Does NOT call `discover` on them yet though.
-     * @since $VID:$
-     * @throws \EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     */
-    protected function discover()
-    {
-        $this->nodes = [];
-        foreach ($this->model->relation_settings() as $relationName => $relation) {
-            // Make sure this isn't one of the models we were told to not traverse into.
-            if (in_array($relationName, $this->dont_traverse_models)) {
-                continue;
-            }
-            if ($relation instanceof EE_Has_Many_Relation) {
-                $this->nodes[ $relationName ] = new RelationNode(
-                    $this->id,
-                    $this->model,
-                    $relation->get_other_model(),
-                    $this->dont_traverse_models
-                );
-            } elseif ($relation instanceof EE_HABTM_Relation &&
-                ! in_array(
-                    $relation->get_join_model()->get_this_model_name(),
-                    $this->dont_traverse_models
-                )) {
-                $this->nodes[ $relation->get_join_model()->get_this_model_name() ] = new RelationNode(
-                    $this->id,
-                    $this->model,
-                    $relation->get_join_model(),
-                    $this->dont_traverse_models
-                );
-            }
-        }
-        ksort($this->nodes);
-    }
+	/**
+	 * Creates a relation node for each relation of this model's relations.
+	 * Does NOT call `discover` on them yet though.
+	 * @since $VID:$
+	 * @throws \EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 */
+	protected function discover()
+	{
+		$this->nodes = [];
+		foreach ($this->model->relation_settings() as $relationName => $relation) {
+			// Make sure this isn't one of the models we were told to not traverse into.
+			if (in_array($relationName, $this->dont_traverse_models)) {
+				continue;
+			}
+			if ($relation instanceof EE_Has_Many_Relation) {
+				$this->nodes[ $relationName ] = new RelationNode(
+					$this->id,
+					$this->model,
+					$relation->get_other_model(),
+					$this->dont_traverse_models
+				);
+			} elseif ($relation instanceof EE_HABTM_Relation &&
+				! in_array(
+					$relation->get_join_model()->get_this_model_name(),
+					$this->dont_traverse_models
+				)) {
+				$this->nodes[ $relation->get_join_model()->get_this_model_name() ] = new RelationNode(
+					$this->id,
+					$this->model,
+					$relation->get_join_model(),
+					$this->dont_traverse_models
+				);
+			}
+		}
+		ksort($this->nodes);
+	}
 
 
-    /**
-     * Whether this item has already been initialized
-     */
-    protected function isDiscovered()
-    {
-        return $this->nodes !== null && is_array($this->nodes);
-    }
+	/**
+	 * Whether this item has already been initialized
+	 */
+	protected function isDiscovered()
+	{
+		return $this->nodes !== null && is_array($this->nodes);
+	}
 
-    /**
-     * @since $VID:$
-     * @return boolean
-     */
-    public function isComplete()
-    {
-        if ($this->complete === null) {
-            $this->complete = false;
-        }
-        return $this->complete;
-    }
+	/**
+	 * @since $VID:$
+	 * @return boolean
+	 */
+	public function isComplete()
+	{
+		if ($this->complete === null) {
+			$this->complete = false;
+		}
+		return $this->complete;
+	}
 
-    /**
-     * Triggers working on each child relation node that has work to do.
-     * @since $VID:$
-     * @param $model_objects_to_identify
-     * @return int units of work done
-     */
-    protected function work($model_objects_to_identify)
-    {
-        $num_identified = 0;
-        // Begin assuming we'll finish all the work on this node and its children...
-        $this->complete = true;
-        foreach ($this->nodes as $model_name => $relation_node) {
-            $num_identified += $relation_node->visit($model_objects_to_identify - $num_identified);
-            // To save on space when serializing, only bother keeping a record of relation nodes that actually found
-            // related model objects.
-            if ($relation_node->isComplete() && $relation_node->countSubNodes() === 0) {
-                unset($this->nodes[ $model_name ]);
-            }
-            if ($num_identified >= $model_objects_to_identify) {
-                // ...but admit we're wrong if the work exceeded the budget.
-                $this->complete = false;
-                break;
-            }
-        }
-        return $num_identified;
-    }
+	/**
+	 * Triggers working on each child relation node that has work to do.
+	 * @since $VID:$
+	 * @param $model_objects_to_identify
+	 * @return int units of work done
+	 */
+	protected function work($model_objects_to_identify)
+	{
+		$num_identified = 0;
+		// Begin assuming we'll finish all the work on this node and its children...
+		$this->complete = true;
+		foreach ($this->nodes as $model_name => $relation_node) {
+			$num_identified += $relation_node->visit($model_objects_to_identify - $num_identified);
+			// To save on space when serializing, only bother keeping a record of relation nodes that actually found
+			// related model objects.
+			if ($relation_node->isComplete() && $relation_node->countSubNodes() === 0) {
+				unset($this->nodes[ $model_name ]);
+			}
+			if ($num_identified >= $model_objects_to_identify) {
+				// ...but admit we're wrong if the work exceeded the budget.
+				$this->complete = false;
+				break;
+			}
+		}
+		return $num_identified;
+	}
 
-    /**
-     * @since $VID:$
-     * @return array
-     * @throws \EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     */
-    public function toArray()
-    {
-        $tree = [
-            'id' => $this->id,
-            'complete' => $this->isComplete(),
-            'rels' => []
-        ];
-        if ($this->nodes === null) {
-            $tree['rels'] = null;
-        } else {
-            foreach ($this->nodes as $relation_name => $relation_node) {
-                $tree['rels'][ $relation_name ] = $relation_node->toArray();
-            }
-        }
-        return $tree;
-    }
+	/**
+	 * @since $VID:$
+	 * @return array
+	 * @throws \EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 */
+	public function toArray()
+	{
+		$tree = [
+			'id' => $this->id,
+			'complete' => $this->isComplete(),
+			'rels' => []
+		];
+		if ($this->nodes === null) {
+			$tree['rels'] = null;
+		} else {
+			foreach ($this->nodes as $relation_name => $relation_node) {
+				$tree['rels'][ $relation_name ] = $relation_node->toArray();
+			}
+		}
+		return $tree;
+	}
 
-    /**
-     * @since $VID:$
-     * @return array|mixed
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     * @throws \EE_Error
-     */
-    public function getIds()
-    {
-        $ids = [
-            $this->model->get_this_model_name() => [
-                $this->id => $this->id
-            ]
-        ];
-        if ($this->nodes && is_array($this->nodes)) {
-            foreach ($this->nodes as $relation_node) {
-                $ids = array_replace_recursive($ids, $relation_node->getIds());
-            }
-        }
-        return $ids;
-    }
+	/**
+	 * @since $VID:$
+	 * @return array|mixed
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 * @throws \EE_Error
+	 */
+	public function getIds()
+	{
+		$ids = [
+			$this->model->get_this_model_name() => [
+				$this->id => $this->id
+			]
+		];
+		if ($this->nodes && is_array($this->nodes)) {
+			foreach ($this->nodes as $relation_node) {
+				$ids = array_replace_recursive($ids, $relation_node->getIds());
+			}
+		}
+		return $ids;
+	}
 
-    /**
-     * Don't serialize the models. Just record their names on some dynamic properties.
-     * @since $VID:$
-     */
-    public function __sleep()
-    {
-        $this->m = $this->model->get_this_model_name();
-        return array_merge(
-            [
-                'm',
-                'id',
-                'nodes',
-            ],
-            parent::__sleep()
-        );
-    }
+	/**
+	 * Don't serialize the models. Just record their names on some dynamic properties.
+	 * @since $VID:$
+	 */
+	public function __sleep()
+	{
+		$this->m = $this->model->get_this_model_name();
+		return array_merge(
+			[
+				'm',
+				'id',
+				'nodes',
+			],
+			parent::__sleep()
+		);
+	}
 
-    /**
-     * Use the dynamic properties to instantiate the models we use.
-     * @since $VID:$
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function __wakeup()
-    {
-        $this->model = EE_Registry::instance()->load_model($this->m);
-        parent::__wakeup();
-    }
+	/**
+	 * Use the dynamic properties to instantiate the models we use.
+	 * @since $VID:$
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function __wakeup()
+	{
+		$this->model = EE_Registry::instance()->load_model($this->m);
+		parent::__wakeup();
+	}
 }
 // End of file Visitor.php
 // Location: EventEspresso\core\services\orm\tree_traversal/Visitor.php

admin_pages/events/form_sections/ConfirmEventDeletionForm.php

Unused Use Statements -2 removed lines

@@ -4,8 +4,6 @@
 
 use EE_Checkbox_Multi_Input;
 use EE_Event;
-use EE_Form_Section_HTML;
-use EEH_HTML;
 use EEM_Event;
 use EventEspresso\core\exceptions\UnexpectedEntityException;
 

Indentation +49 added lines, -49 removed lines

@@ -22,55 +22,55 @@
  */
 class ConfirmEventDeletionForm extends \EE_Form_Section_Proper
 {
-    /**
-     * @var EE_Event[]
-     */
-    protected $events;
-    public function __construct($event_ids, $options_array = array())
-    {
-        if (! isset($options_array['subsections'])) {
-            $options_array['subsections'] = [];
-        }
-        if (! isset($options_array['subsections']['events'])) {
-            $events_subsection = new \EE_Form_Section_Proper();
-            $options_array['subsections']['events'] = $events_subsection;
-        }
-        $events = EEM_Event::instance()->get_all_deleted_and_undeleted(
-            [
-                [
-                    'EVT_ID' => ['IN',$event_ids]
-                ]
-            ]
-        );
-        if (! is_array($events)) {
-            throw new UnexpectedEntityException($event_ids, 'array');
-        }
-        $this->events = $events;
-        $events_inputs = [
-        ];
-        foreach ($events as $event) {
-            $events_inputs[ $event->ID() ] = new EE_Checkbox_Multi_Input(
-                [
-                    'yes' => $event->name(),
-                ],
-                [
-                    'html_label_text' => esc_html__('Please confirm you wish to delete:', 'event_espresso'),
-                    'required' => true
-                ]
-            );
-        }
-        $events_subsection->add_subsections($events_inputs);
-        $options_array['subsections']['backup'] = new EE_Checkbox_Multi_Input(
-            [
-                'yes' => esc_html__('I have backed up my database.', 'event_espresso')
-            ],
-            [
-                'html_label_text' => esc_html__('Deleting this data cannot be undone. Please confirm you have a usable database backup.', 'event_espresso'),
-                'required' => true
-            ]
-        );
-        parent::__construct($options_array);
-    }
+	/**
+	 * @var EE_Event[]
+	 */
+	protected $events;
+	public function __construct($event_ids, $options_array = array())
+	{
+		if (! isset($options_array['subsections'])) {
+			$options_array['subsections'] = [];
+		}
+		if (! isset($options_array['subsections']['events'])) {
+			$events_subsection = new \EE_Form_Section_Proper();
+			$options_array['subsections']['events'] = $events_subsection;
+		}
+		$events = EEM_Event::instance()->get_all_deleted_and_undeleted(
+			[
+				[
+					'EVT_ID' => ['IN',$event_ids]
+				]
+			]
+		);
+		if (! is_array($events)) {
+			throw new UnexpectedEntityException($event_ids, 'array');
+		}
+		$this->events = $events;
+		$events_inputs = [
+		];
+		foreach ($events as $event) {
+			$events_inputs[ $event->ID() ] = new EE_Checkbox_Multi_Input(
+				[
+					'yes' => $event->name(),
+				],
+				[
+					'html_label_text' => esc_html__('Please confirm you wish to delete:', 'event_espresso'),
+					'required' => true
+				]
+			);
+		}
+		$events_subsection->add_subsections($events_inputs);
+		$options_array['subsections']['backup'] = new EE_Checkbox_Multi_Input(
+			[
+				'yes' => esc_html__('I have backed up my database.', 'event_espresso')
+			],
+			[
+				'html_label_text' => esc_html__('Deleting this data cannot be undone. Please confirm you have a usable database backup.', 'event_espresso'),
+				'required' => true
+			]
+		);
+		parent::__construct($options_array);
+	}
 }
 // End of file ConfirmEventDeletionForm.php
 // Location: EventEspresso\admin_pages\events\form_sections/ConfirmEventDeletionForm.php

Spacing +5 added lines, -5 removed lines

@@ -28,28 +28,28 @@
     protected $events;
     public function __construct($event_ids, $options_array = array())
     {
-        if (! isset($options_array['subsections'])) {
+        if ( ! isset($options_array['subsections'])) {
             $options_array['subsections'] = [];
         }
-        if (! isset($options_array['subsections']['events'])) {
+        if ( ! isset($options_array['subsections']['events'])) {
             $events_subsection = new \EE_Form_Section_Proper();
             $options_array['subsections']['events'] = $events_subsection;
         }
         $events = EEM_Event::instance()->get_all_deleted_and_undeleted(
             [
                 [
-                    'EVT_ID' => ['IN',$event_ids]
+                    'EVT_ID' => ['IN', $event_ids]
                 ]
             ]
         );
-        if (! is_array($events)) {
+        if ( ! is_array($events)) {
             throw new UnexpectedEntityException($event_ids, 'array');
         }
         $this->events = $events;
         $events_inputs = [
         ];
         foreach ($events as $event) {
-            $events_inputs[ $event->ID() ] = new EE_Checkbox_Multi_Input(
+            $events_inputs[$event->ID()] = new EE_Checkbox_Multi_Input(
                 [
                     'yes' => $event->name(),
                 ],