Corrects composer.json

Author: alexstandiford

batch-tasks.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace Underpin\Batch_Tasks;
+
+use Underpin\Abstracts\Underpin;
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+function batch_task_handler() {
+	return Underpin::make_class( [
+		'root_namespace'      => 'Underpin\Batch_Tasks',
+		'text_domain'         => 'underpin-batch-tasks',
+		'minimum_php_version' => '7.0',
+		'minimum_wp_version'  => '5.1',
+		'version'             => '1.0.0',
+	] )->get( __FILE__ );
+}
+
+//set up handler
+batch_task_handler();
+
+// Enqueue scripts and styles to batch task.
+Underpin::attach( 'setup', new \Underpin\Factories\Observer( 'batch_tasks', [
+	'update' => function ( Underpin $plugin ) {
+
+		// Register core-specific items.
+		if ( $plugin->file() === __FILE__ ) {
+			$dir_url = plugin_dir_url( __FILE__ );
+
+			// Register the batch JS
+			$plugin->scripts()->add( 'batch', [
+				'class' => 'Underpin\Scripts\Factories\Script_Instance',
+				'args'  => [
+					[
+						'handle'      => 'underpin_batch',
+						'deps'        => [ 'jquery' ],
+						'description' => 'Script that handles batch tasks.',
+						'name'        => "Batch Task Runner Script",
+						'in_footer'   => true,
+						'src'         => $plugin->url() . 'assets/js/build/batch.min.js',
+						'version'     => '1.0.0',
+					],
+				],
+			] );
+
+			// Localize the ajax URL on the batch JS, if it was registered successfully.
+			if ( ! is_wp_error( $plugin->scripts()->get( 'batch' ) ) ) {
+				$plugin->scripts()->get( 'batch' )->set_param( 'ajaxUrl', admin_url( 'admin-ajax.php' ) );
+			}
+
+			// Register the batch stylesheet
+			$plugin->styles()->add( 'batch', [
+				'class' => 'Underpin\Styles\Factories\Style_Instance',
+				'args'  => [
+					[
+						'handle'      => 'underpin_batch',
+						'description' => 'Styles for batch tasks.',
+						'name'        => "Batch Task Runner Styles",
+						'src'         => $dir_url . 'assets/css/build/batchStyle.min.css',
+					],
+				],
+			] );
+		}
+	}
+] ) );
+
+// Add this loader.
+Underpin::attach( 'setup', new \Underpin\Factories\Observers\Loader( 'batch_tasks', [
+	'class' => 'Underpin\Batch_Tasks\Loaders\Batch_Tasks',
+] ) );

bootstrap.php

@@ -15,8 +15,9 @@
     "underpin/style-loader": "^1.0"
   },
   "autoload": {
+    "psr-4": {"Underpin\\Batch_Tasks\\":  "lib/"},
     "files": [
-      "batch-tasks.php"
+      "bootstrap.php"
     ]
   }
 }

composer.json

@@ -7,12 +7,14 @@
  */
 
 
-namespace Underpin_Batch_Tasks\Abstracts;
+namespace Underpin\Batch_Tasks\Abstracts;
 
 
+use Underpin\Loaders\Logger;
 use Underpin\Traits\Templates;
 use WP_Error;
