From ee2dd7719711ec3786a86d8ded7dc5a085a7d7e9 Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Sat, 28 Jun 2014 14:01:42 +0200
Subject: [PATCH] [TASK] Use stable phpunit 4.1 instead of master
We had to update to phpunit "master" recently due to an issue with
phpunit-mock-objects that was not released yet but fixed in master.
The fix was released with phpunit-mock-objects 2.1.5 today, so we
can switch back to a stable combination of those packages.
Resolves: #59958
Related: #59685
Releases: 6.3, 6.2
Change-Id: I92336adef0291239c7dad606002721c91b2991fa
Reviewed-on: https://review.typo3.org/31179
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
---
composer.json | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/composer.json b/composer.json
index e2426a7567f2..c15196a14a0b 100644
--- a/composer.json
+++ b/composer.json
@@ -37,8 +37,7 @@
},
"require-dev": {
"mikey179/vfsStream": "1.3.*@dev",
- "phpunit/phpunit": "4.*@dev",
- "phpunit/phpunit-mock-objects": "2.*@dev"
+ "phpunit/phpunit": "~4.1"
},
"suggest": {
"ext-gd": "GDlib/Freetype is required for building images with text (GIFBUILDER) and can also be used to scale images",
--
GitLab