eventespresso / event-espresso-core

core/domain/services/graphql/enums/TicketsConnectionOrderbyEnum.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
      */
     public function __construct()
     {
-        $this->setName($this->namespace . 'TicketsConnectionOrderbyEnum');
+        $this->setName($this->namespace.'TicketsConnectionOrderbyEnum');
         $this->setDescription(esc_html__('Field to order the connection by', 'event_espresso'));
         parent::__construct();
     }

Indentation +25 added lines, -25 removed lines

@@ -14,31 +14,31 @@
  */
 class TicketsConnectionOrderbyEnum extends EnumBase
 {
-    /**
-     * TicketsConnectionOrderbyEnum constructor.
-     */
-    public function __construct()
-    {
-        $this->setName($this->namespace . 'TicketsConnectionOrderbyEnum');
-        $this->setDescription(esc_html__('Field to order the connection by', 'event_espresso'));
-        parent::__construct();
-    }
+	/**
+	 * TicketsConnectionOrderbyEnum constructor.
+	 */
+	public function __construct()
+	{
+		$this->setName($this->namespace . 'TicketsConnectionOrderbyEnum');
+		$this->setDescription(esc_html__('Field to order the connection by', 'event_espresso'));
+		parent::__construct();
+	}
 
 
-    /**
-     * @return array
-     */
-    protected function getValues(): array
-    {
-        return [
-            'NAME'     => [
-                'value'       => 'TKT_name',
-                'description' => esc_html__('Order by name', 'event_espresso'),
-            ],
-            'START_DATE'     => [
-                'value'       => 'TKT_start_date',
-                'description' => esc_html__('Order by start date', 'event_espresso'),
-            ],
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	protected function getValues(): array
+	{
+		return [
+			'NAME'     => [
+				'value'       => 'TKT_name',
+				'description' => esc_html__('Order by name', 'event_espresso'),
+			],
+			'START_DATE'     => [
+				'value'       => 'TKT_start_date',
+				'description' => esc_html__('Order by start date', 'event_espresso'),
+			],
+		];
+	}
 }

core/domain/services/graphql/enums/PriceBaseTypeEnum.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
      */
     public function __construct()
     {
-        $this->setName($this->namespace . 'PriceBaseTypeEnum');
+        $this->setName($this->namespace.'PriceBaseTypeEnum');
         $this->setDescription(esc_html__('Price Base type ID', 'event_espresso'));
         parent::__construct();
     }

Indentation +29 added lines, -29 removed lines

@@ -15,35 +15,35 @@
  */
 class PriceBaseTypeEnum extends EnumBase
 {
-    /**
-     * PriceBaseTypeEnum constructor.
-     */
-    public function __construct()
-    {
-        $this->setName($this->namespace . 'PriceBaseTypeEnum');
-        $this->setDescription(esc_html__('Price Base type ID', 'event_espresso'));
-        parent::__construct();
-    }
+	/**
+	 * PriceBaseTypeEnum constructor.
+	 */
+	public function __construct()
+	{
+		$this->setName($this->namespace . 'PriceBaseTypeEnum');
+		$this->setDescription(esc_html__('Price Base type ID', 'event_espresso'));
+		parent::__construct();
+	}
 
 
-    /**
-     * @return array
-     */
-    protected function getValues(): array
-    {
-        return [
-            'BASE_PRICE'     => [
-                'value'       => EEM_Price_Type::base_type_base_price,
-            ],
-            'DISCOUNT'     => [
-                'value'       => EEM_Price_Type::base_type_discount,
-            ],
-            'SURCHARGE'     => [
-                'value'       => EEM_Price_Type::base_type_surcharge,
-            ],
-            'TAX'     => [
-                'value'       => EEM_Price_Type::base_type_tax,
-            ],
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	protected function getValues(): array
+	{
+		return [
+			'BASE_PRICE'     => [
+				'value'       => EEM_Price_Type::base_type_base_price,
+			],
+			'DISCOUNT'     => [
+				'value'       => EEM_Price_Type::base_type_discount,
+			],
+			'SURCHARGE'     => [
+				'value'       => EEM_Price_Type::base_type_surcharge,
+			],
+			'TAX'     => [
+				'value'       => EEM_Price_Type::base_type_tax,
+			],
+		];
+	}
 }

core/domain/services/graphql/inputs/DatetimesConnectionOrderbyInput.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
      */
     public function __construct()
     {
-        $this->setName($this->namespace . 'DatetimesConnectionOrderbyInput');
+        $this->setName($this->namespace.'DatetimesConnectionOrderbyInput');
         $this->setDescription(esc_html__('Options for ordering the connection', 'event_espresso'));
         parent::__construct();
     }
@@ -39,7 +39,7 @@ 
         return [
             new GraphQLField(
                 'field',
-                ['non_null' => $this->namespace . 'DatetimesConnectionOrderbyEnum']
+                ['non_null' => $this->namespace.'DatetimesConnectionOrderbyEnum']
             ),
             new GraphQLField(
                 'order',

Indentation +25 added lines, -25 removed lines

@@ -16,31 +16,31 @@
  */
 class DatetimesConnectionOrderbyInput extends InputBase
 {
-    /**
-     * DatetimesConnectionOrderbyInput constructor.
-     */
-    public function __construct()
-    {
-        $this->setName($this->namespace . 'DatetimesConnectionOrderbyInput');
-        $this->setDescription(esc_html__('Options for ordering the connection', 'event_espresso'));
-        parent::__construct();
-    }
+	/**
+	 * DatetimesConnectionOrderbyInput constructor.
+	 */
+	public function __construct()
+	{
+		$this->setName($this->namespace . 'DatetimesConnectionOrderbyInput');
+		$this->setDescription(esc_html__('Options for ordering the connection', 'event_espresso'));
+		parent::__construct();
+	}
 
 
-    /**
-     * @return GraphQLFieldInterface[]
-     */
-    protected function getFields(): array
-    {
-        return [
-            new GraphQLField(
-                'field',
-                ['non_null' => $this->namespace . 'DatetimesConnectionOrderbyEnum']
-            ),
-            new GraphQLField(
-                'order',
-                'OrderEnum'
-            ),
-        ];
-    }
+	/**
+	 * @return GraphQLFieldInterface[]
+	 */
+	protected function getFields(): array
+	{
+		return [
+			new GraphQLField(
+				'field',
+				['non_null' => $this->namespace . 'DatetimesConnectionOrderbyEnum']
+			),
+			new GraphQLField(
+				'order',
+				'OrderEnum'
+			),
+		];
+	}
 }

core/domain/services/graphql/inputs/TicketsConnectionOrderbyInput.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
      */
     public function __construct()
     {
-        $this->setName($this->namespace . 'TicketsConnectionOrderbyInput');
+        $this->setName($this->namespace.'TicketsConnectionOrderbyInput');
         $this->setDescription(esc_html__('Options for ordering the connection', 'event_espresso'));
         parent::__construct();
     }
@@ -39,7 +39,7 @@ 
         return [
             new GraphQLField(
                 'field',
-                ['non_null' => $this->namespace . 'TicketsConnectionOrderbyEnum']
+                ['non_null' => $this->namespace.'TicketsConnectionOrderbyEnum']
             ),
             new GraphQLField(
                 'order',

Indentation +25 added lines, -25 removed lines

@@ -16,31 +16,31 @@
  */
 class TicketsConnectionOrderbyInput extends InputBase
 {
-    /**
-     * TicketsConnectionOrderbyInput constructor.
-     */
-    public function __construct()
-    {
-        $this->setName($this->namespace . 'TicketsConnectionOrderbyInput');
-        $this->setDescription(esc_html__('Options for ordering the connection', 'event_espresso'));
-        parent::__construct();
-    }
+	/**
+	 * TicketsConnectionOrderbyInput constructor.
+	 */
+	public function __construct()
+	{
+		$this->setName($this->namespace . 'TicketsConnectionOrderbyInput');
+		$this->setDescription(esc_html__('Options for ordering the connection', 'event_espresso'));
+		parent::__construct();
+	}
 
 
-    /**
-     * @return GraphQLFieldInterface[]
-     */
-    protected function getFields(): array
-    {
-        return [
-            new GraphQLField(
-                'field',
-                ['non_null' => $this->namespace . 'TicketsConnectionOrderbyEnum']
-            ),
-            new GraphQLField(
-                'order',
-                'OrderEnum'
-            ),
-        ];
-    }
+	/**
+	 * @return GraphQLFieldInterface[]
+	 */
+	protected function getFields(): array
+	{
+		return [
+			new GraphQLField(
+				'field',
+				['non_null' => $this->namespace . 'TicketsConnectionOrderbyEnum']
+			),
+			new GraphQLField(
+				'order',
+				'OrderEnum'
+			),
+		];
+	}
 }

core/domain/services/graphql/connections/RootQueryPricesConnection.php

Spacing +2 added lines, -2 removed lines

@@ -38,8 +38,8 @@
     {
         return [
             'fromType'           => 'RootQuery',
-            'toType'             => $this->namespace . 'Price',
-            'fromFieldName'      => lcfirst($this->namespace) . 'Prices',
+            'toType'             => $this->namespace.'Price',
+            'fromFieldName'      => lcfirst($this->namespace).'Prices',
             'connectionTypeName' => "{$this->namespace}RootQueryPricesConnection",
             'connectionArgs'     => TicketPricesConnection::get_connection_args(),
             'resolve'            => [$this, 'resolveConnection'],

Indentation +35 added lines, -35 removed lines

@@ -18,43 +18,43 @@
  */
 class RootQueryPricesConnection extends AbstractRootQueryConnection
 {
-    /**
-     * PriceConnection constructor.
-     *
-     * @param EEM_Price               $model
-     */
-    public function __construct(EEM_Price $model)
-    {
-        parent::__construct($model);
-    }
+	/**
+	 * PriceConnection constructor.
+	 *
+	 * @param EEM_Price               $model
+	 */
+	public function __construct(EEM_Price $model)
+	{
+		parent::__construct($model);
+	}
 
 
-    /**
-     * @return array
-     */
-    public function config(): array
-    {
-        return [
-            'fromType'           => 'RootQuery',
-            'toType'             => $this->namespace . 'Price',
-            'fromFieldName'      => lcfirst($this->namespace) . 'Prices',
-            'connectionTypeName' => "{$this->namespace}RootQueryPricesConnection",
-            'connectionArgs'     => TicketPricesConnection::get_connection_args(),
-            'resolve'            => [$this, 'resolveConnection'],
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	public function config(): array
+	{
+		return [
+			'fromType'           => 'RootQuery',
+			'toType'             => $this->namespace . 'Price',
+			'fromFieldName'      => lcfirst($this->namespace) . 'Prices',
+			'connectionTypeName' => "{$this->namespace}RootQueryPricesConnection",
+			'connectionArgs'     => TicketPricesConnection::get_connection_args(),
+			'resolve'            => [$this, 'resolveConnection'],
+		];
+	}
 
 
-    /**
-     * @param $entity
-     * @param $args
-     * @param $context
-     * @param $info
-     * @return PriceConnectionResolver
-     * @throws Exception
-     */
-    public function getConnectionResolver($entity, $args, $context, $info): AbstractConnectionResolver
-    {
-        return new PriceConnectionResolver($entity, $args, $context, $info);
-    }
+	/**
+	 * @param $entity
+	 * @param $args
+	 * @param $context
+	 * @param $info
+	 * @return PriceConnectionResolver
+	 * @throws Exception
+	 */
+	public function getConnectionResolver($entity, $args, $context, $info): AbstractConnectionResolver
+	{
+		return new PriceConnectionResolver($entity, $args, $context, $info);
+	}
 }

core/domain/services/graphql/connections/RootQueryDatetimesConnection.php

Spacing +2 added lines, -2 removed lines

@@ -38,8 +38,8 @@
     {
         return [
             'fromType'           => 'RootQuery',
-            'toType'             => $this->namespace . 'Datetime',
-            'fromFieldName'      => lcfirst($this->namespace . 'Datetimes'),
+            'toType'             => $this->namespace.'Datetime',
+            'fromFieldName'      => lcfirst($this->namespace.'Datetimes'),
             'connectionTypeName' => "{$this->namespace}RootQueryDatetimesConnection",
             'connectionArgs'     => EventDatetimesConnection::get_connection_args(),
             'resolve'            => [$this, 'resolveConnection'],

Indentation +35 added lines, -35 removed lines

@@ -18,43 +18,43 @@
  */
 class RootQueryDatetimesConnection extends AbstractRootQueryConnection
 {
-    /**
-     * DatetimeConnection constructor.
-     *
-     * @param EEM_Datetime               $model
-     */
-    public function __construct(EEM_Datetime $model)
-    {
-        parent::__construct($model);
-    }
+	/**
+	 * DatetimeConnection constructor.
+	 *
+	 * @param EEM_Datetime               $model
+	 */
+	public function __construct(EEM_Datetime $model)
+	{
+		parent::__construct($model);
+	}
 
 
-    /**
-     * @return array
-     */
-    public function config(): array
-    {
-        return [
-            'fromType'           => 'RootQuery',
-            'toType'             => $this->namespace . 'Datetime',
-            'fromFieldName'      => lcfirst($this->namespace . 'Datetimes'),
-            'connectionTypeName' => "{$this->namespace}RootQueryDatetimesConnection",
-            'connectionArgs'     => EventDatetimesConnection::get_connection_args(),
-            'resolve'            => [$this, 'resolveConnection'],
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	public function config(): array
+	{
+		return [
+			'fromType'           => 'RootQuery',
+			'toType'             => $this->namespace . 'Datetime',
+			'fromFieldName'      => lcfirst($this->namespace . 'Datetimes'),
+			'connectionTypeName' => "{$this->namespace}RootQueryDatetimesConnection",
+			'connectionArgs'     => EventDatetimesConnection::get_connection_args(),
+			'resolve'            => [$this, 'resolveConnection'],
+		];
+	}
 
 
-    /**
-     * @param $entity
-     * @param $args
-     * @param $context
-     * @param $info
-     * @return DatetimeConnectionResolver
-     * @throws Exception
-     */
-    public function getConnectionResolver($entity, $args, $context, $info): AbstractConnectionResolver
-    {
-        return new DatetimeConnectionResolver($entity, $args, $context, $info);
-    }
+	/**
+	 * @param $entity
+	 * @param $args
+	 * @param $context
+	 * @param $info
+	 * @return DatetimeConnectionResolver
+	 * @throws Exception
+	 */
+	public function getConnectionResolver($entity, $args, $context, $info): AbstractConnectionResolver
+	{
+		return new DatetimeConnectionResolver($entity, $args, $context, $info);
+	}
 }

core/domain/services/graphql/connections/RootQueryTicketsConnection.php

Spacing +2 added lines, -2 removed lines

@@ -38,8 +38,8 @@
     {
         return [
             'fromType'           => 'RootQuery',
-            'toType'             => $this->namespace . 'Ticket',
-            'fromFieldName'      => lcfirst($this->namespace) . 'Tickets',
+            'toType'             => $this->namespace.'Ticket',
+            'fromFieldName'      => lcfirst($this->namespace).'Tickets',
             'connectionTypeName' => "{$this->namespace}RootQueryTicketsConnection",
             'connectionArgs'     => DatetimeTicketsConnection::get_connection_args(),
             'resolve'            => [$this, 'resolveConnection'],

Indentation +35 added lines, -35 removed lines

@@ -18,43 +18,43 @@
  */
 class RootQueryTicketsConnection extends AbstractRootQueryConnection
 {
-    /**
-     * TicketConnection constructor.
-     *
-     * @param EEM_Ticket               $model
-     */
-    public function __construct(EEM_Ticket $model)
-    {
-        parent::__construct($model);
-    }
+	/**
+	 * TicketConnection constructor.
+	 *
+	 * @param EEM_Ticket               $model
+	 */
+	public function __construct(EEM_Ticket $model)
+	{
+		parent::__construct($model);
+	}
 
 
-    /**
-     * @return array
-     */
-    public function config(): array
-    {
-        return [
-            'fromType'           => 'RootQuery',
-            'toType'             => $this->namespace . 'Ticket',
-            'fromFieldName'      => lcfirst($this->namespace) . 'Tickets',
-            'connectionTypeName' => "{$this->namespace}RootQueryTicketsConnection",
-            'connectionArgs'     => DatetimeTicketsConnection::get_connection_args(),
-            'resolve'            => [$this, 'resolveConnection'],
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	public function config(): array
+	{
+		return [
+			'fromType'           => 'RootQuery',
+			'toType'             => $this->namespace . 'Ticket',
+			'fromFieldName'      => lcfirst($this->namespace) . 'Tickets',
+			'connectionTypeName' => "{$this->namespace}RootQueryTicketsConnection",
+			'connectionArgs'     => DatetimeTicketsConnection::get_connection_args(),
+			'resolve'            => [$this, 'resolveConnection'],
+		];
+	}
 
 
-    /**
-     * @param $entity
-     * @param $args
-     * @param $context
-     * @param $info
-     * @return TicketConnectionResolver
-     * @throws Exception
-     */
-    public function getConnectionResolver($entity, $args, $context, $info): AbstractConnectionResolver
-    {
-        return new TicketConnectionResolver($entity, $args, $context, $info);
-    }
+	/**
+	 * @param $entity
+	 * @param $args
+	 * @param $context
+	 * @param $info
+	 * @return TicketConnectionResolver
+	 * @throws Exception
+	 */
+	public function getConnectionResolver($entity, $args, $context, $info): AbstractConnectionResolver
+	{
+		return new TicketConnectionResolver($entity, $args, $context, $info);
+	}
 }

core/libraries/batch/JobHandlers/ExecuteBatchDeletion.php

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/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,

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 4.10.12.p
-     * @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 4.10.12.p
+	 * @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