-use function Underpin\underpin;
+use function Underpin\Batch_Tasks\batch_task_handler;
+
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
@@ -180,7 +182,7 @@ public function run( $current_tally ) {
 
 				$this->finish_process( $current_tally );
 
-				underpin()->logger()->log(
+				Logger::log(
 					'notice',
 					'batch_action_complete',
 					'The batch action called ' . $this->name . ' is complete.',
@@ -193,12 +195,12 @@ public function run( $current_tally ) {
 			$status = $this->task( $current_tally, $i );
 
 			if ( is_wp_error( $status ) ) {
-				underpin()->logger()->log_wp_error( 'batch_error', $status );
+				Logger::log_wp_error( 'batch_error', $status );
 
 				// Bail early if we're supposed to stop when an error occurs.
 				if ( true === $this->stop_on_error ) {
 
-					underpin()->logger()->log(
+					Logger::log(
 						'warning',
 						'batch_action_stopped_early',
 						'The batch action called ' . $this->name . ' stopped early because of an error.',
@@ -240,7 +242,7 @@ protected function is_done( $current_tally ) {
 	protected function is_valid() {
 
 		if ( ! current_user_can( $this->capability ) ) {
-			return underpin()->logger()->log_as_error(
+			return Logger::log_as_error(
 				'batch_error',
 				'batch_task_invalid_user_permissions',
 				'The specified user does not have the permission to run this task'
@@ -280,16 +282,16 @@ public function render_callback() {
 
 			$batch_params = [ 'total_items' => $this->total_items ];
 
-			underpin()->scripts()->set_param( 'batch', $this->batch_id, $batch_params );
-			underpin()->scripts()->enqueue( 'batch' );
-			underpin()->styles()->enqueue( 'batch' );
+			batch_task_handler()->scripts()->set_param( 'batch', $this->batch_id, $batch_params );
+			batch_task_handler()->scripts()->enqueue( 'batch' );
+			batch_task_handler()->styles()->enqueue( 'batch' );
 			echo $this->get_template( 'notice', [
 				'batch_id'    => $this->batch_id,
 				'message'     => $this->notice_message,
 				'button_text' => $this->button_text,
 			] );
 
-			underpin()->logger()->log(
+			Logger::log(
 				'notice',
 				'batch_task_enqueued',
 				'A batch task was enqueued.',

lib/abstracts/Batch_Task.php lib/Abstracts/Batch_Task.phplib/abstracts/Batch_Task.php renamed to lib/Abstracts/Batch_Task.php

@@ -7,10 +7,10 @@
  */
 
 
-namespace Underpin_Batch_Tasks\Factories;
+namespace Underpin\Batch_Tasks\Factories;
 
 
-use Underpin_Batch_Tasks\Abstracts\Batch_Task;
+use Underpin\Batch_Tasks\Abstracts\Batch_Task;
 use Underpin\Traits\Instance_Setter;
 
 if ( ! defined( 'ABSPATH' ) ) {

lib/factories/Batch_Task_Instance.php lib/Factories/Batch_Task_Instance.phplib/factories/Batch_Task_Instance.php renamed to lib/Factories/Batch_Task_Instance.php

@@ -7,12 +7,13 @@
  */
 
 
-namespace Underpin_Batch_Tasks\Loaders;
+namespace Underpin\Batch_Tasks\Loaders;
 
 use Underpin\Abstracts\Registries\Object_Registry;
-use Underpin_Batch_Tasks\Abstracts\Batch_Task;
+use Underpin\Loaders\Logger;
+use Underpin\Batch_Tasks\Abstracts\Batch_Task;
 use WP_Error;
-use function Underpin\underpin;
+
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
@@ -30,9 +31,9 @@ class Batch_Tasks extends Object_Registry {
 	/**
 	 * @inheritDoc
 	 */
-	protected $abstraction_class = 'Underpin_Batch_Tasks\Abstracts\Batch_Task';
+	protected $abstraction_class = 'Underpin\Batch_Tasks\Abstracts\Batch_Task';
 
-	protected $default_factory = 'Underpin_Batch_Tasks\Factories\Batch_Task_Instance';
+	protected $default_factory = 'Underpin\Batch_Tasks\Factories\Batch_Task_Instance';
 
 	/**
 	 * @inheritDoc
@@ -63,7 +64,7 @@ public function enqueue( $key ) {
 		$batch_task = $this->get( $key );
 
 		if ( is_wp_error( $batch_task ) ) {
-			underpin()->logger()->log_wp_error( 'error', $batch_task );
+			Logger::log_wp_error( 'error', $batch_task );
 
 			return $batch_task;
 		}

lib/loaders/Batch_Tasks.php lib/Loaders/Batch_Tasks.phplib/loaders/Batch_Tasks.php renamed to lib/Loaders/Batch_Tasks.php

@@ -11,7 +11,7 @@
 	exit;
 }
 
-if ( ! isset( $template ) || ! $template instanceof Underpin_Batch_Tasks\Abstracts\Batch_Task ) {
+if ( ! isset( $template ) || ! $template instanceof Underpin\Batch_Tasks\Abstracts\Batch_Task ) {
 	return;
 }