From b2e10b7de0d8979ce19fed5859e696904e2923dd Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Sun, 27 May 2012 15:31:53 +0700
Subject: Adding more flexibilities to mock-common

---
 tests/mocks/core/common.php | 167 +++++++++++++++++++++++++++-----------------
 1 file changed, 103 insertions(+), 64 deletions(-)

(limited to 'tests/mocks/core')

diff --git a/tests/mocks/core/common.php b/tests/mocks/core/common.php
index fc94d7fff..e74576626 100644
--- a/tests/mocks/core/common.php
+++ b/tests/mocks/core/common.php
@@ -2,53 +2,65 @@
 
 // Set up the global CI functions in their most minimal core representation
 
-function &get_instance() 
+if ( ! function_exists('get_instance'))
 {
-	$test = CI_TestCase::instance();
-	$instance = $test->ci_instance();
-	return $instance;
+	function &get_instance() 
+	{
+		$test = CI_TestCase::instance();
+		$instance = $test->ci_instance();
+		return $instance;
+	}
 }
 
 // --------------------------------------------------------------------
 
-function &get_config() {
-	$test = CI_TestCase::instance();
-	$config = $test->ci_get_config();
-		
-	return $config;
+if ( ! function_exists('get_config'))
+{
+	function &get_config() {
+		$test = CI_TestCase::instance();
+		$config = $test->ci_get_config();
+			
+		return $config;
+	}
 }
 
-function config_item($item)
+if ( ! function_exists('config_item'))
 {
-	$config =& get_config();
-	
-	if ( ! isset($config[$item]))
+	function config_item($item)
 	{
-		return FALSE;
+		$config =& get_config();
+		
+		if ( ! isset($config[$item]))
+		{
+			return FALSE;
+		}
+		
+		return $config[$item];
 	}
-	
-	return $config[$item];
 }
 
 // --------------------------------------------------------------------
 
-function load_class($class, $directory = 'libraries', $prefix = 'CI_')
+if ( ! function_exists('load_class'))
 {
-	if ($directory != 'core' OR $prefix != 'CI_')
-	{
-		throw new Exception('Not Implemented: Non-core load_class()');
-	}
-	
-	$test = CI_TestCase::instance();
-	
-	$obj =& $test->ci_core_class($class);
-	
-	if (is_string($obj))
+	function load_class($class, $directory = 'libraries', $prefix = 'CI_')
 	{
-		throw new Exception('Bad Isolation: Use ci_set_core_class to set '.$class.'');
+		if ($directory != 'core' OR $prefix != 'CI_')
+		{
+			throw new Exception('Not Implemented: Non-core load_class()');
+		}
+		
+		$test = CI_TestCase::instance();
+		
+		$obj =& $test->ci_core_class($class);
+		
+		if (is_string($obj))
+		{
+			throw new Exception('Bad Isolation: Use ci_set_core_class to set '.$class.'');
+		}
+		
+		return $obj;
 	}
-	
-	return $obj;
 }
 
 // This is sort of meh. Should probably be mocked up with
@@ -57,76 +69,103 @@ function load_class($class, $directory = 'libraries', $prefix = 'CI_')
 // bootstrap testsuite.
 // --------------------------------------------------------------------
 
-function remove_invisible_characters($str, $url_encoded = TRUE)
+if ( ! function_exists('remove_invisible_characters'))
 {
-	$non_displayables = array();
-	
-	// every control character except newline (dec 10)
-	// carriage return (dec 13), and horizontal tab (dec 09)
-	
-	if ($url_encoded)
+	function remove_invisible_characters($str, $url_encoded = TRUE)
 	{
-		$non_displayables[] = '/%0[0-8bcef]/';	// url encoded 00-08, 11, 12, 14, 15
-		$non_displayables[] = '/%1[0-9a-f]/';	// url encoded 16-31
-	}
-	
-	$non_displayables[] = '/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+/S';	// 00-08, 11, 12, 14-31, 127
+		$non_displayables = array();
+		
+		// every control character except newline (dec 10)
+		// carriage return (dec 13), and horizontal tab (dec 09)
+		
+		if ($url_encoded)
+		{
+			$non_displayables[] = '/%0[0-8bcef]/';	// url encoded 00-08, 11, 12, 14, 15
+			$non_displayables[] = '/%1[0-9a-f]/';	// url encoded 16-31
+		}
+		
+		$non_displayables[] = '/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+/S';	// 00-08, 11, 12, 14-31, 127
 
-	do
-	{
-		$str = preg_replace($non_displayables, '', $str, -1, $count);
-	}
-	while ($count);
+		do
+		{
+			$str = preg_replace($non_displayables, '', $str, -1, $count);
+		}
+		while ($count);
 
-	return $str;
+		return $str;
+	}
 }
 
 
 // Clean up error messages
 // --------------------------------------------------------------------
 
