forks/baikal
1
0
Fork 0
Code Releases Activity

upgrade each() to foreach() for php 7.2 compat (#717)

Browse source 
each() is deprecated in PHP 7.2
(https://wiki.php.net/rfc/deprecations_php_7_2)
Related to https://github.com/sabre-io/Baikal/issues/711
This commit is contained in:
oliverpool 2018-04-18 20:27:34 +02:00 • committed by Markus Staab
parent ae42fea477
commit 519237b553
5 changed files with 12 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Core/Frameworks/Flake/Controller/Cli.php
View file

@ -39,9 +39,8 @@ class Cli extends \Flake\Core\Render\Container {
}
function execute() {
reset($this->aSequence);
while (list($sKey, ) = each($this->aSequence)) {
$this->aSequence[$sKey]["block"]->execute();
foreach ($this->aSequence as $aStep) {
$aStep["block"]->execute();
}
}

13
Core/Frameworks/Flake/Core/Render/Container.php
View file

@ -58,23 +58,20 @@ abstract class Container extends \Flake\Core\Controller {
}
function execute() {
reset($this->aSequence);
while (list($sKey, ) = each($this->aSequence)) {
$this->aSequence[$sKey]["block"]->execute();
foreach ($this->aSequence as $aStep) {
$aStep["block"]->execute();
}
}
protected function renderBlocks() {
$aHtml = [];
reset($this->aSequence);
while (list($sKey, ) = each($this->aSequence)) {
foreach ($this->aSequence as $sKey => $aStep) {
$this->aSequence[$sKey]["rendu"] = $this->aSequence[$sKey]["block"]->render();
}
$aHtml = [];
reset($this->aBlocks);
while (list($sZone, ) = each($this->aBlocks)) {
$aHtml[$sZone] = implode("", $this->aBlocks[$sZone]);
foreach ($this->aBlocks as $sZone => $aBlock) {
$aHtml[$sZone] = implode("", $aBlock);
}
reset($aHtml);

2
Core/Frameworks/Flake/Framework.php
View file

@ -122,7 +122,7 @@ class Framework extends \Flake\Core\Framework {
if (isset($_COOKIE) && is_array($_COOKIE)) { $process[] = &$_COOKIE;}
if (isset($_REQUEST) && is_array($_REQUEST)) { $process[] = &$_REQUEST;}
while (list($key, $val) = each($process)) {
foreach ($process as $key => $val) {
foreach ($val as $k => $v) {
unset($process[$key][$k]);
if (is_array($v)) {

7
Core/Frameworks/Flake/Util/Router.php
View file

@ -59,10 +59,9 @@ abstract class Router extends \Flake\Core\FLObject {
$aRoutes = $GLOBALS["ROUTER"]::getRoutes();
reset($aRoutes);
while (list($sRoute, ) = each($aRoutes)) {
if (str_replace("\\Route", "\\Controller", $aRoutes[$sRoute]) === $sController) {
return $sRoute;
foreach ($aRoutes as $sKey => $sRoute) {
if (str_replace("\\Route", "\\Controller", $sRoute) === $sController) {
return $sKey;
}
}

2
Core/Frameworks/Flake/Util/Tools.php
View file

@ -75,7 +75,7 @@ class Tools extends \Flake\Core\FLObject {
if (is_array($array_in)) {
$result = '<table border="1" cellpadding="1" cellspacing="0" bgcolor="white">';
if (!count($array_in)) {$result .= '<tr><td><font face="Verdana,Arial" size="1"><b>' . htmlspecialchars("EMPTY!") . '</b></font></td></tr>';}
while (list($key, $val) = each($array_in)) {
foreach ($array_in as $key => $val) {
$result .= '<tr><td valign="top"><font face="Verdana,Arial" size="1">' . htmlspecialchars((string)$key) . '</font></td><td>';
if (is_array($array_in[$key])) {
$result .= \Flake\Util\Tools::view_array($array_in[$key]);