Corrects composer.json

bootstrap.php

@@ -0,0 +1,11 @@
+<?php
+
+use Underpin\Abstracts\Underpin;
+use Underpin\Factories\Observers\Loader;
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+// Add this loader.
+Underpin::attach( 'setup', new Loader('templates', [ 'class' => 'Underpin\Templates\Loaders\Templates' ] ) );

composer.json

@@ -9,9 +9,13 @@
       "email": "[email protected]"
     }
   ],
+  "require": {
+    "underpin/underpin": "^2.0"
+  },
   "autoload": {
+    "psr-4": {"Underpin\\Templates\\":  "lib/"},
     "files": [
-      "templates.php"
+      "bootstrap.php"
     ]
   }
 }

lib/abstracts/Template.php → lib/Abstracts/Template.php

@@ -6,7 +6,7 @@
  * @package
  */
 
-namespace Underpin_Templates\Abstracts;
+namespace Underpin\Templates\Abstracts;
 
 use Underpin\Traits\Templates;
 use Underpin\Factories\Registry;

lib/factories/Template_Instance.php → lib/Factories/Template_Instance.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Underpin_Templates\Factories;
+namespace Underpin\Templates\Factories;
 
-use Underpin_Templates\Abstracts\Template;
+use Underpin\Templates\Abstracts\Template;
 use Underpin\Traits\Instance_Setter;
 
 if ( ! defined( 'ABSPATH' ) ) {

lib/loaders/Templates.php → lib/Loaders/Templates.php

@@ -6,11 +6,11 @@
  * @package
  */
 
-namespace Underpin_Templates\Loaders;
+namespace Underpin\Templates\Loaders;
 
-use Underpin_Templates\Abstracts\Template;
+use Underpin\Loaders\Logger;
+use Underpin\Templates\Abstracts\Template;
 use Underpin\Abstracts\Registries\Object_Registry;
-use function Underpin\underpin;
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
@@ -33,9 +33,9 @@ class Templates extends Object_Registry {
 	 * @since 1.0.0
 	 * @var string The name of the abstract class this service locator uses.
 	 */
-	protected $abstraction_class = 'Underpin_Templates\Abstracts\Template';
+	protected $abstraction_class = 'Underpin\Templates\Abstracts\Template';
 
-	protected $default_factory = 'Underpin_Templates\Factories\Template_Instance';
+	protected $default_factory = 'Underpin\Templates\Factories\Template_Instance';
 
 	protected function set_default_items() {}
 
@@ -66,7 +66,7 @@ public function get_template( $key, $template, $params = [] ) {
 
 		// Validate the item didn't return a result.
 		if ( is_wp_error( $item ) ) {
-			underpin()->logger()->log_wp_error( 'error', $item );
+			Logger::log_wp_error( 'error', $item );
 
 			return '';
 		}