New Upstream Snapshot - php-hamcrest
Ready changes
Summary
Merged new upstream version: 2.0.1+git20220820.1.f7d2c63 (was: 2.0.1).
Resulting package
Built on 2022-10-12T13:53 (took 3m0s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-snapshots php-hamcrest
Lintian Result
Diff
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..5df55df
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,32 @@
+# Contributing
+hamcrest-php is an open source, community-driven project. If you'd like to contribute, feel free to do this, but remember to follow these few simple rules:
+
+## Asking Questions
+Feel free to ask any questions and share your experiences in the [Issue tracking system](https://github.com/hamcrest/hamcrest-php/issues/) and help to improve the documentation.
+
+## Submitting an issues
+- A reproducible example is required for every bug report, otherwise it will most probably be __closed without warning__.
+- If you are going to make a big, substantial change, let's discuss it first.
+
+## Working with Pull Requests
+1. Create your feature addition or a bug fix branch based on __`master`__ branch in your repository's fork.
+2. Make necessary changes, but __don't mix__ code reformatting with code changes on topic.
+3. Add tests for those changes (please look into `tests/` folder for some examples). This is important so we don't break it in a future version unintentionally.
+4. Check your code using "Coding Standard" (see below).
+5. Commit your code.
+6. Squash your commits by topic to preserve a clean and readable log.
+7. Create Pull Request.
+
+## Running the Tests
+
+### Installation/Configuration
+
+1. Using `git clone https://github.com/hamcrest/hamcrest-php` to clone this repository.
+2. Using the `composer update` to update the dependencies to support your development environment.
+3. Using `vendor/bin/phpunit -c tests/phpunit.xml.dist` command to do unit test works.
+
+## Contributor Code of Conduct
+
+Please note that this project is released with a [Contributor Code of
+Conduct](http://contributor-covenant.org/). By participating in this project
+you agree to abide by its terms. See [CODE_OF_CONDUCT](CODE_OF_CONDUCT.md) file.
diff --git a/README.md b/README.md
index 52e2041..c987b90 100644
--- a/README.md
+++ b/README.md
@@ -133,7 +133,7 @@ assertThat(['name'=> 'foobar'], hasKeyInArray('name'));
* `hasKey` - alias of hasKeyInArray
-* `hasKeyValuePair` - check if arary has given key, value pair
+* `hasKeyValuePair` - check if array has given key, value pair
```php
assertThat(['name'=> 'foobar'], hasKeyValuePair('name', 'foobar'));
```
@@ -143,7 +143,7 @@ assertThat(['name'=> 'foobar'], hasKeyValuePair('name', 'foobar'));
```php
assertthat([2, 4, 6], arrayWithSize(3));
```
-* `emptyArray` - check if array is emtpy
+* `emptyArray` - check if array is empty
```php
assertThat([], emptyArray());
```
@@ -222,7 +222,7 @@ assertThat([2, 4, 6], everyItem(notNullValue()));
assertThat([2, 4, 6], hasItem(equalTo(2)));
```
-* `hasItems` - check array has givem items, it can take multiple matcher as arguments
+* `hasItems` - check array has given items, it can take multiple matcher as arguments
```php
assertThat([1, 3, 5], hasItems(equalTo(1), equalTo(3)));
```
@@ -456,7 +456,7 @@ $fp = fopen("/tmp/foo", "w+");
assertThat($fp, resourceValue());
```
-* `scalarValue` - check for scaler value
+* `scalarValue` - check for scalar value
```php
assertThat(1, scalarValue());
```
diff --git a/debian/changelog b/debian/changelog
index 077de9e..206f332 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+php-hamcrest (2.0.1+git20220820.1.f7d2c63-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk> Wed, 12 Oct 2022 13:51:32 -0000
+
php-hamcrest (2.0.1-4) unstable; urgency=medium
* Fix debci
diff --git a/debian/patches/0001-Compatibility-with-recent-PHPUnit-8.patch b/debian/patches/0001-Compatibility-with-recent-PHPUnit-8.patch
index a5e8920..f0fe30f 100644
--- a/debian/patches/0001-Compatibility-with-recent-PHPUnit-8.patch
+++ b/debian/patches/0001-Compatibility-with-recent-PHPUnit-8.patch
@@ -19,11 +19,11 @@ Forwarded: https://github.com/hamcrest/hamcrest-php/pull/68
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 463c754..5a5fe23 100644
---- a/tests/Hamcrest/Core/CombinableMatcherTest.php
-+++ b/tests/Hamcrest/Core/CombinableMatcherTest.php
-@@ -7,7 +7,7 @@ class CombinableMatcherTest extends \Hamcrest\AbstractMatcherTest
+Index: php-hamcrest.git/tests/Hamcrest/Core/CombinableMatcherTest.php
+===================================================================
+--- php-hamcrest.git.orig/tests/Hamcrest/Core/CombinableMatcherTest.php
++++ php-hamcrest.git/tests/Hamcrest/Core/CombinableMatcherTest.php
+@@ -7,7 +7,7 @@ class CombinableMatcherTest extends \Ham
private $_either_3_or_4;
private $_not_3_and_not_4;
@@ -32,11 +32,11 @@ index 463c754..5a5fe23 100644
{
$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 f74cfdb..0d6228a 100644
---- a/tests/Hamcrest/Core/IsInstanceOfTest.php
-+++ b/tests/Hamcrest/Core/IsInstanceOfTest.php
-@@ -7,7 +7,7 @@ class IsInstanceOfTest extends \Hamcrest\AbstractMatcherTest
+Index: php-hamcrest.git/tests/Hamcrest/Core/IsInstanceOfTest.php
+===================================================================
+--- php-hamcrest.git.orig/tests/Hamcrest/Core/IsInstanceOfTest.php
++++ php-hamcrest.git/tests/Hamcrest/Core/IsInstanceOfTest.php
+@@ -7,7 +7,7 @@ class IsInstanceOfTest extends \Hamcrest
private $_baseClassInstance;
private $_subClassInstance;
@@ -45,11 +45,11 @@ index f74cfdb..0d6228a 100644
{
$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 aa5e4e7..35ae3b9 100644
---- a/tests/Hamcrest/Core/SetTest.php
-+++ b/tests/Hamcrest/Core/SetTest.php
-@@ -7,7 +7,7 @@ class SetTest extends \Hamcrest\AbstractMatcherTest
+Index: php-hamcrest.git/tests/Hamcrest/Core/SetTest.php
+===================================================================
+--- php-hamcrest.git.orig/tests/Hamcrest/Core/SetTest.php
++++ php-hamcrest.git/tests/Hamcrest/Core/SetTest.php
+@@ -7,7 +7,7 @@ class SetTest extends \Hamcrest\Abstract
public static $_classProperty;
public $_instanceProperty;
@@ -58,11 +58,11 @@ index aa5e4e7..35ae3b9 100644
{
self::$_classProperty = null;
unset($this->_instanceProperty);
-diff --git a/tests/Hamcrest/FeatureMatcherTest.php b/tests/Hamcrest/FeatureMatcherTest.php
-index 1b02304..0308300 100644
---- a/tests/Hamcrest/FeatureMatcherTest.php
-+++ b/tests/Hamcrest/FeatureMatcherTest.php
-@@ -34,7 +34,7 @@ class FeatureMatcherTest extends \Hamcrest\AbstractMatcherTest
+Index: php-hamcrest.git/tests/Hamcrest/FeatureMatcherTest.php
+===================================================================
+--- php-hamcrest.git.orig/tests/Hamcrest/FeatureMatcherTest.php
++++ php-hamcrest.git/tests/Hamcrest/FeatureMatcherTest.php
+@@ -34,7 +34,7 @@ class FeatureMatcherTest extends \Hamcre
private $_resultMatcher;
@@ -71,10 +71,10 @@ index 1b02304..0308300 100644
{
$this->_resultMatcher = $this->_resultMatcher();
}
-diff --git a/tests/Hamcrest/MatcherAssertTest.php b/tests/Hamcrest/MatcherAssertTest.php
-index dc12fba..ee287fb 100644
---- a/tests/Hamcrest/MatcherAssertTest.php
-+++ b/tests/Hamcrest/MatcherAssertTest.php
+Index: php-hamcrest.git/tests/Hamcrest/MatcherAssertTest.php
+===================================================================
+--- php-hamcrest.git.orig/tests/Hamcrest/MatcherAssertTest.php
++++ php-hamcrest.git/tests/Hamcrest/MatcherAssertTest.php
@@ -6,7 +6,7 @@ use PHPUnit\Framework\TestCase;
class MatcherAssertTest extends TestCase
{
@@ -84,11 +84,11 @@ index dc12fba..ee287fb 100644
{
\Hamcrest\MatcherAssert::resetCount();
}
-diff --git a/tests/Hamcrest/StringDescriptionTest.php b/tests/Hamcrest/StringDescriptionTest.php
-index ed716d1..402682a 100644
---- a/tests/Hamcrest/StringDescriptionTest.php
-+++ b/tests/Hamcrest/StringDescriptionTest.php
-@@ -23,7 +23,7 @@ class StringDescriptionTest extends TestCase
+Index: php-hamcrest.git/tests/Hamcrest/StringDescriptionTest.php
+===================================================================
+--- php-hamcrest.git.orig/tests/Hamcrest/StringDescriptionTest.php
++++ php-hamcrest.git/tests/Hamcrest/StringDescriptionTest.php
+@@ -23,7 +23,7 @@ class StringDescriptionTest extends Test
private $_description;
@@ -97,11 +97,11 @@ index ed716d1..402682a 100644
{
$this->_description = new \Hamcrest\StringDescription();
}
-diff --git a/tests/Hamcrest/Text/IsEqualIgnoringWhiteSpaceTest.php b/tests/Hamcrest/Text/IsEqualIgnoringWhiteSpaceTest.php
-index 27ad338..48ad19e 100644
---- a/tests/Hamcrest/Text/IsEqualIgnoringWhiteSpaceTest.php
-+++ b/tests/Hamcrest/Text/IsEqualIgnoringWhiteSpaceTest.php
-@@ -6,7 +6,7 @@ class IsEqualIgnoringWhiteSpaceTest extends \Hamcrest\AbstractMatcherTest
+Index: php-hamcrest.git/tests/Hamcrest/Text/IsEqualIgnoringWhiteSpaceTest.php
+===================================================================
+--- php-hamcrest.git.orig/tests/Hamcrest/Text/IsEqualIgnoringWhiteSpaceTest.php
++++ php-hamcrest.git/tests/Hamcrest/Text/IsEqualIgnoringWhiteSpaceTest.php
+@@ -6,7 +6,7 @@ class IsEqualIgnoringWhiteSpaceTest exte
private $_matcher;
@@ -110,11 +110,11 @@ index 27ad338..48ad19e 100644
{
$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 7302300..3d2b287 100644
---- a/tests/Hamcrest/Text/StringContainsIgnoringCaseTest.php
-+++ b/tests/Hamcrest/Text/StringContainsIgnoringCaseTest.php
-@@ -8,7 +8,7 @@ class StringContainsIgnoringCaseTest extends \Hamcrest\AbstractMatcherTest
+Index: php-hamcrest.git/tests/Hamcrest/Text/StringContainsIgnoringCaseTest.php
+===================================================================
+--- php-hamcrest.git.orig/tests/Hamcrest/Text/StringContainsIgnoringCaseTest.php
++++ php-hamcrest.git/tests/Hamcrest/Text/StringContainsIgnoringCaseTest.php
+@@ -8,7 +8,7 @@ class StringContainsIgnoringCaseTest ext
private $_stringContains;
@@ -123,11 +123,11 @@ index 7302300..3d2b287 100644
{
$this->_stringContains = \Hamcrest\Text\StringContainsIgnoringCase::containsStringIgnoringCase(
strtolower(self::EXCERPT)
-diff --git a/tests/Hamcrest/Text/StringContainsInOrderTest.php b/tests/Hamcrest/Text/StringContainsInOrderTest.php
-index 4c465b2..0f9d0a0 100644
---- a/tests/Hamcrest/Text/StringContainsInOrderTest.php
-+++ b/tests/Hamcrest/Text/StringContainsInOrderTest.php
-@@ -6,7 +6,7 @@ class StringContainsInOrderTest extends \Hamcrest\AbstractMatcherTest
+Index: php-hamcrest.git/tests/Hamcrest/Text/StringContainsInOrderTest.php
+===================================================================
+--- php-hamcrest.git.orig/tests/Hamcrest/Text/StringContainsInOrderTest.php
++++ php-hamcrest.git/tests/Hamcrest/Text/StringContainsInOrderTest.php
+@@ -6,7 +6,7 @@ class StringContainsInOrderTest extends
private $_m;
@@ -136,11 +136,11 @@ index 4c465b2..0f9d0a0 100644
{
$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 bf4afa3..971fa98 100644
---- a/tests/Hamcrest/Text/StringContainsTest.php
-+++ b/tests/Hamcrest/Text/StringContainsTest.php
-@@ -8,7 +8,7 @@ class StringContainsTest extends \Hamcrest\AbstractMatcherTest
+Index: php-hamcrest.git/tests/Hamcrest/Text/StringContainsTest.php
+===================================================================
+--- php-hamcrest.git.orig/tests/Hamcrest/Text/StringContainsTest.php
++++ php-hamcrest.git/tests/Hamcrest/Text/StringContainsTest.php
+@@ -8,7 +8,7 @@ class StringContainsTest extends \Hamcre
private $_stringContains;
@@ -149,11 +149,11 @@ index bf4afa3..971fa98 100644
{
$this->_stringContains = \Hamcrest\Text\StringContains::containsString(self::EXCERPT);
}
-diff --git a/tests/Hamcrest/Text/StringEndsWithTest.php b/tests/Hamcrest/Text/StringEndsWithTest.php
-index 9a30f95..58b43e5 100644
---- a/tests/Hamcrest/Text/StringEndsWithTest.php
-+++ b/tests/Hamcrest/Text/StringEndsWithTest.php
-@@ -8,7 +8,7 @@ class StringEndsWithTest extends \Hamcrest\AbstractMatcherTest
+Index: php-hamcrest.git/tests/Hamcrest/Text/StringEndsWithTest.php
+===================================================================
+--- php-hamcrest.git.orig/tests/Hamcrest/Text/StringEndsWithTest.php
++++ php-hamcrest.git/tests/Hamcrest/Text/StringEndsWithTest.php
+@@ -8,7 +8,7 @@ class StringEndsWithTest extends \Hamcre
private $_stringEndsWith;
@@ -162,11 +162,11 @@ index 9a30f95..58b43e5 100644
{
$this->_stringEndsWith = \Hamcrest\Text\StringEndsWith::endsWith(self::EXCERPT);
}
-diff --git a/tests/Hamcrest/Text/StringStartsWithTest.php b/tests/Hamcrest/Text/StringStartsWithTest.php
-index 3be201f..72fa59b 100644
---- a/tests/Hamcrest/Text/StringStartsWithTest.php
-+++ b/tests/Hamcrest/Text/StringStartsWithTest.php
-@@ -8,7 +8,7 @@ class StringStartsWithTest extends \Hamcrest\AbstractMatcherTest
+Index: php-hamcrest.git/tests/Hamcrest/Text/StringStartsWithTest.php
+===================================================================
+--- php-hamcrest.git.orig/tests/Hamcrest/Text/StringStartsWithTest.php
++++ php-hamcrest.git/tests/Hamcrest/Text/StringStartsWithTest.php
+@@ -8,7 +8,7 @@ class StringStartsWithTest extends \Hamc
private $_stringStartsWith;
@@ -175,11 +175,11 @@ index 3be201f..72fa59b 100644
{
$this->_stringStartsWith = \Hamcrest\Text\StringStartsWith::startsWith(self::EXCERPT);
}
-diff --git a/tests/Hamcrest/Xml/HasXPathTest.php b/tests/Hamcrest/Xml/HasXPathTest.php
-index 6774887..f51264e 100644
---- a/tests/Hamcrest/Xml/HasXPathTest.php
-+++ b/tests/Hamcrest/Xml/HasXPathTest.php
-@@ -7,7 +7,7 @@ class HasXPathTest extends \Hamcrest\AbstractMatcherTest
+Index: php-hamcrest.git/tests/Hamcrest/Xml/HasXPathTest.php
+===================================================================
+--- php-hamcrest.git.orig/tests/Hamcrest/Xml/HasXPathTest.php
++++ php-hamcrest.git/tests/Hamcrest/Xml/HasXPathTest.php
+@@ -7,7 +7,7 @@ class HasXPathTest extends \Hamcrest\Abs
protected static $doc;
protected static $html;
diff --git a/debian/patches/0002-Adapt-to-recent-version-of-PHPUnit-9.patch b/debian/patches/0002-Adapt-to-recent-version-of-PHPUnit-9.patch
index 95f9c08..4d93b89 100644
--- a/debian/patches/0002-Adapt-to-recent-version-of-PHPUnit-9.patch
+++ b/debian/patches/0002-Adapt-to-recent-version-of-PHPUnit-9.patch
@@ -6,10 +6,10 @@ Subject: Adapt to recent version of PHPUnit (9)
tests/Hamcrest/UtilTest.php | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
-diff --git a/tests/Hamcrest/UtilTest.php b/tests/Hamcrest/UtilTest.php
-index 7248978..569c947 100644
---- a/tests/Hamcrest/UtilTest.php
-+++ b/tests/Hamcrest/UtilTest.php
+Index: php-hamcrest.git/tests/Hamcrest/UtilTest.php
+===================================================================
+--- php-hamcrest.git.orig/tests/Hamcrest/UtilTest.php
++++ php-hamcrest.git/tests/Hamcrest/UtilTest.php
@@ -28,11 +28,9 @@ class UtilTest extends TestCase
));
}
diff --git a/generator/FactoryParameter.php b/generator/FactoryParameter.php
index 82b707a..2e5cb9e 100644
--- a/generator/FactoryParameter.php
+++ b/generator/FactoryParameter.php
@@ -54,7 +54,7 @@ class FactoryParameter
}
/**
- * Compute the type code for the paramater.
+ * Compute the type code for the parameter.
*
* @return string
*/
diff --git a/hamcrest/Hamcrest/Description.php b/hamcrest/Hamcrest/Description.php
index 9a482db..266bc1c 100644
--- a/hamcrest/Hamcrest/Description.php
+++ b/hamcrest/Hamcrest/Description.php
@@ -34,7 +34,7 @@ interface Description
public function appendDescriptionOf(SelfDescribing $value);
/**
- * Appends an arbitary value to the description.
+ * Appends an arbitrary value to the description.
*
* @param mixed $value
*
Debdiff
File lists identical (after any substitutions)
No differences were encountered in the control files