← All changes | classes/helpers/FrmSerializedStringParserHelper.php +2 -12 6.27 → 6.21 View file →

		@@ -37,9 +37,8 @@
37	37	* Parse a string containing a serialized data structure.
38	38	* This is the initial entry point into the recursive parser.
39	39	*
40	40	* @param string $string
41		- *
42	41	* @return mixed
43	42	*/
44	43	public function parse( $string ) {
45	44	$unserialized_data = $this->do_parse( new FrmStringReaderHelper( $string ) );
		@@ -56,13 +55,12 @@
56	55	*
57	56	* @since 6.20
58	57	*
59	58	* @param mixed $value
60		- *
61	59	* @return bool
62	60	*/
63	61	private function serialized_value_is_valid( $value ) {
64		- return ! is_string( $value ) || ! str_contains( $value, ';s:' );
	62	+ return ! is_string( $value ) || strpos( $value, ';s:' ) === false;
65	63	}
66	64
67	65	/**
68	66	* @since 6.20
		@@ -67,9 +65,8 @@
67	65	/**
68	66	* @since 6.20
69	67	*
70	68	* @param string $string
71		- *
72	69	* @return bool
73	70	*/
74	71	private function serialized_string_is_invalid( $string ) {
75	72	$invalid_substrings = array(
		@@ -77,9 +74,9 @@
77	74	';s:";',
78	75	);
79	76
80	77	foreach ( $invalid_substrings as $invalid ) {
81		- if ( str_contains( $string, $invalid ) ) {
	78	+ if ( strpos( $string, $invalid ) !== false ) {
82	79	return true;
83	80	}
84	81	}
85	82
		@@ -89,9 +86,8 @@
89	86	/**
90	87	* This is the recursive parser.
91	88	*
92	89	* @param FrmStringReaderHelper $string
93		- *
94	90	* @return array|bool|float|int|string|null
95	91	*/
96	92	private function do_parse( $string ) {
97	93	// May be : or ; as a terminator, depending on what the data type is.
		@@ -121,9 +117,8 @@
121	117	}
122	118
123	119	/**
124	120	* @param FrmStringReaderHelper $string
125		- *
126	121	* @return array
127	122	*/
128	123	private function parse_array( $string ) {
129	124	// Associative array: a:length:{[index][value]...}
		@@ -132,9 +127,8 @@
132	127	// Eat the opening "{" of the array.
133	128	$string->skip_next_character();
134	129
135	130	$val = array();
136		-
137	131	for ( $i = 0; $i < $count; $i++ ) {
138	132	$array_key = $this->do_parse( $string );
139	133	$array_value = $this->do_parse( $string );
140	134
		@@ -150,9 +144,8 @@
150	144	}
151	145
152	146	/**
153	147	* @param FrmStringReaderHelper $string
154		- *
155	148	* @return string
156	149	*/
157	150	private function parse_string( $string ) {
158	151	$len = (int) $string->read_until( ':' );
		@@ -165,9 +158,8 @@
165	158	}
166	159
167	160	/**
168	161	* @param FrmStringReaderHelper $string
169		- *
170	162	* @return int
171	163	*/
172	164	private function parse_int( $string ) {
173	165	return (int) $string->read_until( ';' );
		@@ -174,9 +166,8 @@
174	166	}
175	167
176	168	/**
177	169	* @param FrmStringReaderHelper $string
178		- *
179	170	* @return float
180	171	*/
181	172	private function parse_float( $string ) {
182	173	return (float) $string->read_until( ';' );
		@@ -183,9 +174,8 @@
183	174	}
184	175
185	176	/**
186	177	* @param FrmStringReaderHelper $string
187		- *
188	178	* @return bool
189	179	*/
190	180	private function parse_bool( $string ) {
191	181	// Boolean is 0 or 1.