Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
Version 1.1.33 under development
--------------------------------

- Bug: Replace deprecated `is_integer()` calls with `is_int()` for PHP 8.6 (ac-dc)
Comment thread
samdark marked this conversation as resolved.
Outdated
- Bug #4598: PHP 8.5 compatibility: Fix deprecated non-canonical casts to canonical forms (ac-dc)
- Bug #4607: Fix loading CHttpSessionHandler when using yiilite on Yii 1.1.32 and PHP 7+ (tance77, marcovtwout)

Expand Down
2 changes: 1 addition & 1 deletion framework/collections/CMap.php
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ public static function mergeArray($a,$b)
$next=array_shift($args);
foreach($next as $k => $v)
{
if(is_integer($k))
if(is_int($k))
isset($res[$k]) ? $res[]=$v : $res[$k]=$v;
elseif(is_array($v) && isset($res[$k]) && is_array($res[$k]))
$res[$k]=self::mergeArray($res[$k],$v);
Expand Down
4 changes: 2 additions & 2 deletions framework/db/ar/CActiveRecord.php
Original file line number Diff line number Diff line change
Expand Up @@ -1164,7 +1164,7 @@ public function saveAttributes($attributes)
$values=array();
foreach($attributes as $name=>$value)
{
if(is_integer($name))
if(is_int($name))
$values[$value]=$this->$value;
else
$values[$name]=$this->$name=$value;
Expand Down Expand Up @@ -1379,7 +1379,7 @@ public function applyScopes(&$criteria)
$c=$this->getDbCriteria();
foreach((array)$criteria->scopes as $k=>$v)
{
if(is_integer($k))
if(is_int($k))
{
if(is_string($v))
{
Expand Down
6 changes: 3 additions & 3 deletions framework/db/schema/CDbCriteria.php
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ public function mergeWith($criteria,$operator='AND')
$scopes2=(array)$criteria->scopes;
foreach($scopes1 as $k=>$v)
{
if(is_integer($k))
if(is_int($k))
$scopes[]=$v;
elseif(isset($scopes2[$k]))
$scopes[]=array($k=>$v);
Expand All @@ -599,7 +599,7 @@ public function mergeWith($criteria,$operator='AND')
}
foreach($scopes2 as $k=>$v)
{
if(is_integer($k))
if(is_int($k))
$scopes[]=$v;
elseif(isset($scopes1[$k]))
$scopes[]=array($k=>$v);
Expand All @@ -616,7 +616,7 @@ public function mergeWith($criteria,$operator='AND')
$this->with=(array)$this->with;
foreach((array)$criteria->with as $k=>$v)
{
if(is_integer($k))
if(is_int($k))
$this->with[]=$v;
elseif(isset($this->with[$k]))
{
Expand Down
2 changes: 1 addition & 1 deletion framework/web/helpers/CJavaScript.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public static function encode($value,$safe=false)
return 'null';
elseif(is_bool($value))
return $value?'true':'false';
elseif(is_integer($value))
elseif(is_int($value))
return "$value";
elseif(is_float($value))
{
Expand Down
6 changes: 3 additions & 3 deletions framework/yiilite.php
Original file line number Diff line number Diff line change
Expand Up @@ -2097,7 +2097,7 @@ public static function mergeArray($a,$b)
$next=array_shift($args);
foreach($next as $k => $v)
{
if(is_integer($k))
if(is_int($k))
isset($res[$k]) ? $res[]=$v : $res[$k]=$v;
elseif(is_array($v) && isset($res[$k]) && is_array($res[$k]))
$res[$k]=self::mergeArray($res[$k],$v);
Expand Down Expand Up @@ -8110,7 +8110,7 @@ public function saveAttributes($attributes)
$values=array();
foreach($attributes as $name=>$value)
{
if(is_integer($name))
if(is_int($name))
$values[$value]=$this->$value;
else
$values[$name]=$this->$name=$value;
Expand Down Expand Up @@ -8241,7 +8241,7 @@ public function applyScopes(&$criteria)
$c=$this->getDbCriteria();
foreach((array)$criteria->scopes as $k=>$v)
{
if(is_integer($k))
if(is_int($k))
{
if(is_string($v))
{
Expand Down
2 changes: 1 addition & 1 deletion framework/zii/widgets/CListView.php
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ public function renderSorter()
foreach($this->sortableAttributes as $name=>$label)
{
echo "<li>";
if(is_integer($name))
if(is_int($name))
echo $sort->link($label);
else
echo $sort->link($name,$label);
Expand Down