summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--system/core/Input.php4
-rw-r--r--system/core/Loader.php2
-rw-r--r--system/database/DB_driver.php6
-rw-r--r--system/database/drivers/oci8/oci8_driver.php12
-rw-r--r--system/database/drivers/pdo/subdrivers/pdo_4d_driver.php2
-rw-r--r--system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php2
-rw-r--r--system/database/drivers/pdo/subdrivers/pdo_firebird_driver.php2
-rw-r--r--system/libraries/Image_lib.php4
-rw-r--r--system/libraries/Upload.php2
-rw-r--r--tests/codeigniter/core/Security_test.php2
-rw-r--r--tests/codeigniter/libraries/Driver_test.php11
-rw-r--r--tests/mocks/database/schema/skeleton.php2
12 files changed, 26 insertions, 25 deletions
diff --git a/system/core/Input.php b/system/core/Input.php
index b0bbb7b8d..e1319be8d 100644
--- a/system/core/Input.php
+++ b/system/core/Input.php
@@ -682,7 +682,7 @@ class CI_Input {
/* We strip slashes if magic quotes is on to keep things consistent
NOTE: In PHP 5.4 get_magic_quotes_gpc() will always return 0 and
- it will probably not exist in future versions at all.
+ it will probably not exist in future versions at all.
*/
if ( ! is_php('5.4') && get_magic_quotes_gpc())
{
@@ -844,7 +844,7 @@ class CI_Input {
* Test to see if a request was made from the command line.
*
* @deprecated 3.0.0 Use is_cli() instead
- * @return bool
+ * @return bool
*/
public function is_cli_request()
{
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 1f48c0782..5de7a9483 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -514,7 +514,7 @@ class CI_Loader {
*
* Clears the cached variables.
*
- * @return object
+ * @return CI_Loader
*/
public function clear_vars()
{
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index d2bce5c97..e58496de9 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -451,7 +451,7 @@ abstract class CI_DB_driver {
*
* This is just a dummy method that all drivers will override.
*
- * @return mixed
+ * @return mixed
*/
public function db_connect()
{
@@ -481,7 +481,7 @@ abstract class CI_DB_driver {
* This is just a dummy method to allow drivers without such
* functionality to not declare it, while others will override it.
*
- * @return void
+ * @return void
*/
public function reconnect()
{
@@ -495,7 +495,7 @@ abstract class CI_DB_driver {
* This is just a dummy method to allow drivers without such
* functionality to not declare it, while others will override it.
*
- * @return bool
+ * @return bool
*/
public function db_select()
{
diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php
index 3c5777751..f2e40da9b 100644
--- a/system/database/drivers/oci8/oci8_driver.php
+++ b/system/database/drivers/oci8/oci8_driver.php
@@ -306,12 +306,12 @@ class CI_DB_oci8_driver extends CI_DB {
*
* params array keys
*
- * KEY OPTIONAL NOTES
- * name no the name of the parameter should be in :<param_name> format
- * value no the value of the parameter. If this is an OUT or IN OUT parameter,
- * this should be a reference to a variable
- * type yes the type of the parameter
- * length yes the max size of the parameter
+ * KEY OPTIONAL NOTES
+ * name no the name of the parameter should be in :<param_name> format
+ * value no the value of the parameter. If this is an OUT or IN OUT parameter,
+ * this should be a reference to a variable
+ * type yes the type of the parameter
+ * length yes the max size of the parameter
*/
public function stored_procedure($package, $procedure, array $params)
{
diff --git a/system/database/drivers/pdo/subdrivers/pdo_4d_driver.php b/system/database/drivers/pdo/subdrivers/pdo_4d_driver.php
index cf5a0c77f..7a767ef40 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_4d_driver.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_4d_driver.php
@@ -158,7 +158,7 @@ class CI_DB_pdo_4d_driver extends CI_DB_pdo_driver {
* @param string $table
* @param array $values
* @return string
- */
+ */
protected function _update($table, $values)
{
$this->qb_limit = FALSE;
diff --git a/system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php b/system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php
index 844ffab8f..ae2b9983b 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php
@@ -227,7 +227,7 @@ class CI_DB_pdo_dblib_driver extends CI_DB_pdo_driver {
* @param string $table
* @param array $values
* @return string
- */
+ */
protected function _update($table, $values)
{
$this->qb_limit = FALSE;
diff --git a/system/database/drivers/pdo/subdrivers/pdo_firebird_driver.php b/system/database/drivers/pdo/subdrivers/pdo_firebird_driver.php
index 3bd5c9354..0bafde861 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_firebird_driver.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_firebird_driver.php
@@ -211,7 +211,7 @@ class CI_DB_pdo_firebird_driver extends CI_DB_pdo_driver {
*
* @param string $table
* @return string
- */
+ */
protected function _truncate($table)
{
return 'DELETE FROM '.$table;
diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php
index c69283a7c..e813efd89 100644
--- a/system/libraries/Image_lib.php
+++ b/system/libraries/Image_lib.php
@@ -779,7 +779,7 @@ class CI_Image_lib {
$this->y_axis = 0;
}
- // Create the image handle
+ // Create the image handle
if ( ! ($src_img = $this->image_create_gd()))
{
return FALSE;
@@ -1195,7 +1195,7 @@ class CI_Image_lib {
$x_axis += $this->orig_width - $wm_width;
}
- // Build the finalized image
+ // Build the finalized image
if ($wm_img_type === 3 && function_exists('imagealphablending'))
{
@imagealphablending($src_img, TRUE);
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index 20ddfc145..8a2dec76a 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -1023,7 +1023,7 @@ class CI_Upload {
if (count($x) === 1)
{
- return '';
+ return '';
}
$ext = ($this->file_ext_tolower) ? strtolower(end($x)) : end($x);
diff --git a/tests/codeigniter/core/Security_test.php b/tests/codeigniter/core/Security_test.php
index 3acd2a598..bab76dffb 100644
--- a/tests/codeigniter/core/Security_test.php
+++ b/tests/codeigniter/core/Security_test.php
@@ -71,7 +71,7 @@ class Security_test extends CI_TestCase {
$this->assertEquals("Hello, i try to [removed]alert&#40;'Hack'&#41;;[removed] your site", $harmless_string);
}
- // --------------------------------------------------------------------
+ // --------------------------------------------------------------------
public function test_xss_clean_string_array()
{
diff --git a/tests/codeigniter/libraries/Driver_test.php b/tests/codeigniter/libraries/Driver_test.php
index d98e8ab98..c62cbee45 100644
--- a/tests/codeigniter/libraries/Driver_test.php
+++ b/tests/codeigniter/libraries/Driver_test.php
@@ -4,6 +4,7 @@
* Driver library base class unit test
*/
class Driver_test extends CI_TestCase {
+
/**
* Set up test framework
*/
@@ -13,11 +14,11 @@ class Driver_test extends CI_TestCase {
$this->subclass = 'Mock_Libraries_';
$this->ci_set_config('subclass_prefix', $this->subclass);
- // Mock Loader->get_package_paths
- $paths = 'get_package_paths';
- $ldr = $this->getMock('CI_Loader', array($paths));
- $ldr->expects($this->any())->method($paths)->will($this->returnValue(array(APPPATH, BASEPATH)));
- $this->ci_instance_var('load', $ldr);
+ // Mock Loader->get_package_paths
+ $paths = 'get_package_paths';
+ $ldr = $this->getMock('CI_Loader', array($paths));
+ $ldr->expects($this->any())->method($paths)->will($this->returnValue(array(APPPATH, BASEPATH)));
+ $this->ci_instance_var('load', $ldr);
// Create mock driver library
$this->name = 'Driver';
diff --git a/tests/mocks/database/schema/skeleton.php b/tests/mocks/database/schema/skeleton.php
index 5fe5b0f30..888236ff3 100644
--- a/tests/mocks/database/schema/skeleton.php
+++ b/tests/mocks/database/schema/skeleton.php
@@ -131,7 +131,7 @@ class Mock_Database_Schema_Skeleton {
'job' => array(
array('id' => 1, 'name' => 'Developer', 'description' => 'Awesome job, but sometimes makes you bored'),
array('id' => 2, 'name' => 'Politician', 'description' => 'This is not really a job'),
- array('id' => 3, 'name' => 'Accountant', 'description' => 'Boring job, but you will get free snack at lunch'),
+ array('id' => 3, 'name' => 'Accountant', 'description' => 'Boring job, but you will get free snack at lunch'),
array('id' => 4, 'name' => 'Musician', 'description' => 'Only Coldplay can actually called Musician')
),
'misc' => array(
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-07 00:46:09 +0100