Update database and helper functionality in CodeIgniter
Revised database drivers, query builder, and file/inflector helpers for improved consistency and functionality. Updated copyrights, links, and standardized function names including deprecating `is_countable` in favor of `word_is_countable`. Added support for new SQL features and optimized query handling.
This commit is contained in:
Executable → Regular
+20
-8
@@ -6,7 +6,7 @@
|
||||
*
|
||||
* This content is released under the MIT License (MIT)
|
||||
*
|
||||
* Copyright (c) 2014 - 2017, British Columbia Institute of Technology
|
||||
* Copyright (c) 2019 - 2022, CodeIgniter Foundation
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
@@ -29,8 +29,9 @@
|
||||
* @package CodeIgniter
|
||||
* @author EllisLab Dev Team
|
||||
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
|
||||
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
|
||||
* @license http://opensource.org/licenses/MIT MIT License
|
||||
* @copyright Copyright (c) 2014 - 2019, British Columbia Institute of Technology (https://bcit.ca/)
|
||||
* @copyright Copyright (c) 2019 - 2022, CodeIgniter Foundation (https://codeigniter.com/)
|
||||
* @license https://opensource.org/licenses/MIT MIT License
|
||||
* @link https://codeigniter.com
|
||||
* @since Version 1.0.0
|
||||
* @filesource
|
||||
@@ -44,7 +45,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
|
||||
* @subpackage Helpers
|
||||
* @category Helpers
|
||||
* @author EllisLab Dev Team
|
||||
* @link https://codeigniter.com/user_guide/helpers/inflector_helper.html
|
||||
* @link https://codeigniter.com/userguide3/helpers/inflector_helper.html
|
||||
*/
|
||||
|
||||
// --------------------------------------------------------------------
|
||||
@@ -63,7 +64,7 @@ if ( ! function_exists('singular'))
|
||||
{
|
||||
$result = strval($str);
|
||||
|
||||
if ( ! is_countable($result))
|
||||
if ( ! word_is_countable($result))
|
||||
{
|
||||
return $result;
|
||||
}
|
||||
@@ -128,7 +129,7 @@ if ( ! function_exists('plural'))
|
||||
{
|
||||
$result = strval($str);
|
||||
|
||||
if ( ! is_countable($result))
|
||||
if ( ! word_is_countable($result))
|
||||
{
|
||||
return $result;
|
||||
}
|
||||
@@ -226,7 +227,7 @@ if ( ! function_exists('humanize'))
|
||||
|
||||
// --------------------------------------------------------------------
|
||||
|
||||
if ( ! function_exists('is_countable'))
|
||||
if ( ! function_exists('word_is_countable'))
|
||||
{
|
||||
/**
|
||||
* Checks if the given word has a plural version.
|
||||
@@ -234,7 +235,7 @@ if ( ! function_exists('is_countable'))
|
||||
* @param string $word Word to check
|
||||
* @return bool
|
||||
*/
|
||||
function is_countable($word)
|
||||
function word_is_countable($word)
|
||||
{
|
||||
return ! in_array(
|
||||
strtolower($word),
|
||||
@@ -274,3 +275,14 @@ if ( ! function_exists('is_countable'))
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// --------------------------------------------------------------------
|
||||
|
||||
if ( ! function_exists('is_countable'))
|
||||
{
|
||||
function is_countable($word)
|
||||
{
|
||||
trigger_error('is_countable() is a native PHP function since version 7.3.0; use word_is_countable() instead', E_USER_WARNING);
|
||||
return word_is_countable($word);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user