Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: symfony/yaml
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v4.1.5
Choose a base ref
...
head repository: symfony/yaml
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v4.1.6
Choose a head ref
  • 4 commits
  • 1 file changed
  • 1 contributor

Commits on Oct 2, 2018

  1. Merge branch '2.8' into 3.4 

    * 2.8:
  [php_cs] disable fopen_flags
  [CS] Remove unused variables passed to closures
  [CS] Remove empty comment
  [CS] Enforces null type hint on last position in phpDocs
  [CS] Use combined assignment operators when possible
  Fix a typo in error messages
  [Console] Add missing null to input values allowed types
  [PHPUnitBridge] Fix microtime() format
  bumped Symfony version to 2.8.47
  update CONTRIBUTORS for 2.8.46
  updated VERSION for 2.8.46
  updated CHANGELOG for 2.8.46
    @nicolas-grekas
    nicolas-grekas committed Oct 2, 2018
    Copy the full SHA
    9368e44 View commit details

  2. CS fix

    @nicolas-grekas
    nicolas-grekas committed Oct 2, 2018
    Copy the full SHA
    0e16589 View commit details

  3. Merge branch '2.8' into 3.4 

    * 2.8:
  CS fix
  [Debug] fix compat with PHP 7.3
    @nicolas-grekas
    nicolas-grekas committed Oct 2, 2018
    Copy the full SHA
    640b6c2 View commit details

  4. Merge branch '3.4' into 4.1 

    * 3.4:
  CS fix
  [Debug] fix compat with PHP 7.3
    @nicolas-grekas
    nicolas-grekas committed Oct 2, 2018
    Copy the full SHA
    367e689 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 Inline.php
2 changes: 1 addition & 1 deletion Inline.php
View file
Original file line number Diff line number Diff line change
@@ -270,7 +270,7 @@ public static function parseScalar(string $scalar, int $flags = 0, array $delimi
if (null !== $delimiters) {
$tmp = ltrim(substr($scalar, $i), ' ');
if ('' === $tmp) {
throw new ParseException(sprintf('Unexpected end of line, expected one of "%s".', implode($delimiters)), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
throw new ParseException(sprintf('Unexpected end of line, expected one of "%s".', implode('', $delimiters)), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
}
if (!\in_array($tmp[0], $delimiters)) {
throw new ParseException(sprintf('Unexpected characters (%s).', substr($scalar, $i)), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);