summaryrefslogtreecommitdiffstats
path: root/php-swiftmailer-mockery.patch
diff options
context:
space:
mode:
Diffstat (limited to 'php-swiftmailer-mockery.patch')
-rw-r--r--php-swiftmailer-mockery.patch62
1 files changed, 0 insertions, 62 deletions
diff --git a/php-swiftmailer-mockery.patch b/php-swiftmailer-mockery.patch
deleted file mode 100644
index eae9ca5..0000000
--- a/php-swiftmailer-mockery.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-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';
- }
-