-function show_error($message, $status_code = 500, $heading = 'An Error Was Encountered')
+if ( ! function_exists('show_error'))
 {
-	throw new RuntimeException('CI Error: '.$message);
+	function show_error($message, $status_code = 500, $heading = 'An Error Was Encountered')
+	{
+		throw new RuntimeException('CI Error: '.$message);
+	}
 }
 
-function show_404($page = '', $log_error = TRUE)
+if ( ! function_exists('show_404'))
 {
-	throw new RuntimeException('CI Error: 404');
+	function show_404($page = '', $log_error = TRUE)
+	{
+		throw new RuntimeException('CI Error: 404');
+	}
 }
 
-function _exception_handler($severity, $message, $filepath, $line)
+if ( ! function_exists('_exception_handler'))
 {
-	throw new RuntimeException('CI Exception: '.$message.' | '.$filepath.' | '.$line);
+	function _exception_handler($severity, $message, $filepath, $line)
+	{
+		throw new RuntimeException('CI Exception: '.$message.' | '.$filepath.' | '.$line);
+	}
 }
 
 
 // We assume a few things about our environment ...
 // --------------------------------------------------------------------
 
-function is_php($version = '5.0.0')
+if ( ! function_exists('is_php'))
 {
-	return ! (version_compare(PHP_VERSION, $version) < 0);
+	function is_php($version = '5.0.0')
+	{
+		return ! (version_compare(PHP_VERSION, $version) < 0);
+	}
 }
 
-function is_really_writable($file)
+if ( ! function_exists('is_really_writable'))
 {
-	return is_writable($file);
+	function is_really_writable($file)
+	{
+		return is_writable($file);
+	}
 }
 
-function is_loaded()
+if ( ! function_exists('is_loaded'))
 {
-	throw new Exception('Bad Isolation: mock up environment');
+	function is_loaded()
+	{
+		throw new Exception('Bad Isolation: mock up environment');
+	}
 }
 
-function log_message($level = 'error', $message, $php_error = FALSE)
+if ( ! function_exists('log_message'))
 {
-	return TRUE;
+	function log_message($level = 'error', $message, $php_error = FALSE)
+	{
+		return TRUE;
+	}
 }
 
-function set_status_header($code = 200, $text = '')
+if ( ! function_exists('set_status_header'))
 {
-	return TRUE;
+	function set_status_header($code = 200, $text = '')
+	{
+		return TRUE;
+	}
 }
 
 // EOF
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From d6d1150959c95e43d310d0bc45f8bd674ff6460c Mon Sep 17 00:00:00 2001
From: Alex Bilbie <alex@alexbilbie.com>
Date: Sat, 2 Jun 2012 11:12:55 +0100
Subject: Replaced `==` with `===` and `!=` with `!==` in /tests

---
 tests/mocks/core/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/mocks/core')

