Merge commit 'f1d215a'

bootstrap.php

@@ -0,0 +1,16 @@
+<?php
+
+use Underpin\Abstracts\Underpin;
+use Underpin\Factories\Observers\Loader;
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+define( 'UNDERPIN_ADMIN_NOTICES_ROOT_DIR', __DIR__ );
+
+// Add this loader.
+Underpin::attach( 'setup', new Loader( 'admin_notices', [
+	'instance' => 'Underpin\Admin_Notices\Abstracts\Admin_Notice',
+	'default'  => 'Underpin\Admin_Notices\Factories\Admin_Notice_Instance',
+] ) );

composer.json

@@ -10,11 +10,12 @@
     }
   ],
   "require": {
-    "underpin/logger-loader": "^2.0"
+    "underpin/underpin": "^2.0"
   },
   "autoload": {
+    "psr-4": {"Underpin\\Admin_Notices\\":  "lib/"},
     "files": [
-      "admin-notices.php"
+      "bootstrap.php"
     ]
   }
 }

lib/abstracts/Admin_Notice.php → lib/Abstracts/Admin_Notice.php

@@ -7,11 +7,11 @@
  */
 
 
-namespace Underpin_Admin_Notices\Abstracts;
+namespace Underpin\Admin_Notices\Abstracts;
 
+use Underpin\Loaders\Logger;
 use Underpin\Traits\Feature_Extension;
 use Underpin\Traits\Templates;
-use function Underpin\underpin;
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
@@ -60,7 +60,7 @@ public function render_callback() {
 		$should_display = $this->should_display();
 
 		if ( is_wp_error( $should_display ) ) {
-			underpin()->logger()->log_as_error(
+			Logger::log_as_error(
 				'notice',
 				'underpin_notice_did_not_display',
 				'A notice did not display.',
@@ -73,7 +73,7 @@ public function render_callback() {
 		$notice = $this->render_notice();
 
 		if ( is_wp_error( $notice ) ) {
-			underpin()->logger()->log_wp_error( 'warning', $notice );
+			Logger::log_wp_error( 'warning', $notice );
 
 			return;
 		}
@@ -145,7 +145,7 @@ protected function get_template_group() {
 	 * @inheritDoc
 	 */
 	protected function get_template_root_path() {
-		return UNDERPIN_ADMIN_NOTICES_ROOT_DIR . 'templates';
+		return UNDERPIN_ADMIN_NOTICES_ROOT_DIR . '/templates';
 	}
 
 }

lib/factories/Admin_Notice_Instance.php → lib/Factories/Admin_Notice_Instance.php

@@ -7,11 +7,11 @@
  */
 
 
-namespace Underpin_Admin_Notices\Factories;
+namespace Underpin\Admin_Notices\Factories;
 
 
 use Underpin\Traits\Instance_Setter;
-use Underpin_Admin_Notices\Abstracts\Admin_Notice;
+use Underpin\Admin_Notices\Abstracts\Admin_Notice;
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;

templates/admin-notice/notice.php

@@ -11,7 +11,7 @@
 	exit;
 }
 
-if ( ! isset( $template ) || ! $template instanceof Underpin_Admin_Notices\Abstracts\Admin_Notice ) {
+if ( ! isset( $template ) || ! $template instanceof Underpin\Admin_Notices\Abstracts\Admin_Notice ) {
 	return;
 }