From 7de625cf810d66b7afac7cb40b7e73df266ceb1a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 24 Nov 2021 11:14:34 +0100 Subject: [PATCH 01/19] add upstream patch to fix test suite with PHP 8.1 --- php-brick-varexporter-tests.patch | 187 ++++++++++++++++++++++++++++++ php-brick-varexporter.spec | 11 +- 2 files changed, 196 insertions(+), 2 deletions(-) create mode 100644 php-brick-varexporter-tests.patch diff --git a/php-brick-varexporter-tests.patch b/php-brick-varexporter-tests.patch new file mode 100644 index 0000000..89f7f63 --- /dev/null +++ b/php-brick-varexporter-tests.patch @@ -0,0 +1,187 @@ +From 4b0a9183494a90fdef1e4d482e775aab3964d645 Mon Sep 17 00:00:00 2001 +From: Benjamin Morel +Date: Sun, 17 Oct 2021 11:25:18 +0200 +Subject: [PATCH] Fix tests on PHP 8.1 + +--- + tests/ExportObjectTest.php | 49 +++++++++++++++++++++++++++++++--- + tests/VarExporterTest.php | 54 +++++++++++++++++++++++++++++++++++++- + 2 files changed, 98 insertions(+), 5 deletions(-) + +diff --git a/tests/ExportObjectTest.php b/tests/ExportObjectTest.php +index 9c79f6f..66bc6d0 100644 +--- a/tests/ExportObjectTest.php ++++ b/tests/ExportObjectTest.php +@@ -171,13 +171,23 @@ public function testExportClassWithSetState(): void + $object->foo = 'Hello'; + $object->bar = 'World'; + +- $expected = <<<'PHP' ++ if (PHP_VERSION_ID >=80100) { ++ $expected = <<<'PHP' ++\Brick\VarExporter\Tests\Classes\SetState::__set_state([ ++ 'foo' => 'Hello', ++ 'bar' => 'World', ++ 'baz' => 'defaultValue' ++]) ++PHP; ++ } else { ++ $expected = <<<'PHP' + \Brick\VarExporter\Tests\Classes\SetState::__set_state([ + 'baz' => 'defaultValue', + 'foo' => 'Hello', + 'bar' => 'World' + ]) + PHP; ++ } + + $this->assertExportEquals($expected, $object); + } +@@ -189,12 +199,21 @@ public function testExportClassWithSetStateAndUnsetProperties(): void + + unset($object->bar); + +- $expected = <<<'PHP' ++ if (PHP_VERSION_ID >= 80100) { ++ $expected = <<<'PHP' ++\Brick\VarExporter\Tests\Classes\SetState::__set_state([ ++ 'foo' => null, ++ 'baz' => 'defaultValue' ++]) ++PHP; ++ } else { ++ $expected = <<<'PHP' + \Brick\VarExporter\Tests\Classes\SetState::__set_state([ + 'baz' => 'defaultValue', + 'foo' => null + ]) + PHP; ++ } + + $this->assertExportEquals($expected, $object); + } +@@ -207,7 +226,18 @@ public function testExportClassWithSetStateAndDynamicProperties(): void + $object->dynamic = 'Dynamic property'; + $object->{'123'} = 'Numeric dynamic property'; + +- $expected = <<<'PHP' ++ if (PHP_VERSION_ID >= 80100) { ++ $expected = <<<'PHP' ++\Brick\VarExporter\Tests\Classes\SetState::__set_state([ ++ 'foo' => 'Hello', ++ 'bar' => 'World', ++ 'baz' => 'defaultValue', ++ 'dynamic' => 'Dynamic property', ++ 123 => 'Numeric dynamic property' ++]) ++PHP; ++ } else { ++ $expected = <<<'PHP' + \Brick\VarExporter\Tests\Classes\SetState::__set_state([ + 'baz' => 'defaultValue', + 'foo' => 'Hello', +@@ -216,6 +246,7 @@ public function testExportClassWithSetStateAndDynamicProperties(): void + 123 => 'Numeric dynamic property' + ]) + PHP; ++ } + + $this->assertExportEquals($expected, $object); + } +@@ -227,13 +258,23 @@ public function testExportClassWithSetStateAndDynamicProperties_SkipDynamicPrope + $object->bar = 'World'; + $object->dynamic = 'Dynamic property'; + +- $expected = <<<'PHP' ++ if (PHP_VERSION_ID >= 80100) { ++ $expected = <<<'PHP' ++\Brick\VarExporter\Tests\Classes\SetState::__set_state([ ++ 'foo' => 'Hello', ++ 'bar' => 'World', ++ 'baz' => 'defaultValue' ++]) ++PHP; ++ } else { ++ $expected = <<<'PHP' + \Brick\VarExporter\Tests\Classes\SetState::__set_state([ + 'baz' => 'defaultValue', + 'foo' => 'Hello', + 'bar' => 'World' + ]) + PHP; ++ } + + $this->assertExportEquals($expected, $object, VarExporter::SKIP_DYNAMIC_PROPERTIES); + } +diff --git a/tests/VarExporterTest.php b/tests/VarExporterTest.php +index fb55120..99792b6 100644 +--- a/tests/VarExporterTest.php ++++ b/tests/VarExporterTest.php +@@ -49,7 +49,58 @@ public function testMixedVar(): void + 'aCustomObject' => $myObject + ]; + +- $expected = <<<'PHP' ++ if (PHP_VERSION_ID >= 80100) { ++ $expected = <<<'PHP' ++[ ++ 'aString' => 'Hello', ++ 'aTrue' => true, ++ 'aFalse' => false, ++ 'aNull' => null, ++ 'aFloat' => 0.75, ++ 'anInt' => 123, ++ 'aNumericArray' => [ ++ 'a', ++ 'b', ++ null, ++ [ ++ 'c' => 'd' ++ ] ++ ], ++ 'anAssociativeArray' => [ ++ 'a' => 'b', ++ 'c' => [ ++ 'd' => 'e', ++ 'f' => [ ++ 'g' => [ ++ [] ++ ] ++ ] ++ ] ++ ], ++ 'anObject' => (object) [ ++ 'type' => 'string', ++ '$ref' => '#/components/schema/User', ++ 'items' => (object) [ ++ 'foo' => 'bar', ++ 'empty' => (object) [] ++ ] ++ ], ++ 'aCustomObject' => (static function() { ++ $object = new \Brick\VarExporter\Tests\Classes\PublicPropertiesOnly; ++ ++ $object->foo = 'hello'; ++ $object->bar = \Brick\VarExporter\Tests\Classes\SetState::__set_state([ ++ 'foo' => 'SetState.foo', ++ 'bar' => 'SetState.bar', ++ 'baz' => 'defaultValue' ++ ]); ++ ++ return $object; ++ })() ++] ++PHP; ++ } else { ++ $expected = <<<'PHP' + [ + 'aString' => 'Hello', + 'aTrue' => true, +@@ -98,6 +149,7 @@ public function testMixedVar(): void + })() + ] + PHP; ++ } + + $this->assertExportEquals($expected, $var); + } diff --git a/php-brick-varexporter.spec b/php-brick-varexporter.spec index 5cb8801..e784570 100644 --- a/php-brick-varexporter.spec +++ b/php-brick-varexporter.spec @@ -20,7 +20,7 @@ Name: php-%{pk_vendor}-%{pk_name} Version: 0.3.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A powerful alternative to var_export License: MIT @@ -29,6 +29,9 @@ Source0: %{name}-%{version}-%{gh_short}.tgz # Create git snapshot as tests are excluded from official tarball Source1: makesrc.sh +# Upstream patch for PHP 8.1 (test suite) +Patch0: %{name}-tests.patch + BuildArch: noarch BuildRequires: php(language) >= 7.2 @@ -76,6 +79,7 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} +%patch0 -p1 -b .up %build @@ -111,7 +115,7 @@ EOF : Run upstream test suite ret=0 -for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do +for cmdarg in "php %{phpunit}" php74 php80 php81; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} \ @@ -130,6 +134,9 @@ exit $ret %changelog +* Wed Nov 24 2021 Remi Collet - 0.3.5-3 +- add upstream patch to fix test suite with PHP 8.1 + * Fri Jul 23 2021 Fedora Release Engineering - 0.3.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From e9965f7b717d9e44d7659f1c31e7a73fd9a43898 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 07:19:47 +0000 Subject: [PATCH 02/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-brick-varexporter.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-brick-varexporter.spec b/php-brick-varexporter.spec index e784570..bd171b1 100644 --- a/php-brick-varexporter.spec +++ b/php-brick-varexporter.spec @@ -20,7 +20,7 @@ Name: php-%{pk_vendor}-%{pk_name} Version: 0.3.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A powerful alternative to var_export License: MIT @@ -134,6 +134,9 @@ exit $ret %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 0.3.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Nov 24 2021 Remi Collet - 0.3.5-3 - add upstream patch to fix test suite with PHP 8.1 From 5854b3d2b29e2830edcaa0b6e53d9b4711036441 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 16 Jun 2022 09:25:25 +0200 Subject: [PATCH 03/19] v0.3.6 --- .gitignore | 1 + php-brick-varexporter-tests.patch | 187 ------------------------------ php-brick-varexporter.spec | 17 ++- sources | 2 +- 4 files changed, 10 insertions(+), 197 deletions(-) delete mode 100644 php-brick-varexporter-tests.patch diff --git a/.gitignore b/.gitignore index 5611980..0e9e442 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /php-brick-varexporter-0.3.3-736378d.tgz /php-brick-varexporter-0.3.4-17e03b4.tgz /php-brick-varexporter-0.3.5-05241f2.tgz +/php-brick-varexporter-0.3.6-3361a8a.tgz diff --git a/php-brick-varexporter-tests.patch b/php-brick-varexporter-tests.patch deleted file mode 100644 index 89f7f63..0000000 --- a/php-brick-varexporter-tests.patch +++ /dev/null @@ -1,187 +0,0 @@ -From 4b0a9183494a90fdef1e4d482e775aab3964d645 Mon Sep 17 00:00:00 2001 -From: Benjamin Morel -Date: Sun, 17 Oct 2021 11:25:18 +0200 -Subject: [PATCH] Fix tests on PHP 8.1 - ---- - tests/ExportObjectTest.php | 49 +++++++++++++++++++++++++++++++--- - tests/VarExporterTest.php | 54 +++++++++++++++++++++++++++++++++++++- - 2 files changed, 98 insertions(+), 5 deletions(-) - -diff --git a/tests/ExportObjectTest.php b/tests/ExportObjectTest.php -index 9c79f6f..66bc6d0 100644 ---- a/tests/ExportObjectTest.php -+++ b/tests/ExportObjectTest.php -@@ -171,13 +171,23 @@ public function testExportClassWithSetState(): void - $object->foo = 'Hello'; - $object->bar = 'World'; - -- $expected = <<<'PHP' -+ if (PHP_VERSION_ID >=80100) { -+ $expected = <<<'PHP' -+\Brick\VarExporter\Tests\Classes\SetState::__set_state([ -+ 'foo' => 'Hello', -+ 'bar' => 'World', -+ 'baz' => 'defaultValue' -+]) -+PHP; -+ } else { -+ $expected = <<<'PHP' - \Brick\VarExporter\Tests\Classes\SetState::__set_state([ - 'baz' => 'defaultValue', - 'foo' => 'Hello', - 'bar' => 'World' - ]) - PHP; -+ } - - $this->assertExportEquals($expected, $object); - } -@@ -189,12 +199,21 @@ public function testExportClassWithSetStateAndUnsetProperties(): void - - unset($object->bar); - -- $expected = <<<'PHP' -+ if (PHP_VERSION_ID >= 80100) { -+ $expected = <<<'PHP' -+\Brick\VarExporter\Tests\Classes\SetState::__set_state([ -+ 'foo' => null, -+ 'baz' => 'defaultValue' -+]) -+PHP; -+ } else { -+ $expected = <<<'PHP' - \Brick\VarExporter\Tests\Classes\SetState::__set_state([ - 'baz' => 'defaultValue', - 'foo' => null - ]) - PHP; -+ } - - $this->assertExportEquals($expected, $object); - } -@@ -207,7 +226,18 @@ public function testExportClassWithSetStateAndDynamicProperties(): void - $object->dynamic = 'Dynamic property'; - $object->{'123'} = 'Numeric dynamic property'; - -- $expected = <<<'PHP' -+ if (PHP_VERSION_ID >= 80100) { -+ $expected = <<<'PHP' -+\Brick\VarExporter\Tests\Classes\SetState::__set_state([ -+ 'foo' => 'Hello', -+ 'bar' => 'World', -+ 'baz' => 'defaultValue', -+ 'dynamic' => 'Dynamic property', -+ 123 => 'Numeric dynamic property' -+]) -+PHP; -+ } else { -+ $expected = <<<'PHP' - \Brick\VarExporter\Tests\Classes\SetState::__set_state([ - 'baz' => 'defaultValue', - 'foo' => 'Hello', -@@ -216,6 +246,7 @@ public function testExportClassWithSetStateAndDynamicProperties(): void - 123 => 'Numeric dynamic property' - ]) - PHP; -+ } - - $this->assertExportEquals($expected, $object); - } -@@ -227,13 +258,23 @@ public function testExportClassWithSetStateAndDynamicProperties_SkipDynamicPrope - $object->bar = 'World'; - $object->dynamic = 'Dynamic property'; - -- $expected = <<<'PHP' -+ if (PHP_VERSION_ID >= 80100) { -+ $expected = <<<'PHP' -+\Brick\VarExporter\Tests\Classes\SetState::__set_state([ -+ 'foo' => 'Hello', -+ 'bar' => 'World', -+ 'baz' => 'defaultValue' -+]) -+PHP; -+ } else { -+ $expected = <<<'PHP' - \Brick\VarExporter\Tests\Classes\SetState::__set_state([ - 'baz' => 'defaultValue', - 'foo' => 'Hello', - 'bar' => 'World' - ]) - PHP; -+ } - - $this->assertExportEquals($expected, $object, VarExporter::SKIP_DYNAMIC_PROPERTIES); - } -diff --git a/tests/VarExporterTest.php b/tests/VarExporterTest.php -index fb55120..99792b6 100644 ---- a/tests/VarExporterTest.php -+++ b/tests/VarExporterTest.php -@@ -49,7 +49,58 @@ public function testMixedVar(): void - 'aCustomObject' => $myObject - ]; - -- $expected = <<<'PHP' -+ if (PHP_VERSION_ID >= 80100) { -+ $expected = <<<'PHP' -+[ -+ 'aString' => 'Hello', -+ 'aTrue' => true, -+ 'aFalse' => false, -+ 'aNull' => null, -+ 'aFloat' => 0.75, -+ 'anInt' => 123, -+ 'aNumericArray' => [ -+ 'a', -+ 'b', -+ null, -+ [ -+ 'c' => 'd' -+ ] -+ ], -+ 'anAssociativeArray' => [ -+ 'a' => 'b', -+ 'c' => [ -+ 'd' => 'e', -+ 'f' => [ -+ 'g' => [ -+ [] -+ ] -+ ] -+ ] -+ ], -+ 'anObject' => (object) [ -+ 'type' => 'string', -+ '$ref' => '#/components/schema/User', -+ 'items' => (object) [ -+ 'foo' => 'bar', -+ 'empty' => (object) [] -+ ] -+ ], -+ 'aCustomObject' => (static function() { -+ $object = new \Brick\VarExporter\Tests\Classes\PublicPropertiesOnly; -+ -+ $object->foo = 'hello'; -+ $object->bar = \Brick\VarExporter\Tests\Classes\SetState::__set_state([ -+ 'foo' => 'SetState.foo', -+ 'bar' => 'SetState.bar', -+ 'baz' => 'defaultValue' -+ ]); -+ -+ return $object; -+ })() -+] -+PHP; -+ } else { -+ $expected = <<<'PHP' - [ - 'aString' => 'Hello', - 'aTrue' => true, -@@ -98,6 +149,7 @@ public function testMixedVar(): void - })() - ] - PHP; -+ } - - $this->assertExportEquals($expected, $var); - } diff --git a/php-brick-varexporter.spec b/php-brick-varexporter.spec index bd171b1..8230484 100644 --- a/php-brick-varexporter.spec +++ b/php-brick-varexporter.spec @@ -1,13 +1,13 @@ # remirepo/fedora spec file for php-brick-varexporter # -# Copyright (c) 2020-2021 Remi Collet +# Copyright (c) 2020-2022 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # # Github -%global gh_commit 05241f28dfcba2b51b11e2d750e296316ebbe518 +%global gh_commit 3361a8a30e807c0841a7ca98e5c72b6bffc73463 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner brick %global gh_project varexporter @@ -19,8 +19,8 @@ %global ns_project VarExporter Name: php-%{pk_vendor}-%{pk_name} -Version: 0.3.5 -Release: 4%{?dist} +Version: 0.3.6 +Release: 1%{?dist} Summary: A powerful alternative to var_export License: MIT @@ -29,9 +29,6 @@ Source0: %{name}-%{version}-%{gh_short}.tgz # Create git snapshot as tests are excluded from official tarball Source1: makesrc.sh -# Upstream patch for PHP 8.1 (test suite) -Patch0: %{name}-tests.patch - BuildArch: noarch BuildRequires: php(language) >= 7.2 @@ -79,7 +76,6 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 -b .up %build @@ -115,7 +111,7 @@ EOF : Run upstream test suite ret=0 -for cmdarg in "php %{phpunit}" php74 php80 php81; do +for cmdarg in "php %{phpunit}" php74 php80 php81 php82; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} \ @@ -134,6 +130,9 @@ exit $ret %changelog +* Thu Jun 16 2022 Remi Collet - 0.3.6-1 +- update to 0.3.6 + * Fri Jan 21 2022 Fedora Release Engineering - 0.3.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index d830bb4..ab0d4a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-brick-varexporter-0.3.5-05241f2.tgz) = 6b33714d9381b6f31e950f496df79ee22d7720e7098bf7d7b1cf0bf723ad40e26cfc58a91024664cb05f64c8355698294241c09ec49539d5e1ae50c6c86a0ceb +SHA512 (php-brick-varexporter-0.3.6-3361a8a.tgz) = ec8da3475a976669fe51e220679ee2691dae18caf945a9264376ca9407e5e9fbf0866c8c843b76862c3356907b95af9efc7cb3f3b40b4e6f4ccbcce9f6b07cdf From b30aedaf074d3736dc36fe7bccf9c81b29e91118 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 16 Jun 2022 09:25:25 +0200 Subject: [PATCH 04/19] v0.3.6 (cherry picked from commit 5854b3d2b29e2830edcaa0b6e53d9b4711036441) --- .gitignore | 1 + php-brick-varexporter.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 5611980..0e9e442 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /php-brick-varexporter-0.3.3-736378d.tgz /php-brick-varexporter-0.3.4-17e03b4.tgz /php-brick-varexporter-0.3.5-05241f2.tgz +/php-brick-varexporter-0.3.6-3361a8a.tgz diff --git a/php-brick-varexporter.spec b/php-brick-varexporter.spec index 5cb8801..77f57ff 100644 --- a/php-brick-varexporter.spec +++ b/php-brick-varexporter.spec @@ -1,13 +1,13 @@ # remirepo/fedora spec file for php-brick-varexporter # -# Copyright (c) 2020-2021 Remi Collet +# Copyright (c) 2020-2022 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # # Github -%global gh_commit 05241f28dfcba2b51b11e2d750e296316ebbe518 +%global gh_commit 3361a8a30e807c0841a7ca98e5c72b6bffc73463 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner brick %global gh_project varexporter @@ -19,8 +19,8 @@ %global ns_project VarExporter Name: php-%{pk_vendor}-%{pk_name} -Version: 0.3.5 -Release: 2%{?dist} +Version: 0.3.6 +Release: 1%{?dist} Summary: A powerful alternative to var_export License: MIT @@ -111,7 +111,7 @@ EOF : Run upstream test suite ret=0 -for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do +for cmdarg in "php %{phpunit}" php74 php80 php81 php82; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} \ @@ -130,6 +130,9 @@ exit $ret %changelog +* Thu Jun 16 2022 Remi Collet - 0.3.6-1 +- update to 0.3.6 + * Fri Jul 23 2021 Fedora Release Engineering - 0.3.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index d830bb4..ab0d4a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-brick-varexporter-0.3.5-05241f2.tgz) = 6b33714d9381b6f31e950f496df79ee22d7720e7098bf7d7b1cf0bf723ad40e26cfc58a91024664cb05f64c8355698294241c09ec49539d5e1ae50c6c86a0ceb +SHA512 (php-brick-varexporter-0.3.6-3361a8a.tgz) = ec8da3475a976669fe51e220679ee2691dae18caf945a9264376ca9407e5e9fbf0866c8c843b76862c3356907b95af9efc7cb3f3b40b4e6f4ccbcce9f6b07cdf From cf7c22ee1fee207e7a38a6c00de69788887f339b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 30 Jun 2022 07:26:00 +0200 Subject: [PATCH 05/19] v0.3.7 --- .gitignore | 1 + php-brick-varexporter.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0e9e442..3af8a65 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /php-brick-varexporter-0.3.4-17e03b4.tgz /php-brick-varexporter-0.3.5-05241f2.tgz /php-brick-varexporter-0.3.6-3361a8a.tgz +/php-brick-varexporter-0.3.7-3e263cd.tgz diff --git a/php-brick-varexporter.spec b/php-brick-varexporter.spec index 8230484..5072a3e 100644 --- a/php-brick-varexporter.spec +++ b/php-brick-varexporter.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # # Github -%global gh_commit 3361a8a30e807c0841a7ca98e5c72b6bffc73463 +%global gh_commit 3e263cd718d242594c52963760fee2059fd5833c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner brick %global gh_project varexporter @@ -19,7 +19,7 @@ %global ns_project VarExporter Name: php-%{pk_vendor}-%{pk_name} -Version: 0.3.6 +Version: 0.3.7 Release: 1%{?dist} Summary: A powerful alternative to var_export @@ -130,6 +130,9 @@ exit $ret %changelog +* Thu Jun 30 2022 Remi Collet - 0.3.7-1 +- update to 0.3.7 + * Thu Jun 16 2022 Remi Collet - 0.3.6-1 - update to 0.3.6 diff --git a/sources b/sources index ab0d4a2..958e4e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-brick-varexporter-0.3.6-3361a8a.tgz) = ec8da3475a976669fe51e220679ee2691dae18caf945a9264376ca9407e5e9fbf0866c8c843b76862c3356907b95af9efc7cb3f3b40b4e6f4ccbcce9f6b07cdf +SHA512 (php-brick-varexporter-0.3.7-3e263cd.tgz) = 6586d633d56863a656afb029dc8acccf8fa5723690e71c98f5723d55be2f55bcae5f02786f7487cf51ba359538673d581f50da3351e6eb57b698c6e72a200c9d From 1e55bc803f7af7fd90a39838aa449ffc4bc38ec8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 30 Jun 2022 07:26:00 +0200 Subject: [PATCH 06/19] v0.3.7 (cherry picked from commit cf7c22ee1fee207e7a38a6c00de69788887f339b) --- .gitignore | 1 + php-brick-varexporter.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0e9e442..3af8a65 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /php-brick-varexporter-0.3.4-17e03b4.tgz /php-brick-varexporter-0.3.5-05241f2.tgz /php-brick-varexporter-0.3.6-3361a8a.tgz +/php-brick-varexporter-0.3.7-3e263cd.tgz diff --git a/php-brick-varexporter.spec b/php-brick-varexporter.spec index 77f57ff..275e5bb 100644 --- a/php-brick-varexporter.spec +++ b/php-brick-varexporter.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # # Github -%global gh_commit 3361a8a30e807c0841a7ca98e5c72b6bffc73463 +%global gh_commit 3e263cd718d242594c52963760fee2059fd5833c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner brick %global gh_project varexporter @@ -19,7 +19,7 @@ %global ns_project VarExporter Name: php-%{pk_vendor}-%{pk_name} -Version: 0.3.6 +Version: 0.3.7 Release: 1%{?dist} Summary: A powerful alternative to var_export @@ -130,6 +130,9 @@ exit $ret %changelog +* Thu Jun 30 2022 Remi Collet - 0.3.7-1 +- update to 0.3.7 + * Thu Jun 16 2022 Remi Collet - 0.3.6-1 - update to 0.3.6 diff --git a/sources b/sources index ab0d4a2..958e4e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-brick-varexporter-0.3.6-3361a8a.tgz) = ec8da3475a976669fe51e220679ee2691dae18caf945a9264376ca9407e5e9fbf0866c8c843b76862c3356907b95af9efc7cb3f3b40b4e6f4ccbcce9f6b07cdf +SHA512 (php-brick-varexporter-0.3.7-3e263cd.tgz) = 6586d633d56863a656afb029dc8acccf8fa5723690e71c98f5723d55be2f55bcae5f02786f7487cf51ba359538673d581f50da3351e6eb57b698c6e72a200c9d From 00db3f71c1329dd7e4f20fb8f2ef831c2ed79d4a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 13:13:17 +0000 Subject: [PATCH 07/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-brick-varexporter.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-brick-varexporter.spec b/php-brick-varexporter.spec index 5072a3e..2981be2 100644 --- a/php-brick-varexporter.spec +++ b/php-brick-varexporter.spec @@ -20,7 +20,7 @@ Name: php-%{pk_vendor}-%{pk_name} Version: 0.3.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A powerful alternative to var_export License: MIT @@ -130,6 +130,9 @@ exit $ret %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 0.3.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jun 30 2022 Remi Collet - 0.3.7-1 - update to 0.3.7 From d7c9b4ee60c77cfea5b0583594691551e767c573 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 08:18:46 +0000 Subject: [PATCH 08/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-brick-varexporter.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-brick-varexporter.spec b/php-brick-varexporter.spec index 2981be2..d2e7795 100644 --- a/php-brick-varexporter.spec +++ b/php-brick-varexporter.spec @@ -20,7 +20,7 @@ Name: php-%{pk_vendor}-%{pk_name} Version: 0.3.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A powerful alternative to var_export License: MIT @@ -130,6 +130,9 @@ exit $ret %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 0.3.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jul 22 2022 Fedora Release Engineering - 0.3.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 5ac47c77fe97b08fa069e929974551364de8c65e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 25 Jan 2023 10:27:24 +0100 Subject: [PATCH 09/19] v0.3.8 --- .gitignore | 1 + php-brick-varexporter.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 3af8a65..8d496cc 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /php-brick-varexporter-0.3.5-05241f2.tgz /php-brick-varexporter-0.3.6-3361a8a.tgz /php-brick-varexporter-0.3.7-3e263cd.tgz +/php-brick-varexporter-0.3.8-b5853ed.tgz diff --git a/php-brick-varexporter.spec b/php-brick-varexporter.spec index d2e7795..7425afb 100644 --- a/php-brick-varexporter.spec +++ b/php-brick-varexporter.spec @@ -1,13 +1,13 @@ # remirepo/fedora spec file for php-brick-varexporter # -# Copyright (c) 2020-2022 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2020-2023 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # # Github -%global gh_commit 3e263cd718d242594c52963760fee2059fd5833c +%global gh_commit b5853edea6204ff8fa10633c3a4cccc4058410ed %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner brick %global gh_project varexporter @@ -19,8 +19,8 @@ %global ns_project VarExporter Name: php-%{pk_vendor}-%{pk_name} -Version: 0.3.7 -Release: 3%{?dist} +Version: 0.3.8 +Release: 1%{?dist} Summary: A powerful alternative to var_export License: MIT @@ -111,7 +111,7 @@ EOF : Run upstream test suite ret=0 -for cmdarg in "php %{phpunit}" php74 php80 php81 php82; do +for cmdarg in "php %{phpunit}" php80 php81 php82; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} \ @@ -130,6 +130,9 @@ exit $ret %changelog +* Wed Jan 25 2023 Remi Collet - 0.3.8-1 +- update to 0.3.8 + * Fri Jan 20 2023 Fedora Release Engineering - 0.3.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 958e4e4..dfddd2e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-brick-varexporter-0.3.7-3e263cd.tgz) = 6586d633d56863a656afb029dc8acccf8fa5723690e71c98f5723d55be2f55bcae5f02786f7487cf51ba359538673d581f50da3351e6eb57b698c6e72a200c9d +SHA512 (php-brick-varexporter-0.3.8-b5853ed.tgz) = 8185fe7d54748b13dd1cb12701c5904043e5e213d7facfc900e05c7bb33172450cb640b26b39ab8a0ed5e30fa4a2cc7af571b2d9d4a2d0c6dd6e5454c8ea2cb1 From f45c3c478c9884094853b7a5d04cfc80eb86a4ce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 04:06:22 +0000 Subject: [PATCH 10/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-brick-varexporter.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-brick-varexporter.spec b/php-brick-varexporter.spec index 7425afb..e2ff946 100644 --- a/php-brick-varexporter.spec +++ b/php-brick-varexporter.spec @@ -20,7 +20,7 @@ Name: php-%{pk_vendor}-%{pk_name} Version: 0.3.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A powerful alternative to var_export License: MIT @@ -130,6 +130,9 @@ exit $ret %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 0.3.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 25 2023 Remi Collet - 0.3.8-1 - update to 0.3.8 From 32b5c9a26b547e638f041df3c4803e8c0b3c0dea Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 Sep 2023 15:40:14 +0200 Subject: [PATCH 11/19] update to 0.4.0 raise dependency on PHP 7.4 --- .gitignore | 1 + php-brick-varexporter.spec | 23 +++++++++++------------ sources | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 8d496cc..735ff03 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /php-brick-varexporter-0.3.6-3361a8a.tgz /php-brick-varexporter-0.3.7-3e263cd.tgz /php-brick-varexporter-0.3.8-b5853ed.tgz +/php-brick-varexporter-0.4.0-2fd038f.tgz diff --git a/php-brick-varexporter.spec b/php-brick-varexporter.spec index e2ff946..3afdc2f 100644 --- a/php-brick-varexporter.spec +++ b/php-brick-varexporter.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # # Github -%global gh_commit b5853edea6204ff8fa10633c3a4cccc4058410ed +%global gh_commit 2fd038f7c9d12d468130c6e1b3ce06e4160a7dbb %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner brick %global gh_project varexporter @@ -19,8 +19,8 @@ %global ns_project VarExporter Name: php-%{pk_vendor}-%{pk_name} -Version: 0.3.8 -Release: 2%{?dist} +Version: 0.4.0 +Release: 1%{?dist} Summary: A powerful alternative to var_export License: MIT @@ -31,7 +31,7 @@ Source1: makesrc.sh BuildArch: noarch -BuildRequires: php(language) >= 7.2 +BuildRequires: php(language) >= 7.4 BuildRequires: (php-composer(nikic/php-parser) >= 4.0 with php-composer(nikic/php-parser) < 5) BuildRequires: php-reflection BuildRequires: php-date @@ -40,19 +40,14 @@ BuildRequires: php-spl # From composer.json, "require-dev": { # "phpunit/phpunit": "^8.5 || ^9.0", # "php-coveralls/php-coveralls": "^2.2", -# "vimeo/psalm": "4.4.1" -%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9 +# "vimeo/psalm": "5.15.0" BuildRequires: phpunit9 %global phpunit %{_bindir}/phpunit9 -%else -BuildRequires: phpunit8 >= 8.5 -%global phpunit %{_bindir}/phpunit8 -%endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer.json, "require": { -# "php": "^7.2 || ^8.0", +# "php": "^7.4 || ^8.0", # "nikic/php-parser": "^4.0" Requires: php(language) >= 7.2 Requires: (php-composer(nikic/php-parser) >= 4.0 with php-composer(nikic/php-parser) < 5) @@ -111,7 +106,7 @@ EOF : Run upstream test suite ret=0 -for cmdarg in "php %{phpunit}" php80 php81 php82; do +for cmdarg in "php %{phpunit}" php80 php81 php82 php83; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} \ @@ -130,6 +125,10 @@ exit $ret %changelog +* Mon Sep 4 2023 Remi Collet - 0.4.0-1 +- update to 0.4.0 +- raise dependency on PHP 7.4 + * Fri Jul 21 2023 Fedora Release Engineering - 0.3.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index dfddd2e..4105212 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-brick-varexporter-0.3.8-b5853ed.tgz) = 8185fe7d54748b13dd1cb12701c5904043e5e213d7facfc900e05c7bb33172450cb640b26b39ab8a0ed5e30fa4a2cc7af571b2d9d4a2d0c6dd6e5454c8ea2cb1 +SHA512 (php-brick-varexporter-0.4.0-2fd038f.tgz) = f48cde85a6bb3681a1eab24c8cb24bdce1bbcc1163478ab354c05e8220224183f5b8d16303d48209dcf7b4734d7f4c584e64e6505a3dfd01f9ed84f891f518c6 From e3a5d3f20e3fd683c5b2f8b3bcd3b87b99e5e0c7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 20:43:16 +0000 Subject: [PATCH 12/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-brick-varexporter.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-brick-varexporter.spec b/php-brick-varexporter.spec index 3afdc2f..2f3a244 100644 --- a/php-brick-varexporter.spec +++ b/php-brick-varexporter.spec @@ -20,7 +20,7 @@ Name: php-%{pk_vendor}-%{pk_name} Version: 0.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A powerful alternative to var_export License: MIT @@ -125,6 +125,9 @@ exit $ret %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 0.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Sep 4 2023 Remi Collet - 0.4.0-1 - update to 0.4.0 - raise dependency on PHP 7.4 From 68bf63c76f29652daa0038b390fcb37a3fbb766a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 22:29:21 +0000 Subject: [PATCH 13/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-brick-varexporter.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-brick-varexporter.spec b/php-brick-varexporter.spec index 2f3a244..6a3c909 100644 --- a/php-brick-varexporter.spec +++ b/php-brick-varexporter.spec @@ -20,7 +20,7 @@ Name: php-%{pk_vendor}-%{pk_name} Version: 0.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A powerful alternative to var_export License: MIT @@ -125,6 +125,9 @@ exit $ret %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 0.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 0.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 2cb1b30397dc61b005c1a7a20da1bc7232df8a30 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 13 May 2024 14:47:35 +0200 Subject: [PATCH 14/19] update to 0.5.0 raise dependency on nikic/php-parser 5.0 --- .gitignore | 1 + php-brick-varexporter.spec | 24 ++++++++++++++---------- sources | 2 +- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 735ff03..0e4c97a 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /php-brick-varexporter-0.3.7-3e263cd.tgz /php-brick-varexporter-0.3.8-b5853ed.tgz /php-brick-varexporter-0.4.0-2fd038f.tgz +/php-brick-varexporter-0.5.0-84b2a7a.tgz diff --git a/php-brick-varexporter.spec b/php-brick-varexporter.spec index 6a3c909..627bf29 100644 --- a/php-brick-varexporter.spec +++ b/php-brick-varexporter.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # # Github -%global gh_commit 2fd038f7c9d12d468130c6e1b3ce06e4160a7dbb +%global gh_commit 84b2a7a91f69aa5d079aec5a0a7256ebf2dceb6b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner brick %global gh_project varexporter @@ -19,8 +19,8 @@ %global ns_project VarExporter Name: php-%{pk_vendor}-%{pk_name} -Version: 0.4.0 -Release: 3%{?dist} +Version: 0.5.0 +Release: 1%{?dist} Summary: A powerful alternative to var_export License: MIT @@ -32,25 +32,25 @@ Source1: makesrc.sh BuildArch: noarch BuildRequires: php(language) >= 7.4 -BuildRequires: (php-composer(nikic/php-parser) >= 4.0 with php-composer(nikic/php-parser) < 5) +BuildRequires: (php-composer(nikic/php-parser) >= 5.0 with php-composer(nikic/php-parser) < 6) BuildRequires: php-reflection BuildRequires: php-date BuildRequires: php-pcre BuildRequires: php-spl # From composer.json, "require-dev": { -# "phpunit/phpunit": "^8.5 || ^9.0", +# "phpunit/phpunit": "^9.3", # "php-coveralls/php-coveralls": "^2.2", -# "vimeo/psalm": "5.15.0" -BuildRequires: phpunit9 +# "psalm/phar": "5.21.1" +BuildRequires: phpunit9 >= 9.3 %global phpunit %{_bindir}/phpunit9 # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer.json, "require": { # "php": "^7.4 || ^8.0", -# "nikic/php-parser": "^4.0" +# "nikic/php-parser": "^5.0" Requires: php(language) >= 7.2 -Requires: (php-composer(nikic/php-parser) >= 4.0 with php-composer(nikic/php-parser) < 5) +Requires: (php-composer(nikic/php-parser) >= 5.0 with php-composer(nikic/php-parser) < 6) # From phpcompatifo report for 0.3.2 Requires: php-reflection Requires: php-pcre @@ -83,7 +83,7 @@ phpab \ cat << 'EOF' | tee -a src/autoload.php \Fedora\Autoloader\Dependencies::required([ - '/usr/share/php/PhpParser4/autoload.php', + '/usr/share/php/PhpParser5/autoload.php', ]); EOF @@ -125,6 +125,10 @@ exit $ret %changelog +* Mon May 13 2024 Remi Collet - 0.5.0-1 +- update to 0.5.0 +- raise dependency on nikic/php-parser 5.0 + * Thu Jan 25 2024 Fedora Release Engineering - 0.4.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 4105212..bdb2d47 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-brick-varexporter-0.4.0-2fd038f.tgz) = f48cde85a6bb3681a1eab24c8cb24bdce1bbcc1163478ab354c05e8220224183f5b8d16303d48209dcf7b4734d7f4c584e64e6505a3dfd01f9ed84f891f518c6 +SHA512 (php-brick-varexporter-0.5.0-84b2a7a.tgz) = 37e0592238044a5e785c38b74fcbd2493dfb5fd04ade7e1d48f3868d2ffd894710f8ae590dfe2ba83e8c949da7742eccb64c305c58dcd92e151614cc1535b4a4 From ae0b93dc075c48989005499387e967fe0d627d21 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 06:45:45 +0000 Subject: [PATCH 15/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- php-brick-varexporter.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-brick-varexporter.spec b/php-brick-varexporter.spec index 627bf29..552b5dd 100644 --- a/php-brick-varexporter.spec +++ b/php-brick-varexporter.spec @@ -20,7 +20,7 @@ Name: php-%{pk_vendor}-%{pk_name} Version: 0.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A powerful alternative to var_export License: MIT @@ -125,6 +125,9 @@ exit $ret %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 0.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon May 13 2024 Remi Collet - 0.5.0-1 - update to 0.5.0 - raise dependency on nikic/php-parser 5.0 From 3f0eaee7a3131d7d1ac8d0764b7b2a9ca1be4ae1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 08:56:33 +0000 Subject: [PATCH 16/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- php-brick-varexporter.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-brick-varexporter.spec b/php-brick-varexporter.spec index 552b5dd..7a2b6e0 100644 --- a/php-brick-varexporter.spec +++ b/php-brick-varexporter.spec @@ -20,7 +20,7 @@ Name: php-%{pk_vendor}-%{pk_name} Version: 0.5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A powerful alternative to var_export License: MIT @@ -125,6 +125,9 @@ exit $ret %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 0.5.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 19 2024 Fedora Release Engineering - 0.5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From b572ec55235e480b56f2b1c714aa67d630f7c9d3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 25 Feb 2025 09:51:21 +0100 Subject: [PATCH 17/19] update to 0.6.0 re-license spec file to CECILL-2.1 raise dependency on PHP 8.1 --- .gitignore | 1 + php-brick-varexporter.spec | 38 +++++++++++++++++++++----------------- sources | 2 +- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 0e4c97a..6348221 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /php-brick-varexporter-0.3.8-b5853ed.tgz /php-brick-varexporter-0.4.0-2fd038f.tgz /php-brick-varexporter-0.5.0-84b2a7a.tgz +/php-brick-varexporter-0.6.0-af98bfc.tgz diff --git a/php-brick-varexporter.spec b/php-brick-varexporter.spec index 7a2b6e0..97b06b0 100644 --- a/php-brick-varexporter.spec +++ b/php-brick-varexporter.spec @@ -1,13 +1,13 @@ # remirepo/fedora spec file for php-brick-varexporter # -# Copyright (c) 2020-2023 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2020-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # # Github -%global gh_commit 84b2a7a91f69aa5d079aec5a0a7256ebf2dceb6b +%global gh_commit af98bfc2b702a312abbcaff37656dbe419cec5bc %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner brick %global gh_project varexporter @@ -19,8 +19,8 @@ %global ns_project VarExporter Name: php-%{pk_vendor}-%{pk_name} -Version: 0.5.0 -Release: 3%{?dist} +Version: 0.6.0 +Release: 1%{?dist} Summary: A powerful alternative to var_export License: MIT @@ -31,25 +31,25 @@ Source1: makesrc.sh BuildArch: noarch -BuildRequires: php(language) >= 7.4 +BuildRequires: php(language) >= 8.1 BuildRequires: (php-composer(nikic/php-parser) >= 5.0 with php-composer(nikic/php-parser) < 6) BuildRequires: php-reflection BuildRequires: php-date BuildRequires: php-pcre BuildRequires: php-spl # From composer.json, "require-dev": { -# "phpunit/phpunit": "^9.3", +# "phpunit/phpunit": "^10.5", # "php-coveralls/php-coveralls": "^2.2", -# "psalm/phar": "5.21.1" -BuildRequires: phpunit9 >= 9.3 -%global phpunit %{_bindir}/phpunit9 +# "vimeo/psalm": "6.8.4" +BuildRequires: phpunit10 >= 10.5 +%global phpunit %{_bindir}/phpunit10 # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer.json, "require": { -# "php": "^7.4 || ^8.0", +# "php": "^8.1", # "nikic/php-parser": "^5.0" -Requires: php(language) >= 7.2 +Requires: php(language) >= 8.1 Requires: (php-composer(nikic/php-parser) >= 5.0 with php-composer(nikic/php-parser) < 6) # From phpcompatifo report for 0.3.2 Requires: php-reflection @@ -106,12 +106,11 @@ EOF : Run upstream test suite ret=0 -for cmdarg in "php %{phpunit}" php80 php81 php82 php83; do +for cmdarg in "php %{phpunit}" php81 php82 php83 php84; do if which $cmdarg; then set $cmdarg - $1 ${2:-%{_bindir}/phpunit9} \ - --no-coverage \ - --verbose || ret=1 + $1 ${2:-%{_bindir}/phpunit10} \ + --no-coverage || ret=1 fi done exit $ret @@ -125,6 +124,11 @@ exit $ret %changelog +* Tue Feb 25 2025 Remi Collet - 0.6.0-1 +- update to 0.6.0 +- re-license spec file to CECILL-2.1 +- raise dependency on PHP 8.1 + * Sat Jan 18 2025 Fedora Release Engineering - 0.5.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index bdb2d47..d85bcac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-brick-varexporter-0.5.0-84b2a7a.tgz) = 37e0592238044a5e785c38b74fcbd2493dfb5fd04ade7e1d48f3868d2ffd894710f8ae590dfe2ba83e8c949da7742eccb64c305c58dcd92e151614cc1535b4a4 +SHA512 (php-brick-varexporter-0.6.0-af98bfc.tgz) = a7b0ecb89adf728c738e741cf5b106414b0a8d43e5c2ad5942d83163f049bdd6dde6c658868f8609284cc8dfc3d05044e093a1db9f17503a92f3ef28fee8edda From 27abebf5214882ed6d9261fab2eb8850d7f15679 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 05:09:32 +0000 Subject: [PATCH 18/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- php-brick-varexporter.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-brick-varexporter.spec b/php-brick-varexporter.spec index 97b06b0..c7120ed 100644 --- a/php-brick-varexporter.spec +++ b/php-brick-varexporter.spec @@ -20,7 +20,7 @@ Name: php-%{pk_vendor}-%{pk_name} Version: 0.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A powerful alternative to var_export License: MIT @@ -124,6 +124,9 @@ exit $ret %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Feb 25 2025 Remi Collet - 0.6.0-1 - update to 0.6.0 - re-license spec file to CECILL-2.1 From 25789d8f4d812cc94bfd5d4bad348c9da18fe404 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 7 Jan 2026 08:54:08 +0100 Subject: [PATCH 19/19] update to 0.7.0 raise dependency on PHP 8.2 switch to phpunit11 --- .gitignore | 1 + php-brick-varexporter.spec | 39 +++++++++++++++++++------------------- sources | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 6348221..e994d97 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /php-brick-varexporter-0.4.0-2fd038f.tgz /php-brick-varexporter-0.5.0-84b2a7a.tgz /php-brick-varexporter-0.6.0-af98bfc.tgz +/php-brick-varexporter-0.7.0-b3a50b8.tgz diff --git a/php-brick-varexporter.spec b/php-brick-varexporter.spec index c7120ed..2fcf91e 100644 --- a/php-brick-varexporter.spec +++ b/php-brick-varexporter.spec @@ -1,13 +1,13 @@ # remirepo/fedora spec file for php-brick-varexporter # -# SPDX-FileCopyrightText: Copyright 2020-2025 Remi Collet +# SPDX-FileCopyrightText: Copyright 2020-2026 Remi Collet # SPDX-License-Identifier: CECILL-2.1 # http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # # Github -%global gh_commit af98bfc2b702a312abbcaff37656dbe419cec5bc +%global gh_commit b3a50b8f630a9ed5015ea3e1f00479af261ed80d %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner brick %global gh_project varexporter @@ -19,8 +19,8 @@ %global ns_project VarExporter Name: php-%{pk_vendor}-%{pk_name} -Version: 0.6.0 -Release: 2%{?dist} +Version: 0.7.0 +Release: 1%{?dist} Summary: A powerful alternative to var_export License: MIT @@ -31,30 +31,24 @@ Source1: makesrc.sh BuildArch: noarch -BuildRequires: php(language) >= 8.1 +BuildRequires: php(language) >= 8.2 BuildRequires: (php-composer(nikic/php-parser) >= 5.0 with php-composer(nikic/php-parser) < 6) -BuildRequires: php-reflection -BuildRequires: php-date -BuildRequires: php-pcre -BuildRequires: php-spl # From composer.json, "require-dev": { -# "phpunit/phpunit": "^10.5", +# "phpunit/phpunit": "^11.0", # "php-coveralls/php-coveralls": "^2.2", -# "vimeo/psalm": "6.8.4" -BuildRequires: phpunit10 >= 10.5 -%global phpunit %{_bindir}/phpunit10 +# "vimeo/psalm": "6.14.3" +BuildRequires: phpunit11 +%global phpunit %{_bindir}/phpunit11 # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer.json, "require": { -# "php": "^8.1", +# "php": "^8.2", # "nikic/php-parser": "^5.0" -Requires: php(language) >= 8.1 +Requires: php(language) >= 8.2 Requires: (php-composer(nikic/php-parser) >= 5.0 with php-composer(nikic/php-parser) < 6) # From phpcompatifo report for 0.3.2 -Requires: php-reflection -Requires: php-pcre -Requires: php-spl +# Only reflection pcre spl # Autoloader Requires: php-composer(fedora/autoloader) @@ -106,10 +100,10 @@ EOF : Run upstream test suite ret=0 -for cmdarg in "php %{phpunit}" php81 php82 php83 php84; do +for cmdarg in "php %{phpunit}" php82 php83 php84 php85; do if which $cmdarg; then set $cmdarg - $1 ${2:-%{_bindir}/phpunit10} \ + $1 ${2:-%{_bindir}/phpunit11} \ --no-coverage || ret=1 fi done @@ -124,6 +118,11 @@ exit $ret %changelog +* Wed Jan 7 2026 Remi Collet - 0.7.0-1 +- update to 0.7.0 +- raise dependency on PHP 8.2 +- switch to phpunit11 + * Fri Jul 25 2025 Fedora Release Engineering - 0.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index d85bcac..df613c1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-brick-varexporter-0.6.0-af98bfc.tgz) = a7b0ecb89adf728c738e741cf5b106414b0a8d43e5c2ad5942d83163f049bdd6dde6c658868f8609284cc8dfc3d05044e093a1db9f17503a92f3ef28fee8edda +SHA512 (php-brick-varexporter-0.7.0-b3a50b8.tgz) = dd46db3e875dbfd4b5a3e904f4bef357b98b0d3dfeb676a37b8c128d5afd46d76cfcff0abd677cef9a0ff43fc1e65bc0e47dc5674365f0a7cb9742996c1357b3