New Upstream Snapshot - php-mockery
Ready changes
Summary
Merged new upstream version: 1.5.1+git20221025.1.3c3ca93 (was: 1.5.1).
Diff
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
deleted file mode 100644
index a4e582c..0000000
--- a/.github/workflows/tests.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-name: Tests
-
-on:
- push:
- pull_request:
- # Allow manually triggering the workflow.
- workflow_dispatch:
-
-jobs:
- phpunit:
- name: PHPUnit on PHP ${{ matrix.php }}
- runs-on: ubuntu-latest
-
- strategy:
- matrix:
- php: ['7.4', '8.0', '8.1', '8.2']
-
- continue-on-error: ${{ matrix.php == '8.2' }}
-
- steps:
- - name: Checkout Code
- uses: actions/checkout@v2
-
- - name: Setup PHP ${{ matrix.php }}
- uses: shivammathur/setup-php@v2
- with:
- php-version: ${{ matrix.php }}
- ini-values: zend.assertions=1, error_reporting=-1, display_errors=On
- tools: composer:v2
- extensions: mongodb, redis
- coverage: xdebug
-
- - name: Setup Problem Matchers
- run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
-
- - name: Install Dependencies
- if: ${{ matrix.php != '8.2' }}
- uses: nick-invision/retry@v1
- with:
- timeout_minutes: 5
- max_attempts: 5
- command: composer update --no-interaction --no-progress
-
- - name: Install Dependencies (ignore platform)
- if: ${{ matrix.php == '8.2' }}
- uses: nick-invision/retry@v1
- with:
- timeout_minutes: 5
- max_attempts: 5
- command: composer update --no-interaction --no-progress --ignore-platform-req=php
-
- - name: Execute PHPUnit
- run: vendor/bin/phpunit
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 16a05f6..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-*~
-pearfarm.spec
-*.sublime-project
-library/Hamcrest/*
-composer.lock
-vendor/
-composer.phar
-test.php
-build/
-phpunit.xml
-*.DS_store
-.idea/*
-.php_cs.cache
-docs/api
-phpDocumentor.phar*
-.phpunit.result.cache
-.phpdoc/
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 937460e..90cb477 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
# Change Log
+## 1.5.2 (2022-xx-xx)
+
+* Updated changelog for version 1.5.1 to include changes from #1180
+
## 1.3.6 (2022-09-07)
* PHP 8.2 | Fix "Use of "parent" in callables is deprecated" notice #1169
@@ -9,6 +13,7 @@
* [PHP 8.2] Fix "Use of "parent" in callables is deprecated" notice #1169
* [PHP 8.1] Support intersection types #1164
* Handle final `__toString` methods #1162
+* Only count assertions on expectations which can fail a test #1180
## 1.5.0 (2022-01-20)
diff --git a/README.md b/README.md
index 55771df..d84ce78 100644
--- a/README.md
+++ b/README.md
@@ -167,7 +167,7 @@ $double->expects()->add($book)->twice();
If you have used Mockery before, you might see something new in the example
above — we created a method expectation using `expects`, instead of the "old"
`shouldReceive` syntax. This is a new feature of Mockery v1, but same as with
-`accepts` in the previous section, it can be written in the "old" style.
+`allows` in the previous section, it can be written in the "old" style.
For new users of Mockery, the above example can also be written as:
diff --git a/debian/changelog b/debian/changelog
index 41452a1..37a5fed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+php-mockery (1.5.1+git20221025.1.3c3ca93-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk> Wed, 08 Feb 2023 22:27:55 -0000
+
php-mockery (1.5.1-2) unstable; urgency=medium
* Mark package as Multi-Arch: foreign
diff --git a/debian/patches/0001-Use-system-path.patch b/debian/patches/0001-Use-system-path.patch
index 38d53bb..392679f 100644
--- a/debian/patches/0001-Use-system-path.patch
+++ b/debian/patches/0001-Use-system-path.patch
@@ -9,10 +9,10 @@ Forwarded: not-needed
tests/Bootstrap.php | 1 +
1 file changed, 1 insertion(+)
-diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
-index 5da2f67..a868e28 100644
---- a/tests/Bootstrap.php
-+++ b/tests/Bootstrap.php
+Index: php-mockery.git/tests/Bootstrap.php
+===================================================================
+--- php-mockery.git.orig/tests/Bootstrap.php
++++ php-mockery.git/tests/Bootstrap.php
@@ -55,6 +55,7 @@ if (DIRECTORY_SEPARATOR !== '/') {
$hamcrestRelativePath = str_replace('/', DIRECTORY_SEPARATOR, $hamcrestRelativePath);
}
diff --git a/debian/patches/0002-Move-helpers-into-Mockery-directory.patch b/debian/patches/0002-Move-helpers-into-Mockery-directory.patch
index 540d82c..7da231f 100644
--- a/debian/patches/0002-Move-helpers-into-Mockery-directory.patch
+++ b/debian/patches/0002-Move-helpers-into-Mockery-directory.patch
@@ -12,10 +12,10 @@ Forwarded: not-needed
library/Mockery.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/library/Mockery.php b/library/Mockery.php
-index 95abd1b..9d02518 100644
---- a/library/Mockery.php
-+++ b/library/Mockery.php
+Index: php-mockery.git/library/Mockery.php
+===================================================================
+--- php-mockery.git.orig/library/Mockery.php
++++ php-mockery.git/library/Mockery.php
@@ -70,7 +70,7 @@ class Mockery
*/
public static function globalHelpers()
diff --git a/debian/patches/0003-Compatibility-with-Python-3.patch b/debian/patches/0003-Compatibility-with-Python-3.patch
index 69eca4a..5bcfda2 100644
--- a/debian/patches/0003-Compatibility-with-Python-3.patch
+++ b/debian/patches/0003-Compatibility-with-Python-3.patch
@@ -6,11 +6,11 @@ Subject: Compatibility with Python 3
docs/conf.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/docs/conf.py b/docs/conf.py
-index 901f040..6811e56 100644
---- a/docs/conf.py
-+++ b/docs/conf.py
-@@ -256,7 +256,7 @@ if not on_rtd: # only import and set the theme if we're building docs locally
+Index: php-mockery.git/docs/conf.py
+===================================================================
+--- php-mockery.git.orig/docs/conf.py
++++ php-mockery.git/docs/conf.py
+@@ -256,7 +256,7 @@ if not on_rtd: # only import and set th
import sphinx_rtd_theme
html_theme = 'sphinx_rtd_theme'
html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
diff --git a/debian/patches/0004-Drop-lib-pcre-from-composer.json.patch b/debian/patches/0004-Drop-lib-pcre-from-composer.json.patch
index 3bcae4e..c1cbc38 100644
--- a/debian/patches/0004-Drop-lib-pcre-from-composer.json.patch
+++ b/debian/patches/0004-Drop-lib-pcre-from-composer.json.patch
@@ -12,10 +12,10 @@ Bug-Debian: https://bugs.debian.org/996001
composer.json | 1 -
1 file changed, 1 deletion(-)
-diff --git a/composer.json b/composer.json
-index 43caba8..25c72a9 100644
---- a/composer.json
-+++ b/composer.json
+Index: php-mockery.git/composer.json
+===================================================================
+--- php-mockery.git.orig/composer.json
++++ php-mockery.git/composer.json
@@ -32,7 +32,6 @@
],
"require": {
diff --git a/debian/patches/0005-Drop-tests-failing-with-PHP-8.2.patch b/debian/patches/0005-Drop-tests-failing-with-PHP-8.2.patch
index bb0e249..a75df87 100644
--- a/debian/patches/0005-Drop-tests-failing-with-PHP-8.2.patch
+++ b/debian/patches/0005-Drop-tests-failing-with-PHP-8.2.patch
@@ -8,17 +8,14 @@ Bug-Debian: https://bugs.debian.org/1028859
tests/Mockery/ExpectationTest.php | 119 --------------------------------------
2 files changed, 141 deletions(-)
-diff --git a/tests/Mockery/ContainerTest.php b/tests/Mockery/ContainerTest.php
-index 6897a07..78a2e68 100644
---- a/tests/Mockery/ContainerTest.php
-+++ b/tests/Mockery/ContainerTest.php
-@@ -626,28 +626,6 @@ class ContainerTest extends MockeryTestCase
- $this->fail('Exception was not thrown');
- }
-
-- /**
-- * @group issue/17
-- */
+Index: php-mockery.git/tests/Mockery/ContainerTest.php
+===================================================================
+--- php-mockery.git.orig/tests/Mockery/ContainerTest.php
++++ php-mockery.git/tests/Mockery/ContainerTest.php
+@@ -629,28 +629,6 @@ class ContainerTest extends MockeryTestC
+ /**
+ * @group issue/17
+ */
- public function testMockingAllowsPublicPropertyStubbingOnRealClass()
- {
- $m = mock('MockeryTestFoo');
@@ -38,14 +35,17 @@ index 6897a07..78a2e68 100644
- //$this->assertArrayHasKey('foo', $m->mockery_getMockableProperties());
- }
-
- /**
- * @group issue/17
- */
-diff --git a/tests/Mockery/ExpectationTest.php b/tests/Mockery/ExpectationTest.php
-index c688aec..4786a50 100644
---- a/tests/Mockery/ExpectationTest.php
-+++ b/tests/Mockery/ExpectationTest.php
-@@ -86,125 +86,6 @@ class ExpectationTest extends MockeryTestCase
+- /**
+- * @group issue/17
+- */
+ public function testMockingAllowsPublicPropertyStubbingOnPartials()
+ {
+ $m = mock(new stdClass());
+Index: php-mockery.git/tests/Mockery/ExpectationTest.php
+===================================================================
+--- php-mockery.git.orig/tests/Mockery/ExpectationTest.php
++++ php-mockery.git/tests/Mockery/ExpectationTest.php
+@@ -86,125 +86,6 @@ class ExpectationTest extends MockeryTes
$this->assertEquals(1, $this->mock->foo());
}