Merge commit 'c85af70'

bootstrap.php

@@ -0,0 +1,13 @@
+<?php
+
+use Underpin\Abstracts\Underpin;
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+// Add this loader.
+Underpin::attach( 'setup', new \Underpin\Factories\Observers\Loader( 'rest_endpoints', [
+	'instance' => 'Underpin\Rest_Endpoints\Abstracts\Rest_Endpoint',
+	'default'  => 'Underpin\Rest_Endpoints\Factories\Rest_Endpoint_Instance',
+] ) );

composer.json

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

Rest_Endpoint.php → lib/Abstracts/Rest_Endpoint.php

@@ -6,11 +6,12 @@
  * @package Underpin\Abstracts
  */
 
-namespace Underpin_Rest_Endpoints\Abstracts;
+namespace Underpin\Rest_Endpoints\Abstracts;
 
+use Underpin\Loaders\Logger;
 use Underpin\Traits\Feature_Extension;
 use WP_REST_Request;
-use function Underpin\underpin;
+
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
@@ -23,7 +24,7 @@
  *
  * @package Underpin\Abstracts
  */
-abstract class Rest_Endpoint {
+abstract class Rest_Endpoint extends \WP_REST_Controller {
 	use Feature_Extension;
 
 	/**
@@ -85,14 +86,14 @@ public function register() {
 		$registered = register_rest_route( $this->rest_namespace, $this->route, $this->args );
 
 		if ( false === $registered ) {
-			underpin()->logger()->log(
+			Logger::log(
 				'error',
 				'rest_route_was_not_registered',
 				'The rest route ' . $this->route . ' was not registered. There is probably a __doing_it_wrong notice explaining this further.',
 				[ 'route' => $this->route, 'namespace' => $this->rest_namespace, 'args' => $this->args ]
 			);
 		} else {
-			underpin()->logger()->log(
+			Logger::log(
 				'notice',
 				'rest_route_registered',
 				'The rest route ' . $this->route . ' was registered successfully',

Rest_Endpoint_Instance.php → lib/Factories/Rest_Endpoint_Instance.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Underpin_Rest_Endpoints\Factories;
+namespace Underpin\Rest_Endpoints\Factories;
 
 
 use Underpin\Traits\Instance_Setter;
-use Underpin_Rest_Endpoints\Abstracts\Rest_Endpoint;
+use Underpin\Rest_Endpoints\Abstracts\Rest_Endpoint;
 use WP_REST_Request;
 
 if ( ! defined( 'ABSPATH' ) ) {