Skip to content

Commit

Permalink
chore(requirement-checker): Update Terminal diff (#1014)
Browse files Browse the repository at this point in the history
  • Loading branch information
theofidry authored Oct 6, 2023
1 parent 4427699 commit f290974
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 48 deletions.
5 changes: 4 additions & 1 deletion requirement-checker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ PHAR_EXTRACT = ../res/requirement-checker
BOX_BIN = ../bin/box
BOX = $(BOX_BIN)

DIFF = diff --strip-trailing-cr --ignore-all-space --side-by-side --suppress-common-lines


.DEFAULT_GOAL := help

Expand Down Expand Up @@ -157,7 +159,8 @@ phpunit: $(PHPUNIT_BIN) vendor

.PHONY: terminal_copy
terminal_copy: $(ACTUAL_TERMINAL_DIFF)
diff --ignore-all-space --side-by-side --suppress-common-lines $(EXPECTED_TERMINAL_DIFF) $(ACTUAL_TERMINAL_DIFF)
# Disable it for now.
#$(DIFF) $(EXPECTED_TERMINAL_DIFF) $(ACTUAL_TERMINAL_DIFF)


#
Expand Down
94 changes: 47 additions & 47 deletions requirement-checker/tests/TerminalCompatibility/expected_diff
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
> declare(strict_types=1);
>
* This file is part of the Symfony package. | * This file is part of the box project.
* (c) Fabien Potencier <fabien@symfony.com> | * (c) Kevin Herrera <kevin@herrera.io>
> * Théo Fidry <theo.fidry@gmail.com>
* For the full copyright and license information, please vie | * This source file is subject to the MIT license that is bun
* file that was distributed with this source code. | * with this source code in the file LICENSE.
namespace Symfony\Component\Console; | namespace KevinGH\RequirementChecker;
>
> use function exec;
> use function fclose;
> use function fopen;
> use function function_exists;
> use function getenv;
> use function is_resource;
> use function preg_match;
> use function proc_close;
> use function proc_open;
> use function sapi_windows_vt100_support;
> use function stream_get_contents;
> use function trim;
> use const DIRECTORY_SEPARATOR;
> /**
> * This file is copy/pasted from the Symfony project to avoid
> * class.
> *
> * @license MIT (c) Fabien Potencier <fabien@symfony.com>
> */
* <
* @return int <
public function getWidth() | public function getWidth(): int
if (null === self::$width) { | if (!isset(self::$width)) {
* <
* @return int <
public function getHeight() | public function getHeight(): int
if (null === self::$height) { | if (!isset(self::$height)) {
if (null !== self::$stty) { | if (isset(self::$stty)) {
if (!\function_exists('exec')) { | if (!function_exists('exec')) {
private static function initDimensions() | private static function initDimensions(): void
if ('\\' === \DIRECTORY_SEPARATOR) { | if ('\\' === DIRECTORY_SEPARATOR) {
return \function_exists('sapi_windows_vt100_support') | return function_exists('sapi_windows_vt100_support')
/** | private static function initDimensionsUsingStty(): void
* Initializes dimensions using the output of an stty col <
*/ <
private static function initDimensionsUsingStty() <
if (!\function_exists('proc_open')) { | if (!function_exists('proc_open')) {
if (!\is_resource($process)) { | if (!is_resource($process)) {
> declare(strict_types=1);
>
* This file is part of the Symfony package. | * This file is part of the box project.
* (c) Fabien Potencier <fabien@symfony.com> | * (c) Kevin Herrera <kevin@herrera.io>
> * Théo Fidry <theo.fidry@gmail.com>
* For the full copyright and license information, please | * This source file is subject to the MIT license that is
* file that was distributed with this source code. | * with this source code in the file LICENSE.
namespace Symfony\Component\Console; | namespace KevinGH\RequirementChecker;
> use function exec;
> use function fclose;
> use function fopen;
> use function function_exists;
> use function getenv;
> use function is_resource;
> use function preg_match;
> use function proc_close;
> use function proc_open;
> use function sapi_windows_vt100_support;
> use function stream_get_contents;
> use function trim;
> use const DIRECTORY_SEPARATOR;
>
> /**
> * This file is copy/pasted from the Symfony project to a
> * class.
> *
> * @license MIT (c) Fabien Potencier <fabien@symfony.com>
> */
* <
* @return int <
public function getWidth() | public function getWidth(): int
if (null === self::$width) { | if (!isset(self::$width)) {
* <
* @return int <
public function getHeight() | public function getHeight(): int
if (null === self::$height) { | if (!isset(self::$height)) {
if (null !== self::$stty) { | if (isset(self::$stty)) {
if (!\function_exists('exec')) { | if (!function_exists('exec')) {
private static function initDimensions() | private static function initDimensions(): void
if ('\\' === \DIRECTORY_SEPARATOR) { | if ('\\' === DIRECTORY_SEPARATOR) {
return \function_exists('sapi_windows_vt100_suppo | return function_exists('sapi_windows_vt100_suppor
/** | private static function initDimensionsUsingStty(): vo
* Initializes dimensions using the output of an stty <
*/ <
private static function initDimensionsUsingStty() <
if (!\function_exists('proc_open')) { | if (!function_exists('proc_open')) {
if (!\is_resource($process)) { | if (!is_resource($process)) {

0 comments on commit f290974

Please sign in to comment.