1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
From 9470303d8da535053c9ebd85d40feeb75b07307e Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Tue, 14 Jun 2016 13:40:19 +0200
Subject: [PATCH] allow latest mockery 0.9.x
---
composer.json | 2 +-
tests/bootstrap.php | 2 +-
tests/smoke/Swift/Smoke/AttachmentSmokeTest.php | 1 +
tests/smoke/Swift/Smoke/InternationalSmokeTest.php | 1 +
4 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/composer.json b/composer.json
index 0549006..86691bd 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
"php": ">=5.3.3"
},
"require-dev": {
- "mockery/mockery": "~0.9.1,<0.9.4"
+ "mockery/mockery": "~0.9.1"
},
"autoload": {
"files": ["lib/swift_required.php"]
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 34f56b5..27091a2 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -7,7 +7,7 @@
set_include_path(get_include_path().PATH_SEPARATOR.dirname(__DIR__).'/lib');
-Mockery::getConfiguration()->allowMockingNonExistentMethods(false);
+Mockery::getConfiguration()->allowMockingNonExistentMethods(true);
if (is_file(__DIR__.'/acceptance.conf.php')) {
require_once __DIR__.'/acceptance.conf.php';
diff --git a/tests/smoke/Swift/Smoke/AttachmentSmokeTest.php b/tests/smoke/Swift/Smoke/AttachmentSmokeTest.php
index d0054d6..c3b61c3 100644
--- a/tests/smoke/Swift/Smoke/AttachmentSmokeTest.php
+++ b/tests/smoke/Swift/Smoke/AttachmentSmokeTest.php
@@ -9,6 +9,7 @@ class Swift_Smoke_AttachmentSmokeTest extends SwiftMailerSmokeTestCase
public function setUp()
{
+ parent::setup(); // For skip
$this->_attFile = __DIR__.'/../../../_samples/files/textfile.zip';
}
diff --git a/tests/smoke/Swift/Smoke/InternationalSmokeTest.php b/tests/smoke/Swift/Smoke/InternationalSmokeTest.php
index 66e37ec..fafd727 100644
--- a/tests/smoke/Swift/Smoke/InternationalSmokeTest.php
+++ b/tests/smoke/Swift/Smoke/InternationalSmokeTest.php
@@ -9,6 +9,7 @@ class Swift_Smoke_InternationalSmokeTest extends SwiftMailerSmokeTestCase
public function setUp()
{
+ parent::setup(); // For skip
$this->_attFile = __DIR__.'/../../../_samples/files/textfile.zip';
}
|
