From patchwork Mon Oct 7 21:43:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 68788 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 1314427BBEC; Mon, 7 Oct 2024 22:47:52 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED 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 320A227BBE2 for ; Mon, 7 Oct 2024 22:47:51 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sxvZH-0002Lm-5f; Mon, 07 Oct 2024 17:47:03 -0400 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 1sxvZF-0002L2-Jp for guix-patches@gnu.org; Mon, 07 Oct 2024 17:47:01 -0400 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 1sxvZF-0004RZ-AK for guix-patches@gnu.org; Mon, 07 Oct 2024 17:47:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=JO2Mx8dUeHgt9dv53LEaQGGl3TH8goOw5+RT/wYpCcY=; b=eOr7QaqY9VkV1hzHS3CYvUHUUTjJcddyp36vPO2JN1G5ToKOOfmIWCpHUZ7aYDC0C5ZINE77299oQ2biTRn3cprW9+0cBpDxbvNJ571yoEEyKCkuW20UdS74lW/TxPt+mg70fpJt3aoCQCm6miAcY0UgDAUpq8iM4whWhzCn4e/5v5tIYrTWbll45S5xgz38qfhHEyQDrXgoGe4A7b4xXp7LZIgxYEQ/C2geGnFEjnuyv6Mj0f2ocdAhdziLaFLXUhHv6z1vQ1iDqRrL37PR0E8F287Zte2IBXqAAXjVO3nyV7aaHxjUZ4iAiNy7uec/AhqgGJNQ8oActXuoRPLO3A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sxvZN-0006cL-0y for guix-patches@gnu.org; Mon, 07 Oct 2024 17:47:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#67902] [PATCH v4 15/98] gnu: Add php-hamcrest-hamcrest-php. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Oct 2024 21:47:08 +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: Nicolas Graves Received: via spool by 67902-submit@debbugs.gnu.org id=B67902.172833758825059 (code B ref 67902); Mon, 07 Oct 2024 21:47:08 +0000 Received: (at 67902) by debbugs.gnu.org; 7 Oct 2024 21:46:28 +0000 Received: from localhost ([127.0.0.1]:48707 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxvYh-0006Vv-Vk for submit@debbugs.gnu.org; Mon, 07 Oct 2024 17:46:28 -0400 Received: from 8.mo575.mail-out.ovh.net ([46.105.74.219]:38435) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxvYf-0006Va-Fw for 67902@debbugs.gnu.org; Mon, 07 Oct 2024 17:46:27 -0400 Received: from director7.ghost.mail-out.ovh.net (unknown [10.109.148.126]) by mo575.mail-out.ovh.net (Postfix) with ESMTP id 4XMt543wscz1mpl for <67902@debbugs.gnu.org>; Mon, 7 Oct 2024 21:46:16 +0000 (UTC) Received: from ghost-submission-55b549bf7b-qmbf4 (unknown [10.110.178.151]) by director7.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 65E621FD6F; Mon, 7 Oct 2024 21:46:16 +0000 (UTC) Received: from ngraves.fr ([37.59.142.98]) by ghost-submission-55b549bf7b-qmbf4 with ESMTPSA id QqjGEahWBGffLgkAAhTp3w (envelope-from ); Mon, 07 Oct 2024 21:46:16 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-98R0028ac542a6-fd8c-49fb-b15c-74236008a766, A12302D5D8CF0E033BA678025A323BF4FAD59D46) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 86.246.19.221 Date: Mon, 7 Oct 2024 23:43:43 +0200 Message-ID: <20241007214530.4420-15-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241007214530.4420-1-ngraves@ngraves.fr> References: <20241007214530.4420-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 6244240886058771170 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdeftddgtddvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdehleeiffehtedvlefhffffjeefgfduhfetkeevheeiteduiedugfekuedtheejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpkeeirddvgeeirdduledrvddvuddpfeejrdehledrudegvddrleeknecuvehluhhsthgvrhfuihiivgepvdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeijeeltddvseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehjeehpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=JO2Mx8dUeHgt9dv53LEaQGGl3TH8goOw5+RT/wYpCcY=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1728337576; v=1; b=48H0mlUkBruTxcLGTSMGpuv5nPnFoMGlsACHoN9K2+FJvnQMuyq5H2V/0KaHQLTBBH8ZpADu 5A6njfitTq5BB0yGVoINl0zpmCZ7lyy7Gt+WbEJH6TDkc6TheNIU2jMRY4wyj75jJEznRhFc5FB lbt/13ydhis7Vq/VdzoQvX8GavUOeidMTqFtf0s9Tt4zowfRECmNy8hGAvyOP4oVV6aBY8k4Gih xFFI9jNbGScG3ztnqIDu8JLXUXjaVaD+bUAnXZC2vdh6dkD4QyodEBPDMj26xUOgGo5S2tETuGE fONC9bNbJH3fZ0GOTsI0Nn2OayFvjL3vQVXWqXBy0IeXQ== 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 6d1efc795f..81044dc66c 100644 --- a/gnu/packages/php-xyz.scm +++ b/gnu/packages/php-xyz.scm @@ -352,3 +352,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))) +