diff --git a/tests/mocks/core/common.php b/tests/mocks/core/common.php
index e74576626..e1c493aa0 100644
--- a/tests/mocks/core/common.php
+++ b/tests/mocks/core/common.php
@@ -45,7 +45,7 @@ if ( ! function_exists('load_class'))
 {
 	function load_class($class, $directory = 'libraries', $prefix = 'CI_')
 	{
-		if ($directory != 'core' OR $prefix != 'CI_')
+		if ($directory !== 'core' OR $prefix !== 'CI_')
 		{
 			throw new Exception('Not Implemented: Non-core load_class()');
 		}
-- 
cgit v1.2.3-24-g4f1b


From f243ce13b4baf5bf8bebf36586514bb243dfc355 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Sat, 9 Jun 2012 23:34:21 +0300
Subject: Cleanup/optimize tests/mocks/

---
 tests/mocks/core/common.php   | 36 ++++++++++++++++--------------------
 tests/mocks/core/input.php    |  6 +++---
 tests/mocks/core/loader.php   |  7 ++++---
 tests/mocks/core/security.php |  2 +-
 tests/mocks/core/uri.php      |  9 +++++----
 tests/mocks/core/utf8.php     | 11 +++++------
 6 files changed, 34 insertions(+), 37 deletions(-)

(limited to 'tests/mocks/core')

diff --git a/tests/mocks/core/common.php b/tests/mocks/core/common.php
index e1c493aa0..8466e47f8 100644
--- a/tests/mocks/core/common.php
+++ b/tests/mocks/core/common.php
@@ -4,11 +4,10 @@
 
 if ( ! function_exists('get_instance'))
 {
-	function &get_instance() 
+	function &get_instance()
 	{
 		$test = CI_TestCase::instance();
-		$instance = $test->ci_instance();
-		return $instance;
+		return $test->ci_instance();
 	}
 }
 
@@ -16,11 +15,10 @@ if ( ! function_exists('get_instance'))
 
 if ( ! function_exists('get_config'))
 {
-	function &get_config() {
+	function &get_config()
+	{
 		$test = CI_TestCase::instance();
-		$config = $test->ci_get_config();
-			
-		return $config;
+		return $test->ci_get_config();
 	}
 }
 
@@ -29,12 +27,12 @@ if ( ! function_exists('config_item'))
 	function config_item($item)
 	{
 		$config =& get_config();
-		
+
 		if ( ! isset($config[$item]))
 		{
 			return FALSE;
 		}
-		
+
 		return $config[$item];
 	}
 }
@@ -49,16 +47,16 @@ if ( ! function_exists('load_class'))
 		{
 			throw new Exception('Not Implemented: Non-core load_class()');
 		}
-		
+
 		$test = CI_TestCase::instance();
-		
+
 		$obj =& $test->ci_core_class($class);
-		
+
 		if (is_string($obj))
 		{
-			throw new Exception('Bad Isolation: Use ci_set_core_class to set '.$class.'');
+			throw new Exception('Bad Isolation: Use ci_set_core_class to set '.$class);
 		}
-		
+
 		return $obj;
 	}
 }
