Skip to content

Upgrade for CodeIgniter 2.1.3 and PHP 5.4 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HadrienMP wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Upgrade for CodeIgniter 2.1.3 and PHP 5.4 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
edb21c2
Upgrade for CodeIgniter 2.1.3 and PHP 5.4
HadrienMP Dec 2, 2013
30c0cbd
Brought into conformity with the original
HadrienMP Dec 2, 2013
eaec708
Brought into conformity with the original
HadrienMP Dec 2, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions application/controllers/test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,20 @@
* @copyright Copyright (C) 2010 Istvan Pusztai (twitter.com/istvanp)
**/

class Test extends Controller {
class Test extends CI_Controller {

var $timings = array();
var $tests = array();
private $timings = array();
private $tests = array();

/**
* Constructor function
*
* @return void
**/
function Test()
public function __construct()

{
parent::Controller();
parent::__construct();

// Set time marker for the start of the test suite
$this->benchmark->mark('first');
Expand All @@ -38,7 +39,7 @@ function Test()

// Disable database debugging so we can test all units without stopping
// at the first SQL error
$this->db->db_debug = FALSE;
// $this->db->db_debug = FALSE;

// Create list of tests
$this->_map_tests();
Expand Down Expand Up @@ -130,7 +131,7 @@ function user_model()
* @author Istvan Pusztai
* @return void
**/
function _remap()
public function _remap()
{
$view_data = array();
$action = $this->uri->rsegment(2);
Expand Down Expand Up @@ -220,7 +221,7 @@ function _remap()
* @author Istvan Pusztai
* @return void
**/
function _map_tests()
public function _map_tests()
{
$methods = get_class_methods($this);
natsort($methods);
Expand Down
0 system/language/english/unit_test_lang.php → ...ation/language/chinese/unit_test_lang.php
View file
Open in desktop
File renamed without changes.
27 changes: 27 additions & 0 deletions application/language/dutch/unit_test_lang.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?php

$lang['ut_test_name'] = 'Test Name';
$lang['ut_test_datatype'] = 'Test Datatype';
$lang['ut_test_value'] = 'Test Value';
$lang['ut_res_datatype'] = 'Expected Datatype';
$lang['ut_res_value'] = 'Expected Value';
$lang['ut_result'] = 'Result';
$lang['ut_undefined'] = 'Undefined Test Name';
$lang['ut_file'] = 'File Name';
$lang['ut_line'] = 'Line Number';
$lang['ut_passed'] = 'Passed';
$lang['ut_failed'] = 'Failed';
$lang['ut_boolean'] = 'Boolean';
$lang['ut_integer'] = 'Integer';
$lang['ut_float'] = 'Float';
$lang['ut_double'] = 'Float'; // can be the same as float
$lang['ut_string'] = 'String';
$lang['ut_array'] = 'Array';
$lang['ut_object'] = 'Object';
$lang['ut_resource'] = 'Resource';
$lang['ut_null'] = 'Null';
$lang['ut_res_sql_error'] = 'SQL Error';
$lang['ut_res_sql_query'] = 'SQL Query';

/* End of file unit_test_lang.php */
/* Location: ./system/language/english/unit_test_lang.php */
27 changes: 27 additions & 0 deletions application/language/english/unit_test_lang.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?php

$lang['ut_test_name'] = 'Test Name';
$lang['ut_test_datatype'] = 'Test Datatype';
$lang['ut_test_value'] = 'Test Value';
$lang['ut_res_datatype'] = 'Expected Datatype';
$lang['ut_res_value'] = 'Expected Value';
$lang['ut_result'] = 'Result';
$lang['ut_undefined'] = 'Undefined Test Name';
$lang['ut_file'] = 'File Name';
$lang['ut_line'] = 'Line Number';
$lang['ut_passed'] = 'Passed';
$lang['ut_failed'] = 'Failed';
$lang['ut_boolean'] = 'Boolean';
$lang['ut_integer'] = 'Integer';
$lang['ut_float'] = 'Float';
$lang['ut_double'] = 'Float'; // can be the same as float
$lang['ut_string'] = 'String';
$lang['ut_array'] = 'Array';
$lang['ut_object'] = 'Object';
$lang['ut_resource'] = 'Resource';
$lang['ut_null'] = 'Null';
$lang['ut_res_sql_error'] = 'SQL Error';
$lang['ut_res_sql_query'] = 'SQL Query';

/* End of file unit_test_lang.php */
/* Location: ./system/language/english/unit_test_lang.php */
27 changes: 27 additions & 0 deletions application/language/french/unit_test_lang.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?php

$lang['ut_test_name'] = 'Test Name';
$lang['ut_test_datatype'] = 'Test Datatype';
$lang['ut_test_value'] = 'Test Value';
$lang['ut_res_datatype'] = 'Expected Datatype';
$lang['ut_res_value'] = 'Expected Value';
$lang['ut_result'] = 'Result';
$lang['ut_undefined'] = 'Undefined Test Name';
$lang['ut_file'] = 'File Name';
$lang['ut_line'] = 'Line Number';
$lang['ut_passed'] = 'Passed';
$lang['ut_failed'] = 'Failed';
$lang['ut_boolean'] = 'Boolean';
$lang['ut_integer'] = 'Integer';
$lang['ut_float'] = 'Float';
$lang['ut_double'] = 'Float'; // can be the same as float
$lang['ut_string'] = 'String';
$lang['ut_array'] = 'Array';
$lang['ut_object'] = 'Object';
$lang['ut_resource'] = 'Resource';
$lang['ut_null'] = 'Null';
$lang['ut_res_sql_error'] = 'SQL Error';
$lang['ut_res_sql_query'] = 'SQL Query';

/* End of file unit_test_lang.php */
/* Location: ./system/language/english/unit_test_lang.php */
27 changes: 27 additions & 0 deletions application/language/german/unit_test_lang.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?php

$lang['ut_test_name'] = 'Test Name';
$lang['ut_test_datatype'] = 'Test Datatype';
$lang['ut_test_value'] = 'Test Value';
$lang['ut_res_datatype'] = 'Expected Datatype';
$lang['ut_res_value'] = 'Expected Value';
$lang['ut_result'] = 'Result';
$lang['ut_undefined'] = 'Undefined Test Name';
$lang['ut_file'] = 'File Name';
$lang['ut_line'] = 'Line Number';
$lang['ut_passed'] = 'Passed';
$lang['ut_failed'] = 'Failed';
$lang['ut_boolean'] = 'Boolean';
$lang['ut_integer'] = 'Integer';
$lang['ut_float'] = 'Float';
$lang['ut_double'] = 'Float'; // can be the same as float
$lang['ut_string'] = 'String';
$lang['ut_array'] = 'Array';
$lang['ut_object'] = 'Object';
$lang['ut_resource'] = 'Resource';
$lang['ut_null'] = 'Null';
$lang['ut_res_sql_error'] = 'SQL Error';
$lang['ut_res_sql_query'] = 'SQL Query';

/* End of file unit_test_lang.php */
/* Location: ./system/language/english/unit_test_lang.php */
27 changes: 27 additions & 0 deletions application/language/italian/unit_test_lang.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?php

$lang['ut_test_name'] = 'Test Name';
$lang['ut_test_datatype'] = 'Test Datatype';
$lang['ut_test_value'] = 'Test Value';
$lang['ut_res_datatype'] = 'Expected Datatype';
$lang['ut_res_value'] = 'Expected Value';
$lang['ut_result'] = 'Result';
$lang['ut_undefined'] = 'Undefined Test Name';
$lang['ut_file'] = 'File Name';
$lang['ut_line'] = 'Line Number';
$lang['ut_passed'] = 'Passed';
$lang['ut_failed'] = 'Failed';
$lang['ut_boolean'] = 'Boolean';
$lang['ut_integer'] = 'Integer';
$lang['ut_float'] = 'Float';
$lang['ut_double'] = 'Float'; // can be the same as float
$lang['ut_string'] = 'String';
$lang['ut_array'] = 'Array';
$lang['ut_object'] = 'Object';
$lang['ut_resource'] = 'Resource';
$lang['ut_null'] = 'Null';
$lang['ut_res_sql_error'] = 'SQL Error';
$lang['ut_res_sql_query'] = 'SQL Query';

/* End of file unit_test_lang.php */
/* Location: ./system/language/english/unit_test_lang.php */
27 changes: 27 additions & 0 deletions application/language/japanese/unit_test_lang.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?php

$lang['ut_test_name'] = 'Test Name';
$lang['ut_test_datatype'] = 'Test Datatype';
$lang['ut_test_value'] = 'Test Value';
$lang['ut_res_datatype'] = 'Expected Datatype';
$lang['ut_res_value'] = 'Expected Value';
$lang['ut_result'] = 'Result';
$lang['ut_undefined'] = 'Undefined Test Name';
$lang['ut_file'] = 'File Name';
$lang['ut_line'] = 'Line Number';
$lang['ut_passed'] = 'Passed';
$lang['ut_failed'] = 'Failed';
$lang['ut_boolean'] = 'Boolean';
$lang['ut_integer'] = 'Integer';
$lang['ut_float'] = 'Float';
$lang['ut_double'] = 'Float'; // can be the same as float
$lang['ut_string'] = 'String';
$lang['ut_array'] = 'Array';
$lang['ut_object'] = 'Object';
$lang['ut_resource'] = 'Resource';
$lang['ut_null'] = 'Null';
$lang['ut_res_sql_error'] = 'SQL Error';
$lang['ut_res_sql_query'] = 'SQL Query';

/* End of file unit_test_lang.php */
/* Location: ./system/language/english/unit_test_lang.php */
27 changes: 27 additions & 0 deletions application/language/portuguese/unit_test_lang.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?php

$lang['ut_test_name'] = 'Test Name';
$lang['ut_test_datatype'] = 'Test Datatype';
$lang['ut_test_value'] = 'Test Value';
$lang['ut_res_datatype'] = 'Expected Datatype';
$lang['ut_res_value'] = 'Expected Value';
$lang['ut_result'] = 'Result';
$lang['ut_undefined'] = 'Undefined Test Name';
$lang['ut_file'] = 'File Name';
$lang['ut_line'] = 'Line Number';
$lang['ut_passed'] = 'Passed';
$lang['ut_failed'] = 'Failed';
$lang['ut_boolean'] = 'Boolean';
$lang['ut_integer'] = 'Integer';
$lang['ut_float'] = 'Float';
$lang['ut_double'] = 'Float'; // can be the same as float
$lang['ut_string'] = 'String';
$lang['ut_array'] = 'Array';
$lang['ut_object'] = 'Object';
$lang['ut_resource'] = 'Resource';
$lang['ut_null'] = 'Null';
$lang['ut_res_sql_error'] = 'SQL Error';
$lang['ut_res_sql_query'] = 'SQL Query';

/* End of file unit_test_lang.php */
/* Location: ./system/language/english/unit_test_lang.php */
27 changes: 27 additions & 0 deletions application/language/romanian/unit_test_lang.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?php

$lang['ut_test_name'] = 'Test Name';
$lang['ut_test_datatype'] = 'Test Datatype';
$lang['ut_test_value'] = 'Test Value';
$lang['ut_res_datatype'] = 'Expected Datatype';
$lang['ut_res_value'] = 'Expected Value';
$lang['ut_result'] = 'Result';
$lang['ut_undefined'] = 'Undefined Test Name';
$lang['ut_file'] = 'File Name';
$lang['ut_line'] = 'Line Number';
$lang['ut_passed'] = 'Passed';
$lang['ut_failed'] = 'Failed';
$lang['ut_boolean'] = 'Boolean';
$lang['ut_integer'] = 'Integer';
$lang['ut_float'] = 'Float';
$lang['ut_double'] = 'Float'; // can be the same as float
$lang['ut_string'] = 'String';
$lang['ut_array'] = 'Array';
$lang['ut_object'] = 'Object';
$lang['ut_resource'] = 'Resource';
$lang['ut_null'] = 'Null';
$lang['ut_res_sql_error'] = 'SQL Error';
$lang['ut_res_sql_query'] = 'SQL Query';

/* End of file unit_test_lang.php */
/* Location: ./system/language/english/unit_test_lang.php */
27 changes: 27 additions & 0 deletions application/language/russian/unit_test_lang.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?php

$lang['ut_test_name'] = 'Test Name';
$lang['ut_test_datatype'] = 'Test Datatype';
$lang['ut_test_value'] = 'Test Value';
$lang['ut_res_datatype'] = 'Expected Datatype';
$lang['ut_res_value'] = 'Expected Value';
$lang['ut_result'] = 'Result';
$lang['ut_undefined'] = 'Undefined Test Name';
$lang['ut_file'] = 'File Name';
$lang['ut_line'] = 'Line Number';
$lang['ut_passed'] = 'Passed';
$lang['ut_failed'] = 'Failed';
$lang['ut_boolean'] = 'Boolean';
$lang['ut_integer'] = 'Integer';
$lang['ut_float'] = 'Float';
$lang['ut_double'] = 'Float'; // can be the same as float
$lang['ut_string'] = 'String';
$lang['ut_array'] = 'Array';
$lang['ut_object'] = 'Object';
$lang['ut_resource'] = 'Resource';
$lang['ut_null'] = 'Null';
$lang['ut_res_sql_error'] = 'SQL Error';
$lang['ut_res_sql_query'] = 'SQL Query';

/* End of file unit_test_lang.php */
/* Location: ./system/language/english/unit_test_lang.php */
27 changes: 27 additions & 0 deletions application/language/spanish/unit_test_lang.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?php

$lang['ut_test_name'] = 'Test Name';
$lang['ut_test_datatype'] = 'Test Datatype';
$lang['ut_test_value'] = 'Test Value';
$lang['ut_res_datatype'] = 'Expected Datatype';
$lang['ut_res_value'] = 'Expected Value';
$lang['ut_result'] = 'Result';
$lang['ut_undefined'] = 'Undefined Test Name';
$lang['ut_file'] = 'File Name';
$lang['ut_line'] = 'Line Number';
$lang['ut_passed'] = 'Passed';
$lang['ut_failed'] = 'Failed';
$lang['ut_boolean'] = 'Boolean';
$lang['ut_integer'] = 'Integer';
$lang['ut_float'] = 'Float';
$lang['ut_double'] = 'Float'; // can be the same as float
$lang['ut_string'] = 'String';
$lang['ut_array'] = 'Array';
$lang['ut_object'] = 'Object';
$lang['ut_resource'] = 'Resource';
$lang['ut_null'] = 'Null';
$lang['ut_res_sql_error'] = 'SQL Error';
$lang['ut_res_sql_query'] = 'SQL Query';

/* End of file unit_test_lang.php */
/* Location: ./system/language/english/unit_test_lang.php */
4 changes: 2 additions & 2 deletions application/libraries/MY_Unit_test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ class MY_Unit_test extends CI_Unit_Test
{
var $CI;

function MY_Unit_test()
function __construct()
{
parent::CI_Unit_Test();
parent::__construct();

$this->CI =& get_instance();
}
Expand Down
Loading