Skip to content

Commit

Permalink
minor #823 Use PHP_OS_FAMILY constant thanks to Symfony's PHP 7.2 pol…
Browse files Browse the repository at this point in the history
…yfill (javiereguiluz)

This PR was merged into the master branch.

Discussion
----------

Use PHP_OS_FAMILY constant thanks to Symfony's PHP 7.2 polyfill

Commits
-------

d2f6d14 Use PHP_OS_FAMILY constant thanks to Symfony's PHP 7.2 polyfill
  • Loading branch information
javiereguiluz committed Jun 28, 2018
2 parents 1e702e5 + d2f6d14 commit 9998987
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 59 deletions.
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"symfony/form": "^4.1",
"symfony/framework-bundle": "^4.1",
"symfony/monolog-bundle": "^3.1",
"symfony/polyfill-php72": "^1.8",
"symfony/security-bundle": "^4.1",
"symfony/swiftmailer-bundle": "^3.1",
"symfony/translation": "^4.1",
Expand Down
112 changes: 56 additions & 56 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions tests/Command/AddUserCommandTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@ protected function setUp()
exec('stty 2>&1', $output, $exitcode);
$isSttySupported = 0 === $exitcode;

$isWindows = '\\' === \DIRECTORY_SEPARATOR;

if ($isWindows || !$isSttySupported) {
if ('Windows' === PHP_OS_FAMILY || !$isSttySupported) {
$this->markTestSkipped('`stty` is required to test this command.');
}
}
Expand Down

0 comments on commit 9998987

Please sign in to comment.