@@ -74,16 +72,16 @@ if ( ! function_exists('remove_invisible_characters'))
 	function remove_invisible_characters($str, $url_encoded = TRUE)
 	{
 		$non_displayables = array();
-		
+
 		// every control character except newline (dec 10)
 		// carriage return (dec 13), and horizontal tab (dec 09)
-		
+
 		if ($url_encoded)
 		{
 			$non_displayables[] = '/%0[0-8bcef]/';	// url encoded 00-08, 11, 12, 14, 15
 			$non_displayables[] = '/%1[0-9a-f]/';	// url encoded 16-31
 		}
-		
+
 		$non_displayables[] = '/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+/S';	// 00-08, 11, 12, 14-31, 127
 
 		do
@@ -166,6 +164,4 @@ if ( ! function_exists('set_status_header'))
 	{
 		return TRUE;
 	}
-}
-
-// EOF
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/tests/mocks/core/input.php b/tests/mocks/core/input.php
index 8a337d2ef..2a4aa4997 100644
--- a/tests/mocks/core/input.php
+++ b/tests/mocks/core/input.php
@@ -1,10 +1,10 @@
 <?php
 
 class Mock_Core_Input extends CI_Input {
-	
+
 	/**
-	 * Since we use GLOBAL to fetch Security and Utf8 classes, 
-	 * we need to use inversion of control to mock up 
+	 * Since we use GLOBAL to fetch Security and Utf8 classes,
+	 * we need to use inversion of control to mock up
 	 * the same process within CI_Input class constructor.
 	 *
 	 * @covers CI_Input::__construct()
diff --git a/tests/mocks/core/loader.php b/tests/mocks/core/loader.php
index d4b29bb3d..53d88d55b 100644
--- a/tests/mocks/core/loader.php
+++ b/tests/mocks/core/loader.php
@@ -1,7 +1,7 @@
 <?php
 
 class Mock_Core_Loader extends CI_Loader {
-	
+
 	/**
 	 * Since we use paths to load up models, views, etc, we need the ability to
 	 * mock up the file system so when core tests are run, we aren't mucking
@@ -15,16 +15,17 @@ class Mock_Core_Loader extends CI_Loader {
 	{
 		vfsStreamWrapper::register();
 		vfsStreamWrapper::setRoot(new vfsStreamDirectory('application'));
-		
+
 		$this->models_dir 	= vfsStream::newDirectory('models')->at(vfsStreamWrapper::getRoot());
 		$this->libs_dir 	= vfsStream::newDirectory('libraries')->at(vfsStreamWrapper::getRoot());
 		$this->helpers_dir 	= vfsStream::newDirectory('helpers')->at(vfsStreamWrapper::getRoot());
 		$this->views_dir 	= vfsStream::newDirectory('views')->at(vfsStreamWrapper::getRoot());
-		
+
 		$this->_ci_ob_level  		= ob_get_level();
 		$this->_ci_library_paths	= array(vfsStream::url('application').'/', BASEPATH);
 		$this->_ci_helper_paths 	= array(vfsStream::url('application').'/', BASEPATH);
 		$this->_ci_model_paths 		= array(vfsStream::url('application').'/');
 		$this->_ci_view_paths 		= array(vfsStream::url('application').'/views/' => TRUE);
 	}
+
 }
\ No newline at end of file
diff --git a/tests/mocks/core/security.php b/tests/mocks/core/security.php
index d7ea0e6bd..e19a8b20b 100644
--- a/tests/mocks/core/security.php
+++ b/tests/mocks/core/security.php
@@ -1,7 +1,7 @@
 <?php
 
 class Mock_Core_Security extends CI_Security {
-	
+
 	public function csrf_set_cookie()
 	{
 		// We cannot set cookie in CLI mode, so for csrf test, who rely on $_COOKIE,
diff --git a/tests/mocks/core/uri.php b/tests/mocks/core/uri.php
index b6946091e..94f75df64 100644
--- a/tests/mocks/core/uri.php
+++ b/tests/mocks/core/uri.php
@@ -1,12 +1,12 @@
 <?php
 
 class Mock_Core_URI extends CI_URI {
-	
+
 	public function __construct()
 	{
 		$test = CI_TestCase::instance();
 		$cls =& $test->ci_core_class('cfg');
-		
+
 		// set predictable config values
 		$test->ci_set_config(array(
 			'index_page'		=> 'index.php',
@@ -14,12 +14,13 @@ class Mock_Core_URI extends CI_URI {
 			'subclass_prefix'	=> 'MY_'
 		));
 
-		$this->config = new $cls;	
+		$this->config = new $cls;
 
 	}
-	
+
 	protected function _is_cli_request()
 	{
 		return FALSE;
 	}
+
 }
\ No newline at end of file
diff --git a/tests/mocks/core/utf8.php b/tests/mocks/core/utf8.php
index b77d717e7..068e74ac1 100644
--- a/tests/mocks/core/utf8.php
+++ b/tests/mocks/core/utf8.php
@@ -1,27 +1,26 @@
 <?php
 
 class Mock_Core_Utf8 extends CI_Utf8 {
-	
+
 	/**
-	 * We need to define several constants as 
+	 * We need to define several constants as
 	 * the same process within CI_Utf8 class constructor.
 	 *
 	 * @covers CI_Utf8::__construct()
 	 */
 	public function __construct()
 	{
-		defined('UTF8_ENABLED') or define('UTF8_ENABLED', TRUE);
+		defined('UTF8_ENABLED') OR define('UTF8_ENABLED', TRUE);
 
 		if (extension_loaded('mbstring'))
 		{
-			defined('MB_ENABLED') or define('MB_ENABLED', TRUE);
+			defined('MB_ENABLED') OR define('MB_ENABLED', TRUE);
 			mb_internal_encoding('UTF-8');
 		}
 		else
 		{
-			defined('MB_ENABLED') or define('MB_ENABLED', FALSE);
+			defined('MB_ENABLED') OR define('MB_ENABLED', FALSE);
 		}
-		
 	}
 
 }
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 62fd52d3cfeea4a2ec73ac5b943e84eeb38953d2 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Sun, 10 Jun 2012 07:11:41 +0300
Subject: Revert a change in tests/mocks/core/common.php

