Merge branch 'develop'

gomoob · Oct 14, 2015 · 79e8a23 · 79e8a23
2 parents b817760 + 256673c
commit 79e8a23
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 113 deletions.
diff --git a/.buildpath b/.buildpath
@@ -27,6 +27,7 @@
 	<buildpathentry kind="src" path="vendor/symfony/stopwatch"/>
 	<buildpathentry kind="src" path="vendor/symfony/filesystem"/>
 	<buildpathentry kind="src" path="vendor/sebastian/exporter/src"/>
+	<buildpathentry kind="src" path="vendor/phpunit/php-text-template/src"/>
 	<buildpathentry kind="src" path="vendor/guzzle/guzzle/tests"/>
 	<buildpathentry kind="src" path="vendor/squizlabs/php_codesniffer/CodeSniffer/Tokenizers"/>
 	<buildpathentry kind="src" path="vendor/sebastian/version/src"/>
@@ -50,5 +51,6 @@
 	<buildpathentry kind="src" path="vendor/phploc/phploc/src"/>
 	<buildpathentry kind="src" path="vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs"/>
 	<buildpathentry kind="src" path="vendor/squizlabs/php_codesniffer/CodeSniffer/Reports"/>
+	<buildpathentry kind="src" path="vendor/phpunit/php-timer/src"/>
 	<buildpathentry kind="src" path="vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Zend/Sniffs"/>
 </buildpath>
diff --git a/composer.json b/composer.json
@@ -39,7 +39,7 @@
 		"pdepend/pdepend" : "~2.2",
 		"phploc/phploc" : "~2.1",
 		"phpmd/phpmd" : "~2.3",
-		"phpunit/phpunit" : "~5.0",
+		"phpunit/phpunit" : "~4.8",
 		"satooshi/php-coveralls" : "~0.6",
 		"sebastian/phpcpd" : "~2.0",
 		"squizlabs/php_codesniffer" : "~2.3"

diff --git a/composer.lock b/composer.lock