adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-09 04:52:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed JsBaseEngineHelper::$useNative. Removed json_encode() emulation from JsBaseEngineHelper::object(). Removed unnessecary call to get_object_vars() in JsBaseEngineHelper::object(). Removed unnessecary tests for equalness of emulation and native json_encode(). Added test for correct encoding of objects to JsHelper test case. Fixes #704

Browse source
This commit is contained in:
Thomas Ploch 2011-04-26 14:36:20 +02:00 • committed by mark_story
parent 1523ff6874
commit bea666bb12
2 changed files with 13 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

53
lib/Cake/View/Helper/JsBaseEngineHelper.php
View file

@ -27,13 +27,6 @@ App::uses('AppHelper', 'View/Helper');
* @package cake.view.helpers
*/
abstract class JsBaseEngineHelper extends AppHelper {
/**
* Determines whether native JSON extension is used for encoding. Set by object constructor.
*
* @var boolean
* @access public
*/
public $useNative = false;
/**
* The js snippet for the current selection.
@ -76,7 +69,6 @@ abstract class JsBaseEngineHelper extends AppHelper {
*/
function __construct($View, $settings = array()) {
parent::__construct($View, $settings);
$this->useNative = function_exists('json_encode');
}
/**
@ -154,50 +146,7 @@ abstract class JsBaseEngineHelper extends AppHelper {
);
$options = array_merge($defaultOptions, $options);
if (is_object($data)) {
$data = get_object_vars($data);
}
$out = $keys = array();
$numeric = true;
if ($this->useNative && function_exists('json_encode')) {
$rt = json_encode($data);
} else {
if (is_null($data)) {
return 'null';
}
if (is_bool($data)) {
return $data ? 'true' : 'false';
}
if (is_array($data)) {
$keys = array_keys($data);
}
if (!empty($keys)) {
$numeric = (array_values($keys) === array_keys(array_values($keys)));
}
foreach ($data as $key => $val) {
if (is_array($val) || is_object($val)) {
$val = $this->object($val);
} else {
$val = $this->value($val);
}
if (!$numeric) {
$val = '"' . $this->value($key, false) . '":' . $val;
}
$out[] = $val;
}
if (!$numeric) {
$rt = '{' . join(',', $out) . '}';
} else {
$rt = '[' . join(',', $out) . ']';
}
}
$rt = $options['prefix'] . $rt . $options['postfix'];
return $rt;
return $options['prefix'] . json_encode($data) . $options['postfix'];
}
/**