---
 tests/mocks/core/common.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tests/mocks/core')

diff --git a/tests/mocks/core/common.php b/tests/mocks/core/common.php
index 8466e47f8..55506a1f6 100644
--- a/tests/mocks/core/common.php
+++ b/tests/mocks/core/common.php
@@ -18,7 +18,8 @@ if ( ! function_exists('get_config'))
 	function &get_config()
 	{
 		$test = CI_TestCase::instance();
-		return $test->ci_get_config();
+		$config = $test->ci_get_config();
+		return $config;
 	}
 }
 
-- 
cgit v1.2.3-24-g4f1b


From 36de42e4a6c1ef552be8b7b3cb0fb86a4363c7d6 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Sun, 10 Jun 2012 13:55:55 +0300
Subject: Revert a change in tests/mocks/core/common.php

---
 tests/mocks/core/common.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tests/mocks/core')

diff --git a/tests/mocks/core/common.php b/tests/mocks/core/common.php
index 55506a1f6..a655ee1db 100644
--- a/tests/mocks/core/common.php
+++ b/tests/mocks/core/common.php
@@ -7,7 +7,8 @@ if ( ! function_exists('get_instance'))
 	function &get_instance()
 	{
 		$test = CI_TestCase::instance();
-		return $test->ci_instance();
+		$test = $test->ci_instance();
+		return $test;
 	}
 }
 
-- 
cgit v1.2.3-24-g4f1b


From 0c886901bc013e477b8c5eb9bc5e60c91d1fac56 Mon Sep 17 00:00:00 2001
From: Alex Bilbie <alex@alexbilbie.com>
Date: Wed, 29 Aug 2012 23:23:22 +0100
Subject: Added lang mock and upload mock

---
 tests/mocks/core/lang.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 tests/mocks/core/lang.php

(limited to 'tests/mocks/core')

diff --git a/tests/mocks/core/lang.php b/tests/mocks/core/lang.php
new file mode 100644
index 000000000..1b99aedb3
--- /dev/null
+++ b/tests/mocks/core/lang.php
@@ -0,0 +1,15 @@
+<?php
+
+class Mock_Core_Lang extends CI_Lang {
+
+	function line($line = '')
+	{
+		return FALSE;
+	}
+
+	function load($langfile, $idiom = '', $return = false, $add_suffix = true, $alt_path = '')
+	{
+		return;
+	}
+
+}
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b