php5.5 compat

dereuromark · dereuromark · commit 86adf8173f6f · 2016-10-28T01:08:09.000+02:00
diff --git a/src/Model/Behavior/JsonableBehavior.php b/src/Model/Behavior/JsonableBehavior.php
@@ -35,8 +35,6 @@
  */
 class JsonableBehavior extends Behavior {
 
-	const OPTIONS_DEFAULT = JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT | JSON_ERROR_INF_OR_NAN | JSON_PARTIAL_OUTPUT_ON_ERROR;
-
 	/**
 	 * @var string|false|null
 	 */
@@ -92,7 +90,8 @@ public function initialize(array $config = []) {
 			$this->_table->schema()->columnType($field, 'array');
 		}
 		if ($this->_config['encodeParams']['options'] === null) {
-			$this->_config['encodeParams']['options'] = static::OPTIONS_DEFAULT;
+			$options = JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT | JSON_ERROR_INF_OR_NAN | JSON_PARTIAL_OUTPUT_ON_ERROR;
+			$this->_config['encodeParams']['options'] = $options;
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,6 @@`
`35`	`35`	`*/`
`36`	`36`	`class JsonableBehavior extends Behavior {`
`37`	`37`
`38`		`- const OPTIONS_DEFAULT = JSON_HEX_TAG \| JSON_HEX_APOS \| JSON_HEX_AMP \| JSON_HEX_QUOT \| JSON_ERROR_INF_OR_NAN \| JSON_PARTIAL_OUTPUT_ON_ERROR;`
`39`		`-`
`40`	`38`	`/**`
`41`	`39`	`* @var string\|false\|null`
`42`	`40`	`*/`
`@@ -92,7 +90,8 @@ public function initialize(array $config = []) {`
`92`	`90`	`$this->_table->schema()->columnType($field, 'array');`
`93`	`91`	`}`
`94`	`92`	`if ($this->_config['encodeParams']['options'] === null) {`
`95`		`- $this->_config['encodeParams']['options'] = static::OPTIONS_DEFAULT;`
	`93`	`+ $options = JSON_HEX_TAG \| JSON_HEX_APOS \| JSON_HEX_AMP \| JSON_HEX_QUOT \| JSON_ERROR_INF_OR_NAN \| JSON_PARTIAL_OUTPUT_ON_ERROR;`
	`94`	`+ $this->_config['encodeParams']['options'] = $options;`
`96`	`95`	`}`
`97`	`96`	`}`
`98`	`97`