Move Formatting functionality from API namespace to its own home now. F…

…ixes #451
codeigniter4 · Apr 3, 2017 · 78962ab · 78962ab
1 parent b3687c6
commit 78962ab
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/application/Config/API.php → application/Config/Format.php b/application/Config/API.php → application/Config/Format.php
@@ -2,7 +2,7 @@
 
 use CodeIgniter\Config\BaseConfig;
 
-class API extends BaseConfig
+class Format extends BaseConfig
 {
 	/*
 	|--------------------------------------------------------------------------
@@ -34,8 +34,8 @@ class API extends BaseConfig
 	|
 	*/
 	public $formatters = [
-		'application/json' => \CodeIgniter\API\JSONFormatter::class,
-		'application/xml'  => \CodeIgniter\API\XMLFormatter::class
+		'application/json' => \CodeIgniter\Format\JSONFormatter::class,
+		'application/xml'  => \CodeIgniter\Format\XMLFormatter::class
 	];
 
 	//--------------------------------------------------------------------

diff --git a/system/API/ResponseTrait.php b/system/API/ResponseTrait.php
@@ -36,6 +36,7 @@
  * @filesource
  */
 
+use Config\Format;
 use CodeIgniter\HTTP\Response;
 
 /**
@@ -332,7 +333,7 @@ protected function format($data = null)
 			return $data;
 		}
 
-		$config = new \Config\API();
+		$config = new Format();
 
 		// Determine correct response type through content negotiation
 		$format = $this->request->negotiate('media', $config->supportedResponseFormats);

diff --git a/system/API/FormatterInterface.php → system/Format/FormatterInterface.php b/system/API/FormatterInterface.php → system/Format/FormatterInterface.php
@@ -1,4 +1,4 @@
-<?php namespace CodeIgniter\API;
+<?php namespace CodeIgniter\Format;
 
 /**
  * CodeIgniter

diff --git a/system/API/JSONFormatter.php → system/Format/JSONFormatter.php b/system/API/JSONFormatter.php → system/Format/JSONFormatter.php
@@ -1,4 +1,4 @@
-<?php namespace CodeIgniter\API;
+<?php namespace CodeIgniter\Format;
 
 /**
  * CodeIgniter

diff --git a/system/API/XMLFormatter.php → system/Format/XMLFormatter.php b/system/API/XMLFormatter.php → system/Format/XMLFormatter.php
@@ -1,4 +1,4 @@
-<?php namespace CodeIgniter\API;
+<?php namespace CodeIgniter\Format;
 
 /**
  * CodeIgniter