Merge branch 'release/1.1.0'

Underpin-WP · Nov 23, 2021 · ff23c6d · ff23c6d
2 parents 371a746 + 523d2d4
commit ff23c6d
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 25 deletions.
diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
     }
   ],
   "require": {
-    "underpin/logger-loader": "^2.0"
+    "underpin/underpin": "^2.0"
   },
   "autoload": {
     "files": [

diff --git a/index.php b/index.php
@@ -1,18 +1,22 @@
 <?php
+
+use Underpin\Abstracts\Underpin;
+
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
 // Add this loader.
-add_action( 'underpin/before_setup', function ( $file, $class ) {
-
+Underpin::attach( 'setup', new \Underpin\Factories\Observer( 'widgets', [
+	'update' => function ( Underpin $plugin, $args ) {
 	if ( ! defined( 'UNDERPIN_WIDGETS_ROOT_DIR' ) ) {
 		define( 'UNDERPIN_WIDGETS_ROOT_DIR', plugin_dir_path( __FILE__ ) );
 	}
 	require_once( UNDERPIN_WIDGETS_ROOT_DIR . 'lib/abstracts/Widget.php' );
 	require_once( UNDERPIN_WIDGETS_ROOT_DIR . 'lib/loaders/Widgets.php' );
 	require_once( UNDERPIN_WIDGETS_ROOT_DIR . 'lib/factories/Widget_Instance.php' );
-	Underpin\underpin()->get( $file, $class )->loaders()->add( 'widgets', [
-		'registry' => 'Underpin_Widgets\Loaders\Widgets',
+	$plugin->loaders()->add( 'widgets', [
+		'class' => 'Underpin\Widgets\Loaders\Widgets',
 	] );
-}, 10, 2 );
+	},
+] ) );
diff --git a/lib/abstracts/Widget.php b/lib/abstracts/Widget.php
@@ -7,13 +7,12 @@
  */
 
 
-namespace Underpin_Widgets\Abstracts;
+namespace Underpin\Widgets\Abstracts;
 
 
 use Underpin\Abstracts\Settings_Field;
-use Underpin\Traits\Feature_Extension;
-use Underpin\Traits\Underpin_Templates;
-use function Underpin\underpin;
+use Underpin\Traits\Underpin\Templates;
+use Underpin\Loaders\Logger;
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
@@ -27,7 +26,7 @@
  * @package Underpin\Abstracts
  */
 abstract class Widget extends \WP_Widget {
-	use Underpin_Templates;
+	use Underpin\Templates;
 
 	public $description = '';
 
@@ -45,7 +44,7 @@ public function __construct() {
 	 * @inheritDoc
 	 */
 	public function widget( $args, $instance ) {
-		underpin()->logger()->log(
+		Logger::log(
 			'error',
 			'widget_not_set',
 			'The widget ' . $this->name . ' must extend extend the widget method.'
@@ -72,7 +71,7 @@ public function form( $instance ) {
 		$fields = $this->get_fields( $instance );
 		// If something went wrong, log and return.
 		if ( is_wp_error( $fields ) ) {
-			underpin()->logger()->log_wp_error(
+			Logger::log_wp_error(
 				'error',
 				$fields
 			);
@@ -96,7 +95,7 @@ public function update( $new, $old ) {
 
 		// If something went wrong, log and return.
 		if ( is_wp_error( $fields ) ) {
-			underpin()->logger()->log_wp_error(
+			Logger::log_wp_error(
 				'error',
 				$fields
 			);
@@ -123,7 +122,7 @@ public function update( $new, $old ) {
 		}
 
 		if ( $errors->has_errors() ) {
-			underpin()->logger()->log(
+			Logger::log(
 				'error',
 				'failed_to_save_widget_settings',
 				'Failed to save widget settings',

diff --git a/lib/factories/Widget_Instance.php b/lib/factories/Widget_Instance.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Underpin_Widgets\Factories;
+namespace Underpin\Widgets\Factories;
 
 
 use Underpin\Traits\Instance_Setter;
-use Underpin_Widgets\Abstracts\Widget;
+use Underpin\Widgets\Abstracts\Widget;
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;

diff --git a/lib/loaders/Widgets.php b/lib/loaders/Widgets.php
@@ -1,15 +1,16 @@
 <?php
 
-namespace Underpin_Widgets\Loaders;
+namespace Underpin\Widgets\Loaders;
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
-use Underpin\Abstracts\Registries\Loader_Registry;
+use Underpin\Abstracts\Registries\Object_Registry;
+use Underpin\Loaders\Logger;
 use WP_Error;
 use WP_Widget;
-use function Underpin\underpin;
+
 
 /**
  * Class Widgets
@@ -18,14 +19,14 @@
  * @since   1.0.0
  * @package Underpin\Registries\Loaders
  */
-class Widgets extends Loader_Registry {
+class Widgets extends Object_Registry {
 
 	/**
 	 * @inheritDoc
 	 */
-	protected $abstraction_class = 'Underpin_Widgets\Abstracts\Widget';
+	protected $abstraction_class = 'Underpin\Widgets\Abstracts\Widget';
 
-	protected $default_factory = 'Underpin_Widgets\Factories\Widget_Instance';
+	protected $default_factory = 'Underpin\Widgets\Factories\Widget_Instance';
 
 	/**
 	 * @inheritDoc
@@ -42,7 +43,7 @@ public function add( $key, $value ) {
 		if ( true === $valid ) {
 			add_action( 'widgets_init', function () use ( $key ) {
 				register_widget( $this->get( $key ) );
-				underpin()->logger()->log(
+				Logger::log(
 					'notice',
 					'widget_registered_successfully',
 					'A widget was Was successfully registered.',

diff --git a/templates/widget/form.php b/templates/widget/form.php
@@ -11,7 +11,7 @@
 	exit;
 }
 
-if ( ! isset( $template ) || ! $template instanceof \Underpin_Widgets\Abstracts\Widget ) {
+if ( ! isset( $template ) || ! $template instanceof \Underpin\Widgets\Abstracts\Widget ) {
 	return;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ @@
     	exit;
     }
-    if ( ! isset( $template ) || ! $template instanceof \Underpin_Widgets\Abstracts\Widget ) {
+    if ( ! isset( $template ) || ! $template instanceof \Underpin\Widgets\Abstracts\Widget ) {
     	return;
     }
@@ Expand Down @@