summaryrefslogtreecommitdiffstats
path: root/php-doctrine-common-php8.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-03-31 11:06:06 +0200
committerRemi Collet <remi@remirepo.net>2021-03-31 11:06:06 +0200
commit5a6367f52e91a4fe99995a7611314bf4d1193205 (patch)
treebd8e2dfabd86578105a49f1588c704fe30f8629f /php-doctrine-common-php8.patch
parentf2bd6328933fa23af9d54f55f0cae867828e143b (diff)
add minimal patch to fix test suite for PHP 8HEADmaster
Diffstat (limited to 'php-doctrine-common-php8.patch')
-rw-r--r--php-doctrine-common-php8.patch52
1 files changed, 52 insertions, 0 deletions
diff --git a/php-doctrine-common-php8.patch b/php-doctrine-common-php8.patch
new file mode 100644
index 0000000..32e1ff1
--- /dev/null
+++ b/php-doctrine-common-php8.patch
@@ -0,0 +1,52 @@
+diff -up ./tests/Doctrine/Tests/Common/Proxy/MagicIssetClassWithInteger.php.php8 ./tests/Doctrine/Tests/Common/Proxy/MagicIssetClassWithInteger.php
+--- ./tests/Doctrine/Tests/Common/Proxy/MagicIssetClassWithInteger.php.php8 2021-03-31 10:54:57.668187413 +0200
++++ ./tests/Doctrine/Tests/Common/Proxy/MagicIssetClassWithInteger.php 2021-03-31 10:55:02.218170669 +0200
+@@ -24,16 +24,16 @@ class MagicIssetClassWithInteger
+ * @return int
+ * @throws \BadMethodCallException
+ */
+- public function __isset(string $name): int
++ public function __isset(string $name): bool
+ {
+ if ('test' === $name) {
+- return 1;
++ return true;
+ }
+
+ if ('publicField' === $name || 'id' === $name) {
+ throw new \BadMethodCallException('Should never be called for "publicField" or "id"');
+ }
+
+- return 0;
++ return false;
+ }
+ }
+diff -up ./tests/Doctrine/Tests/Common/Proxy/NullableNonOptionalHintClass.php.php8 ./tests/Doctrine/Tests/Common/Proxy/NullableNonOptionalHintClass.php
+diff -up ./tests/Doctrine/Tests/Common/Proxy/ProxyGeneratorTest.php.php8 ./tests/Doctrine/Tests/Common/Proxy/ProxyGeneratorTest.php
+--- ./tests/Doctrine/Tests/Common/Proxy/ProxyGeneratorTest.php.php8 2021-03-31 10:54:38.446258154 +0200
++++ ./tests/Doctrine/Tests/Common/Proxy/ProxyGeneratorTest.php 2021-03-31 10:55:06.625154451 +0200
+@@ -54,7 +54,7 @@ class ProxyGeneratorTest extends \PHPUni
+ $params = $method->getParameters();
+
+ self::assertEquals(1, count($params));
+- self::assertEquals('stdClass', $params[0]->getClass()->getName());
++ self::assertEquals('stdClass', @$params[0]->getClass()->getName());
+ }
+
+ public function testProxyRespectsMethodsWhichReturnValuesByReference()
+@@ -240,6 +240,7 @@ class ProxyGeneratorTest extends \PHPUni
+
+ /**
+ * @group #751
++ * @requires PHP < 8
+ */
+ public function testClassWithNullableOptionalNonLastParameterOnProxiedMethods()
+ {
+@@ -265,6 +266,7 @@ class ProxyGeneratorTest extends \PHPUni
+
+ /**
+ * @group #751
++ * @requires PHP < 8
+ */
+ public function testClassWithPhp71NullableOptionalNonLastParameterOnProxiedMethods()
+ {