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.0.9
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.0.10
Choose a head ref
  • 6 commits
  • 2 files changed
  • 4 contributors

Commits on May 1, 2018

  1. Use symfony/polyfill-ctype

    Use the polyfill for every package that uses cytpe functions.
    BackEndTea authored and nicolas-grekas committed May 1, 2018
    Copy the full SHA
    5bbd7e6 View commit details
  2. Merge branch '2.7' into 2.8

    * 2.7:
      Remove symfony/polyfill-ctype where not needed
      Use symfony/polyfill-ctype
      [Form] fixes instance variable phpdoc in FormRegistry class
    nicolas-grekas committed May 1, 2018
    Copy the full SHA
    51356b7 View commit details
  3. Merge branch '2.8' into 3.4

    * 2.8:
      Remove symfony/polyfill-ctype where not needed
      Use symfony/polyfill-ctype
      [Form] fixes instance variable phpdoc in FormRegistry class
    nicolas-grekas committed May 1, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    e091086 View commit details
  4. Merge branch '3.4' into 4.0

    * 3.4:
      Remove symfony/polyfill-ctype where not needed
      Use symfony/polyfill-ctype
      [Form] fixes instance variable phpdoc in FormRegistry class
      bumped Symfony version to 3.4.10
      updated VERSION for 3.4.9
      updated CHANGELOG for 3.4.9
      Add CODE_OF_CONDUCT.md
      Added .github/CODEOWNERS
      bumped Symfony version to 2.8.40
      updated VERSION for 2.8.39
      updated CHANGELOG for 2.8.39
    nicolas-grekas committed May 1, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    849c100 View commit details

Commits on May 3, 2018

  1. Copy the full SHA
    c5010cc View commit details

Commits on May 7, 2018

  1. Merge branch '3.4' into 4.0

    * 3.4:
      use brace-style regex delimiters
      Fixed typo RecursiveIterator -> RecursiveIteratorIterator
      [Cache] fix logic for fetching tag versions on TagAwareAdapter
      [FrameworkBundle] Use the correct service id for CachePoolPruneCommand in its compiler pass
      Hide short exception trace by default
      [Doctrine Bridge] fix priority for doctrine event listeners
      [Validator] make phpdoc of ObjectInitializerInterface interface more accurate
      [Validator] fixes phpdoc reference to an interface that was removed in Symfony 3.0
    fabpot committed May 7, 2018
    Copy the full SHA
    048b1be View commit details
Showing with 7 additions and 4 deletions.
  1. +5 −3 Command/LintCommand.php
  2. +2 −1 composer.json
8 changes: 5 additions & 3 deletions Command/LintCommand.php
Original file line number Diff line number Diff line change
@@ -12,6 +12,8 @@
namespace Symfony\Component\Yaml\Command;

use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Exception\InvalidArgumentException;
use Symfony\Component\Console\Exception\RuntimeException;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
@@ -86,14 +88,14 @@ protected function execute(InputInterface $input, OutputInterface $output)

if (!$filename) {
if (!$stdin = $this->getStdin()) {
throw new \RuntimeException('Please provide a filename or pipe file content to STDIN.');
throw new RuntimeException('Please provide a filename or pipe file content to STDIN.');
}

return $this->display($io, array($this->validate($stdin, $flags)));
}

if (!$this->isReadable($filename)) {
throw new \RuntimeException(sprintf('File or directory "%s" is not readable.', $filename));
throw new RuntimeException(sprintf('File or directory "%s" is not readable.', $filename));
}

$filesInfo = array();
@@ -133,7 +135,7 @@ private function display(SymfonyStyle $io, array $files)
case 'json':
return $this->displayJson($io, $files);
default:
throw new \InvalidArgumentException(sprintf('The format "%s" is not supported.', $this->format));
throw new InvalidArgumentException(sprintf('The format "%s" is not supported.', $this->format));
}
}

3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -16,7 +16,8 @@
}
],
"require": {
"php": "^7.1.3"
"php": "^7.1.3",
"symfony/polyfill-ctype": "~1.8"
},
"require-dev": {
"symfony/console": "~3.4|~4.0"