From f290974595715a77f8549db9789229045e9c2815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20FIDRY?= <5175937+theofidry@users.noreply.github.com> Date: Fri, 6 Oct 2023 14:19:32 +0200 Subject: [PATCH] chore(requirement-checker): Update Terminal diff (#1014) --- requirement-checker/Makefile | 5 +- .../tests/TerminalCompatibility/expected_diff | 94 +++++++++---------- 2 files changed, 51 insertions(+), 48 deletions(-) diff --git a/requirement-checker/Makefile b/requirement-checker/Makefile index c433fb8c0..85e13176c 100644 --- a/requirement-checker/Makefile +++ b/requirement-checker/Makefile @@ -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 @@ -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) # diff --git a/requirement-checker/tests/TerminalCompatibility/expected_diff b/requirement-checker/tests/TerminalCompatibility/expected_diff index 53107a70d..97fda9615 100644 --- a/requirement-checker/tests/TerminalCompatibility/expected_diff +++ b/requirement-checker/tests/TerminalCompatibility/expected_diff @@ -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 | * (c) Kevin Herrera - > * Théo Fidry - * 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 - > */ - * < - * @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 | * (c) Kevin Herrera + > * Théo Fidry + * 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 + > */ + * < + * @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)) {