@@ -104,7 +104,7 @@ public static function parse($value, $flags = 0, $references = array())
104
104
++$ i ;
105
105
break ;
106
106
default :
107
- $ result = self ::parseScalar ($ value , $ flags , null , array ( ' " ' , " ' " ), $ i , true , $ references );
107
+ $ result = self ::parseScalar ($ value , $ flags , null , $ i , true , $ references );
108
108
}
109
109
110
110
// some comments are allowed at the end
@@ -276,7 +276,6 @@ private static function dumpArray($value, $flags)
276
276
* @param string $scalar
277
277
* @param int $flags
278
278
* @param string $delimiters
279
- * @param array $stringDelimiters
280
279
* @param int &$i
281
280
* @param bool $evaluate
282
281
* @param array $references
@@ -287,9 +286,9 @@ private static function dumpArray($value, $flags)
287
286
*
288
287
* @internal
289
288
*/
290
- public static function parseScalar ($ scalar , $ flags = 0 , $ delimiters = null , $ stringDelimiters = array ( ' " ' , " ' " ), &$ i = 0 , $ evaluate = true , $ references = array ())
289
+ public static function parseScalar ($ scalar , $ flags = 0 , $ delimiters = null , &$ i = 0 , $ evaluate = true , $ references = array ())
291
290
{
292
- if (in_array ($ scalar [$ i ], $ stringDelimiters )) {
291
+ if (in_array ($ scalar [$ i ], array ( ' " ' , " ' " ) )) {
293
292
// quoted scalar
294
293
$ output = self ::parseQuotedScalar ($ scalar , $ i );
295
294
@@ -399,7 +398,7 @@ private static function parseSequence($sequence, $flags, &$i = 0, $references =
399
398
break ;
400
399
default :
401
400
$ isQuoted = in_array ($ sequence [$ i ], array ('" ' , "' " ));
402
- $ value = self ::parseScalar ($ sequence , $ flags , array (', ' , '] ' ), array ( ' " ' , " ' " ), $ i , true , $ references );
401
+ $ value = self ::parseScalar ($ sequence , $ flags , array (', ' , '] ' ), $ i , true , $ references );
403
402
404
403
// the value can be an array if a reference has been resolved to an array var
405
404
if (is_string ($ value ) && !$ isQuoted && false !== strpos ($ value , ': ' )) {
@@ -457,7 +456,7 @@ private static function parseMapping($mapping, $flags, &$i = 0, $references = ar
457
456
}
458
457
459
458
// key
460
- $ key = self ::parseScalar ($ mapping , $ flags , array (': ' , ' ' ), array ( ' " ' , " ' " ), $ i , false );
459
+ $ key = self ::parseScalar ($ mapping , $ flags , array (': ' , ' ' ), $ i , false );
461
460
462
461
if (false === $ i = strpos ($ mapping , ': ' , $ i )) {
463
462
break ;
@@ -502,7 +501,7 @@ private static function parseMapping($mapping, $flags, &$i = 0, $references = ar
502
501
case ' ' :
503
502
break ;
504
503
default :
505
- $ value = self ::parseScalar ($ mapping , $ flags , array (', ' , '} ' ), array ( ' " ' , " ' " ), $ i , true , $ references );
504
+ $ value = self ::parseScalar ($ mapping , $ flags , array (', ' , '} ' ), $ i , true , $ references );
506
505
// Spec: Keys MUST be unique; first one wins.
507
506
// Parser cannot abort this mapping earlier, since lines
508
507
// are processed sequentially.
0 commit comments