From patchwork Tue Dec 19 13:56:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 57726 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EB8F027BBE9; Tue, 19 Dec 2023 14:11:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8A03627BBEA for ; Tue, 19 Dec 2023 14:11:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rFaoQ-00058g-SG; Tue, 19 Dec 2023 09:11:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rFaoJ-00052s-T0 for guix-patches@gnu.org; Tue, 19 Dec 2023 09:11:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rFaoI-0005Va-Cj for guix-patches@gnu.org; Tue, 19 Dec 2023 09:11:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rFaoK-0004P0-Ul for guix-patches@gnu.org; Tue, 19 Dec 2023 09:11:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67902] [PATCH 14/95] gnu: Add php-hamcrest-hamcrest-php. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Dec 2023 14:11:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67902 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67902@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 67902-submit@debbugs.gnu.org id=B67902.170299502316450 (code B ref 67902); Tue, 19 Dec 2023 14:11:04 +0000 Received: (at 67902) by debbugs.gnu.org; 19 Dec 2023 14:10:23 +0000 Received: from localhost ([127.0.0.1]:34785 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFanf-0004H8-0A for submit@debbugs.gnu.org; Tue, 19 Dec 2023 09:10:23 -0500 Received: from 6.mo582.mail-out.ovh.net ([87.98.177.69]:48447) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFanL-0004DA-GK for 67902@debbugs.gnu.org; Tue, 19 Dec 2023 09:10:07 -0500 Received: from director3.ghost.mail-out.ovh.net (unknown [10.108.17.43]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id 74A8329EC5 for <67902@debbugs.gnu.org>; Tue, 19 Dec 2023 14:09:58 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-sdwtt (unknown [10.110.168.127]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 3145D1FD24; Tue, 19 Dec 2023 14:09:58 +0000 (UTC) Received: from ngraves.fr ([37.59.142.102]) by ghost-submission-6684bf9d7b-sdwtt with ESMTPSA id aw8ECzakgWUvvAAANP0lQQ (envelope-from ); Tue, 19 Dec 2023 14:09:58 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-102R0046c9326a8-8a19-4c9b-afb0-a4ca44609014, 0A183DEDD9F7D7733B4F13041BD52F66DC821FED) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 Date: Tue, 19 Dec 2023 14:56:55 +0100 Message-ID: <20231219140934.22783-14-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231219140934.22783-1-ngraves@ngraves.fr> References: <20231219140934.22783-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 11832645073810285282 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvddutddgieduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdehleeiffehtedvlefhffffjeefgfduhfetkeevheeiteduiedugfekuedtheejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegtddrudegvddpfeejrdehledrudegvddruddtvdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieejledtvdesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekvddpmhhouggvpehsmhhtphhouhht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/php-xyz.scm (php-hamcrest-hamcrest-php): New variable. * gnu/packages/patches/php-hamcrest-hamcrest-php-phpunit-compatibility.patch: New file. Change-Id: I573bbb3eb909c3d4ce2b560d925ea8da55d380f2 --- ...t-hamcrest-php-phpunit-compatibility.patch | 190 ++++++++++++++++++ gnu/packages/php-xyz.scm | 40 ++++ 2 files changed, 230 insertions(+) create mode 100644 gnu/packages/patches/php-hamcrest-hamcrest-php-phpunit-compatibility.patch diff --git a/gnu/packages/patches/php-hamcrest-hamcrest-php-phpunit-compatibility.patch b/gnu/packages/patches/php-hamcrest-hamcrest-php-phpunit-compatibility.patch new file mode 100644 index 0000000000..40b38d30de --- /dev/null +++ b/gnu/packages/patches/php-hamcrest-hamcrest-php-phpunit-compatibility.patch @@ -0,0 +1,190 @@ +From a23ce52b659b841fcc693ca800be8794d963c929 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?David=20Pr=C3=A9vot?= +Date: Sun, 12 Jul 2020 12:18:05 -0400 +Subject: [PATCH] Compatibility with recent PHPUnit (8) + +--- + tests/Hamcrest/Core/CombinableMatcherTest.php | 2 +- + tests/Hamcrest/Core/IsInstanceOfTest.php | 2 +- + tests/Hamcrest/Core/SetTest.php | 2 +- + tests/Hamcrest/FeatureMatcherTest.php | 2 +- + tests/Hamcrest/MatcherAssertTest.php | 2 +- + tests/Hamcrest/StringDescriptionTest.php | 2 +- + tests/Hamcrest/Text/IsEqualIgnoringWhiteSpaceTest.php | 2 +- + tests/Hamcrest/Text/StringContainsIgnoringCaseTest.php | 2 +- + tests/Hamcrest/Text/StringContainsInOrderTest.php | 2 +- + tests/Hamcrest/Text/StringContainsTest.php | 2 +- + tests/Hamcrest/Text/StringEndsWithTest.php | 2 +- + tests/Hamcrest/Text/StringStartsWithTest.php | 2 +- + tests/Hamcrest/Xml/HasXPathTest.php | 2 +- + 13 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/tests/Hamcrest/Core/CombinableMatcherTest.php b/tests/Hamcrest/Core/CombinableMatcherTest.php +index 463c75437..5a5fe235c 100644 +--- a/tests/Hamcrest/Core/CombinableMatcherTest.php ++++ b/tests/Hamcrest/Core/CombinableMatcherTest.php +@@ -7,7 +7,7 @@ class CombinableMatcherTest extends \Hamcrest\AbstractMatcherTest + private $_either_3_or_4; + private $_not_3_and_not_4; + +- protected function setUp() ++ protected function setUp(): void + { + $this->_either_3_or_4 = \Hamcrest\Core\CombinableMatcher::either(equalTo(3))->orElse(equalTo(4)); + $this->_not_3_and_not_4 = \Hamcrest\Core\CombinableMatcher::both(not(equalTo(3)))->andAlso(not(equalTo(4))); +diff --git a/tests/Hamcrest/Core/IsInstanceOfTest.php b/tests/Hamcrest/Core/IsInstanceOfTest.php +index f74cfdb52..0d6228ae5 100644 +--- a/tests/Hamcrest/Core/IsInstanceOfTest.php ++++ b/tests/Hamcrest/Core/IsInstanceOfTest.php +@@ -7,7 +7,7 @@ class IsInstanceOfTest extends \Hamcrest\AbstractMatcherTest + private $_baseClassInstance; + private $_subClassInstance; + +- protected function setUp() ++ protected function setUp(): void + { + $this->_baseClassInstance = new \Hamcrest\Core\SampleBaseClass('good'); + $this->_subClassInstance = new \Hamcrest\Core\SampleSubClass('good'); +diff --git a/tests/Hamcrest/Core/SetTest.php b/tests/Hamcrest/Core/SetTest.php +index aa5e4e7be..35ae3b996 100644 +--- a/tests/Hamcrest/Core/SetTest.php ++++ b/tests/Hamcrest/Core/SetTest.php +@@ -7,7 +7,7 @@ class SetTest extends \Hamcrest\AbstractMatcherTest + public static $_classProperty; + public $_instanceProperty; + +- protected function setUp() ++ protected function setUp(): void + { + self::$_classProperty = null; + unset($this->_instanceProperty); +diff --git a/tests/Hamcrest/FeatureMatcherTest.php b/tests/Hamcrest/FeatureMatcherTest.php +index 1b0230498..0308300ac 100644 +--- a/tests/Hamcrest/FeatureMatcherTest.php ++++ b/tests/Hamcrest/FeatureMatcherTest.php +@@ -34,7 +34,7 @@ class FeatureMatcherTest extends \Hamcrest\AbstractMatcherTest + + private $_resultMatcher; + +- protected function setUp() ++ protected function setUp(): void + { + $this->_resultMatcher = $this->_resultMatcher(); + } +diff --git a/tests/Hamcrest/MatcherAssertTest.php b/tests/Hamcrest/MatcherAssertTest.php +index dc12fba54..ee287fb1e 100644 +--- a/tests/Hamcrest/MatcherAssertTest.php ++++ b/tests/Hamcrest/MatcherAssertTest.php +@@ -6,7 +6,7 @@ + class MatcherAssertTest extends TestCase + { + +- protected function setUp() ++ protected function setUp(): void + { + \Hamcrest\MatcherAssert::resetCount(); + } +diff --git a/tests/Hamcrest/StringDescriptionTest.php b/tests/Hamcrest/StringDescriptionTest.php +index ed716d13e..402682ac7 100644 +--- a/tests/Hamcrest/StringDescriptionTest.php ++++ b/tests/Hamcrest/StringDescriptionTest.php +@@ -23,7 +23,7 @@ class StringDescriptionTest extends TestCase + + private $_description; + +- protected function setUp() ++ protected function setUp(): void + { + $this->_description = new \Hamcrest\StringDescription(); + } +diff --git a/tests/Hamcrest/Text/IsEqualIgnoringWhiteSpaceTest.php b/tests/Hamcrest/Text/IsEqualIgnoringWhiteSpaceTest.php +index 27ad338b7..48ad19eb9 100644 +--- a/tests/Hamcrest/Text/IsEqualIgnoringWhiteSpaceTest.php ++++ b/tests/Hamcrest/Text/IsEqualIgnoringWhiteSpaceTest.php +@@ -6,7 +6,7 @@ class IsEqualIgnoringWhiteSpaceTest extends \Hamcrest\AbstractMatcherTest + + private $_matcher; + +- protected function setUp() ++ protected function setUp(): void + { + $this->_matcher = \Hamcrest\Text\IsEqualIgnoringWhiteSpace::equalToIgnoringWhiteSpace( + "Hello World how\n are we? " +diff --git a/tests/Hamcrest/Text/StringContainsIgnoringCaseTest.php b/tests/Hamcrest/Text/StringContainsIgnoringCaseTest.php +index 73023007b..3d2b287de 100644 +--- a/tests/Hamcrest/Text/StringContainsIgnoringCaseTest.php ++++ b/tests/Hamcrest/Text/StringContainsIgnoringCaseTest.php +@@ -8,7 +8,7 @@ class StringContainsIgnoringCaseTest extends \Hamcrest\AbstractMatcherTest + + private $_stringContains; + +- protected function setUp() ++ protected function setUp(): void + { + $this->_stringContains = \Hamcrest\Text\StringContainsIgnoringCase::containsStringIgnoringCase( + strtolower(self::EXCERPT) +diff --git a/tests/Hamcrest/Text/StringContainsInOrderTest.php b/tests/Hamcrest/Text/StringContainsInOrderTest.php +index 4c465b29d..0f9d0a0a1 100644 +--- a/tests/Hamcrest/Text/StringContainsInOrderTest.php ++++ b/tests/Hamcrest/Text/StringContainsInOrderTest.php +@@ -6,7 +6,7 @@ class StringContainsInOrderTest extends \Hamcrest\AbstractMatcherTest + + private $_m; + +- protected function setUp() ++ protected function setUp(): void + { + $this->_m = \Hamcrest\Text\StringContainsInOrder::stringContainsInOrder(array('a', 'b', 'c')); + } +diff --git a/tests/Hamcrest/Text/StringContainsTest.php b/tests/Hamcrest/Text/StringContainsTest.php +index bf4afa3c9..971fa98fd 100644 +--- a/tests/Hamcrest/Text/StringContainsTest.php ++++ b/tests/Hamcrest/Text/StringContainsTest.php +@@ -8,7 +8,7 @@ class StringContainsTest extends \Hamcrest\AbstractMatcherTest + + private $_stringContains; + +- protected function setUp() ++ protected function setUp(): void + { + $this->_stringContains = \Hamcrest\Text\StringContains::containsString(self::EXCERPT); + } +diff --git a/tests/Hamcrest/Text/StringEndsWithTest.php b/tests/Hamcrest/Text/StringEndsWithTest.php +index 9a30f9520..58b43e538 100644 +--- a/tests/Hamcrest/Text/StringEndsWithTest.php ++++ b/tests/Hamcrest/Text/StringEndsWithTest.php +@@ -8,7 +8,7 @@ class StringEndsWithTest extends \Hamcrest\AbstractMatcherTest + + private $_stringEndsWith; + +- protected function setUp() ++ protected function setUp(): void + { + $this->_stringEndsWith = \Hamcrest\Text\StringEndsWith::endsWith(self::EXCERPT); + } +diff --git a/tests/Hamcrest/Text/StringStartsWithTest.php b/tests/Hamcrest/Text/StringStartsWithTest.php +index 3be201f1a..72fa59b6e 100644 +--- a/tests/Hamcrest/Text/StringStartsWithTest.php ++++ b/tests/Hamcrest/Text/StringStartsWithTest.php +@@ -8,7 +8,7 @@ class StringStartsWithTest extends \Hamcrest\AbstractMatcherTest + + private $_stringStartsWith; + +- protected function setUp() ++ protected function setUp(): void + { + $this->_stringStartsWith = \Hamcrest\Text\StringStartsWith::startsWith(self::EXCERPT); + } +diff --git a/tests/Hamcrest/Xml/HasXPathTest.php b/tests/Hamcrest/Xml/HasXPathTest.php +index 677488716..f51264ea9 100644 +--- a/tests/Hamcrest/Xml/HasXPathTest.php ++++ b/tests/Hamcrest/Xml/HasXPathTest.php +@@ -7,7 +7,7 @@ class HasXPathTest extends \Hamcrest\AbstractMatcherTest + protected static $doc; + protected static $html; + +- public static function setUpBeforeClass() ++ public static function setUpBeforeClass(): void + { + self::$xml = << diff --git a/gnu/packages/php-xyz.scm b/gnu/packages/php-xyz.scm index c82a6d4141..eaeb435317 100644 --- a/gnu/packages/php-xyz.scm +++ b/gnu/packages/php-xyz.scm @@ -360,3 +360,43 @@ (define-public php-fig-log-test (home-page "https://github.com/php-fig/log-test") (license license:expat))) +(define-public php-hamcrest-hamcrest-php + (package + (name "php-hamcrest-hamcrest-php") + (version "2.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hamcrest/hamcrest-php") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1n6idxz1rc17zky84khrqfyndh4ffb7jvd1nb14saxdissgq5y5j")) + (patches + (search-patches "php-hamcrest-hamcrest-php-phpunit-compatibility.patch")))) + (build-system composer-build-system) + (arguments + `(#:test-flags + '("--configuration" "tests/phpunit.xml.dist" + "--exclude-group" "skipTest") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-recent-phpunit-build + (lambda _ + (substitute* "tests/Hamcrest/UtilTest.php" + (("assertInternalType\\('array', ") + "assertIsArray(") + ;; Ignore this test. + (("@expectedException InvalidArgumentException") + "@group skipTest"))))))) + (native-inputs + (list php-phpunit-php-file-iterator php-phpunit-phpunit)) + (synopsis "PHP port of Hamcrest Matchers") + (description "Hamcrest is a matching library originally written for Java, +but subsequently ported to many other languages. This package is the +official PHP port of Hamcrest and essentially follows a literal translation of +the original Java API for Hamcrest, with a few PHP-related exceptions.") + (home-page "https://github.com/hamcrest/hamcrest-php") + (license license:bsd-3))) +