From 3ecb6c1a02f433df374257cf4017eba60561e381 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Jan 31 2024 10:35:30 +0000 Subject: update to 1.7.4 drop patch merged upstream --- diff --git a/.gitignore b/.gitignore index 0733c1c..bf076e6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ clog /ConsoleTools-1.7.2-97fb074.tar.gz /ConsoleTools-1.7.3-fbc31f1.tar.gz /php-zetacomponents-console-tools-1.7.3-fbc31f1.tar.gz +/php-zetacomponents-console-tools-1.7.4-c487720.tar.gz diff --git a/php-zetacomponents-console-tools-php82.patch b/php-zetacomponents-console-tools-php82.patch deleted file mode 100644 index f843466..0000000 --- a/php-zetacomponents-console-tools-php82.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 6b79adc263902c881df80e5872125a43a05dfe36 Mon Sep 17 00:00:00 2001 -From: Derick Rethans -Date: Tue, 19 Jul 2022 16:33:29 +0100 -Subject: [PATCH] PHP 8.2: Do not rely on dynamic properties in tests - ---- - tests/input_test.php | 2 ++ - tests/table_test.php | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/tests/input_test.php b/tests/input_test.php -index c694b82..86b1203 100644 ---- a/tests/input_test.php -+++ b/tests/input_test.php -@@ -189,6 +189,8 @@ class ezcConsoleInputTest extends ezcTestCase - ), - ); - -+ private $input = null; -+ - public static function suite() - { - return new PHPUnit\Framework\TestSuite( "ezcConsoleInputTest" ); -diff --git a/tests/table_test.php b/tests/table_test.php -index c862ee5..a4697a2 100644 ---- a/tests/table_test.php -+++ b/tests/table_test.php -@@ -68,6 +68,8 @@ class ezcConsoleTableTest extends ezcTestCase - array( 'Nön UTF-8 cölümn 1', 'Nön UTF-8 cölümn 2', 'Löng löng löng löng löng löng löng nön UTF-8 cölümn' ), - ); - -+ private $output = null; -+ - public static function suite() - { - return new PHPUnit\Framework\TestSuite( "ezcConsoleTableTest" ); diff --git a/php-zetacomponents-console-tools-php83.patch b/php-zetacomponents-console-tools-php83.patch deleted file mode 100644 index b9ddacb..0000000 --- a/php-zetacomponents-console-tools-php83.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ca4d4776e533fc4cef68890c03ef53667f0386e8 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Wed, 31 Jan 2024 10:31:52 +0100 -Subject: [PATCH] Drop unused arg, fix Increment on type bool - ---- - src/input/help_generators/standard.php | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/input/help_generators/standard.php b/src/input/help_generators/standard.php -index b979927..614aaa7 100644 ---- a/src/input/help_generators/standard.php -+++ b/src/input/help_generators/standard.php -@@ -276,13 +276,12 @@ private function getOptionHelpRow( $long, ezcConsoleOption $param ) - public function generateSynopsis( array $optionFilter = null ) - { - $usedOptions = array( 'short' => array(), 'long' => array() ); -- $allowsArgs = true; - $synopsis = '$ ' . ( isset( $argv ) && sizeof( $argv ) > 0 ? $argv[0] : $_SERVER['argv'][0] ) . ' '; - foreach ( $this->input->getOptions() as $option ) - { - if ( $optionFilter === null || in_array( $option->short, $optionFilter ) || in_array( $option->long, $optionFilter ) ) - { -- $synopsis .= $this->createOptionSynopsis( $option, $usedOptions, $allowsArgs ); -+ $synopsis .= $this->createOptionSynopsis( $option, $usedOptions ); - } - } - if ( $this->input->argumentDefinition === null ) diff --git a/php-zetacomponents-console-tools.spec b/php-zetacomponents-console-tools.spec index afe0acb..a4f487d 100644 --- a/php-zetacomponents-console-tools.spec +++ b/php-zetacomponents-console-tools.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # -%global gh_commit fbc31f1be66ccd178c68d846d7c0ae09dbb97c89 +%global gh_commit c487720bffd26e74a297c3baa31a9b90580759b2 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zetacomponents %global gh_project ConsoleTools @@ -22,8 +22,8 @@ %bcond_without phpab Name: php-%{gh_owner}-%{cname} -Version: 1.7.3 -Release: 8%{?dist} +Version: 1.7.4 +Release: 1%{?dist} Summary: Zeta %{gh_project} Component License: Apache-2.0 @@ -31,9 +31,6 @@ URL: http://zetacomponents.org/ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz Source1: autoloader.php -Patch0: %{name}-php82.patch -Patch1: %{name}-php83.patch - BuildArch: noarch %if %{with phpab} BuildRequires: %{_bindir}/phpab @@ -41,7 +38,7 @@ BuildRequires: %{_bindir}/phpab %if %{with tests} BuildRequires: (php-composer(%{gh_owner}/base) >= 1.8 with php-composer(%{gh_owner}/base) < 2) # From composer.json, "require-dev": { -# "phpunit/phpunit": "~8.0", +# "phpunit/phpunit": "~9.0", # "zetacomponents/unit-test": "*" BuildRequires: phpunit9 BuildRequires: php-composer(%{gh_owner}/unit-test) >= 1.2.4 @@ -79,8 +76,6 @@ Requires: %{name} = %{version}-%{release} %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch -P0 -p1 -%patch -P1 -p1 %build @@ -148,6 +143,10 @@ done %changelog +* Wed Jan 31 2024 Remi Collet - 1.7.4-1 +- update to 1.7.4 +- drop patch merged upstream + * Wed Jan 31 2024 Remi Collet - 1.7.3-8 - add upstream patch for PHP 8.2 - add patch for PHP 8.3 from https://github.com/zetacomponents/ConsoleTools/pull/26 diff --git a/sources b/sources index 7c38b3d..09044b1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-zetacomponents-console-tools-1.7.3-fbc31f1.tar.gz) = 33b20a9f8752bfe95672bd2aecae9b40a4bff24eb7dbaa528e534ce6327814f91ef2c41ae4c64c73d1cd345c3278f1893bb405ee16a1104a2b45b96a55996016 +SHA512 (php-zetacomponents-console-tools-1.7.4-c487720.tar.gz) = 9f9d61a6e3f086fa41f0139e22de75ae9e680899ebbda9f7e6df51888f2e4ec5d8ee6100af6f3276dec60d0f0d0cb1f6bc9c6b843895012234cbcdcdd4b442d1