From 45db9c0b26f2032647ea8f2e286ee381bbac92d4 Mon Sep 17 00:00:00 2001 From: Pavel Linhart Date: Thu, 9 May 2019 10:44:53 +0200 Subject: [PATCH 1/2] Allow Nette 3.0 stable --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) mode change 100644 => 100755 composer.json diff --git a/composer.json b/composer.json old mode 100644 new mode 100755 index ca9cb11..2ac079b --- a/composer.json +++ b/composer.json @@ -26,11 +26,11 @@ }, "require": { "php": ">= 7.1", - "nette/utils": "~2.4 || ~3.0@rc", - "nette/di": "~2.4 || ~3.0@rc", - "nette/application": "~2.4 || ~3.0@rc", - "nette/mail": "~2.4 || ~3.0@rc", - "latte/latte": "~2.4 || ~3.0@rc" + "nette/utils": "~2.4 || ~3.0", + "nette/di": "~2.4 || ~3.0", + "nette/application": "~2.4 || ~3.0", + "nette/mail": "~2.4 || ~3.0", + "latte/latte": "~2.4 || ~3.0" }, "require-dev": { "nette/tester": "~1.6.1", From dfa40f33fd84cd27b825b15bcbc6c40491657b58 Mon Sep 17 00:00:00 2001 From: Pavel Linhart Date: Thu, 9 May 2019 13:16:26 +0200 Subject: [PATCH 2/2] Update nette/tester & mockery, fix tests --- composer.json | 4 ++-- tests/Unit/MailTest.phpt | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) mode change 100644 => 100755 tests/Unit/MailTest.phpt diff --git a/composer.json b/composer.json index 2ac079b..643c4cc 100755 --- a/composer.json +++ b/composer.json @@ -33,8 +33,8 @@ "latte/latte": "~2.4 || ~3.0" }, "require-dev": { - "nette/tester": "~1.6.1", - "mockery/mockery": "~0.9", + "nette/tester": "~2.0", + "mockery/mockery": "~1.0", "tracy/tracy": "^2.4" } } diff --git a/tests/Unit/MailTest.phpt b/tests/Unit/MailTest.phpt old mode 100644 new mode 100755 index b910635..c7c8ab2 --- a/tests/Unit/MailTest.phpt +++ b/tests/Unit/MailTest.phpt @@ -6,6 +6,7 @@ namespace Ublaboo\Mailing\Tests\Unit; use Mockery; use Tester\Assert; +use Tester\Environment; use Tester\TestCase; use Ublaboo\Mailing\DI\MailingExtension; use Ublaboo\Mailing\Exception\MailingException; @@ -13,6 +14,7 @@ use Ublaboo\Mailing\MailFactory; use Ublaboo\Mailing\Tests\Unit\TestingMailData; require __DIR__ . '/../bootstrap.php'; +Environment::bypassFinals(); final class MailTest extends TestCase {