Simplify & fix RESTful unit tests

Author: jim-parry

system/RESTful/ResourceController.php

@@ -78,17 +78,7 @@ public function initController(RequestInterface $request, ResponseInterface $res
 		parent::initController($request, $response, $logger);
 
 		// instantiate our model, if needed
-		if (empty($this->model) && ! empty($this->modelName))
-		{
-			try
-			{
-				$this->model = new $this->modelName;
-			}
-			catch (\Exception $e)
-			{
-				// ignored. we just don't use a model for now
-			}
-		}
+		$this->setModel($this->modelName);
 	}
 
 	//--------------------------------------------------------------------
@@ -166,15 +156,17 @@ public function delete($id = null)
 	//--------------------------------------------------------------------
 
 	/**
-	 * Set or change the model this controller is bound to
+	 * Set or change the model this controller is bound to.
+	 * Given either the name or the object, determine the other.
 	 *
-	 * @param string|\CodeIgniter\Model $which
+	 * @param string|object $which
 	 */
 	public function setModel($which = null)
 	{
+		// save what we have been given
 		if (! empty($which))
 		{
-			if ($which instanceof \CodeIgniter\Model)
+			if (is_object($which))
 			{
 				$this->model = $which;
 			}
@@ -183,6 +175,21 @@ public function setModel($which = null)
 				$this->modelName = $which;
 			}
 		}
+
+		// make a model object if needed
+		if (empty($this->model) && ! empty($this->modelName))
+		{
+			if (class_exists($this->modelName))
+			{
+				$this->model = new $this->modelName;
+			}
+		}
+
+		// determine model name if needed
+		if (empty($this->modelName) && ! empty($this->model))
+		{
+			$this->modelName = get_class($this->model);
+		}
 	}
 
 	/**

system/RESTful/ResourcePresenter.php

@@ -37,7 +37,6 @@
 
 namespace CodeIgniter\RESTful;
 
-use CodeIgniter\API\ResponseTrait;
 use CodeIgniter\Controller;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
@@ -70,17 +69,7 @@ public function initController(RequestInterface $request, ResponseInterface $res
 		parent::initController($request, $response, $logger);
 
 		// instantiate our model, if needed
-		if (! empty($this->modelName))
-		{
-			try
-			{
-				$this->model = $this->modelName();
-			}
-			catch (\Exception $e)
-			{
-				// ignored. we just own't use a model for now
-			}
-		}
+		$this->setModel($this->modelName);
 	}
 
 	//--------------------------------------------------------------------
@@ -118,7 +107,8 @@ public function new()
 	}
 
 	/**
-	 * Process the creation/insertion of a new resource object
+	 * Process the creation/insertion of a new resource object.
+	 * This should be a POST.
 	 *
 	 * @return string
 	 */
@@ -161,7 +151,8 @@ public function edit($id = null)
 	}
 
 	/**
-	 * Process the updating, full or partial, of a specific resource object
+	 * Process the updating, full or partial, of a specific resource object.
+	 * This should be a POST.
 	 *
 	 * @param  type $id
 	 * @return string
@@ -174,13 +165,40 @@ public function update($id = null)
 	//--------------------------------------------------------------------
 
 	/**
-	 * Set/change the model that this controller is bound to
+	 * Set or change the model this controller is bound to.
+	 * Given either the name or the object, determine the other.
 	 *
-	 * @param type $which
+	 * @param string|object $which
 	 */
 	public function setModel($which = null)
 	{
-		$this->model = $model;
+		// save what we have been given
+		if (! empty($which))
+		{
+			if (is_object($which))
+			{
+				$this->model = $which;
+			}
+			else
+			{
+				$this->modelName = $which;
+			}
+		}
+
+		// make a model object if needed
+		if (empty($this->model) && ! empty($this->modelName))
+		{
+			if (class_exists($this->modelName))
+			{
+				$this->model = new $this->modelName;
+			}
+		}
+
+		// determine model name if needed
+		if (empty($this->modelName) && ! empty($this->model))
+		{
+			$this->modelName = get_class($this->model);
+		}
 	}
 
 }

tests/_support/RESTful/MockResourceController.php

@@ -0,0 +1,24 @@
+<?php
+namespace Tests\Support\RESTful;
+
+use CodeIgniter\RESTful\ResourceController;
+
+class MockResourceController extends ResourceController
+{
+
+	public function getModel()
+	{
+		return $this->model;
+	}
+
+	public function getModelName()
+	{
+		return $this->modelName;
+	}
+
+	public function getFormat()
+	{
+		return $this->format;
+	}
+
+}