adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 02:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removing deprecated options from object()

Browse source 
Tests updated.
This commit is contained in:
mark_story 2009-07-11 17:31:54 -04:00
parent 50c624486e
commit 69de1291e1
2 changed files with 6 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
cake/libs/view/helpers/js.php
View file

@ -299,9 +299,6 @@ class JsBaseEngineHelper extends AppHelper {
* *
* - 'prefix' - String prepended to the returned data. * - 'prefix' - String prepended to the returned data.
* - 'postfix' - String appended to the returned data. * - 'postfix' - String appended to the returned data.
* - 'stringKeys' - A list of array keys to be treated as a string
* - 'quoteKeys' - If false treats $options['stringKeys'] as a list of keys **not** to be quoted.
* - 'q' - Type of quote to use.
* *
* @param array $data Data to be converted. * @param array $data Data to be converted.
* @param array $options Set of options, see above. * @param array $options Set of options, see above.
@ -310,8 +307,7 @@ class JsBaseEngineHelper extends AppHelper {
**/ **/
function object($data = array(), $options = array()) { function object($data = array(), $options = array()) {
$defaultOptions = array( $defaultOptions = array(
'block' => false, 'prefix' => '', 'postfix' => '', 'prefix' => '', 'postfix' => '',
'stringKeys' => array(), 'quoteKeys' => true, 'q' => '"'
); );
$options = array_merge($defaultOptions, $options); $options = array_merge($defaultOptions, $options);
@ -322,7 +318,7 @@ class JsBaseEngineHelper extends AppHelper {
$out = $keys = array(); $out = $keys = array();
$numeric = true; $numeric = true;
if ($this->useNative) { if ($this->useNative && function_exists('json_encode')) {
$rt = json_encode($data); $rt = json_encode($data);
} else { } else {
if (is_null($data)) { if (is_null($data)) {
@ -341,17 +337,12 @@ class JsBaseEngineHelper extends AppHelper {
foreach ($data as $key => $val) { foreach ($data as $key => $val) {
if (is_array($val) || is_object($val)) { if (is_array($val) || is_object($val)) {
$val = $this->object($val, array_merge($options, array('block' => false))); $val = $this->object($val, $options);
} else { } else {
$quoteStrings = ( $val = $this->value($val);
!count($options['stringKeys']) ||
($options['quoteKeys'] && in_array($key, $options['stringKeys'], true)) ||
(!$options['quoteKeys'] && !in_array($key, $options['stringKeys'], true))
);
$val = $this->value($val, $quoteStrings);
} }
if (!$numeric) { if (!$numeric) {
$val = $options['q'] . $this->value($key, false) . $options['q'] . ':' . $val; $val = '"' . $this->value($key, false) . '":' . $val;
} }
$out[] = $val; $out[] = $val;
} }
@ -363,10 +354,6 @@ class JsBaseEngineHelper extends AppHelper {
} }
} }
$rt = $options['prefix'] . $rt . $options['postfix']; $rt = $options['prefix'] . $rt . $options['postfix'];
if ($options['block']) {
$rt = $this->codeBlock($rt, array_diff_key($options, $defaultOptions));
}
return $rt; return $rt;
} }
/** /**

2
cake/tests/cases/libs/view/helpers/js.test.php
View file

@ -392,7 +392,7 @@ class JsBaseEngineTestCase extends CakeTestCase {
* *
* @return void * @return void
**/ **/
function XXtestObjectAgainstJsonEncode() { function testObjectAgainstJsonEncode() {
$skip = $this->skipIf(!function_exists('json_encode'), 'json_encode() not found, comparison tests skipped. %s'); $skip = $this->skipIf(!function_exists('json_encode'), 'json_encode() not found, comparison tests skipped. %s');
if ($skip) { if ($skip) {
return; return;