From 34317cc28a3a9879afdc201ad098e03f1a632187 Mon Sep 17 00:00:00 2001
From: Phil Davis <phil@jankaritech.com>
Date: Tue, 2 Apr 2019 12:06:01 +0545
Subject: [PATCH 1/3] Updating bamarni/composer-bin-plugin (v1.2.0 => v1.3.0)

---
 composer.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.lock b/composer.lock
index b9e1160017c..9825897ea0e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -9,16 +9,16 @@
     "packages-dev": [
         {
             "name": "bamarni/composer-bin-plugin",
-            "version": "v1.2.0",
+            "version": "v1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bamarni/composer-bin-plugin.git",
-                "reference": "62fef740245a85f00665e81ea8f0aa0b72afe6e7"
+                "reference": "67f9d314dc7ecf7245b8637906e151ccc62b8d24"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bamarni/composer-bin-plugin/zipball/62fef740245a85f00665e81ea8f0aa0b72afe6e7",
-                "reference": "62fef740245a85f00665e81ea8f0aa0b72afe6e7",
+                "url": "https://api.github.com/repos/bamarni/composer-bin-plugin/zipball/67f9d314dc7ecf7245b8637906e151ccc62b8d24",
+                "reference": "67f9d314dc7ecf7245b8637906e151ccc62b8d24",
                 "shasum": ""
             },
             "require": {
@@ -26,7 +26,7 @@
             },
             "require-dev": {
                 "composer/composer": "dev-master",
-                "symfony/console": "^2.5 || ^3.0"
+                "symfony/console": "^2.5 || ^3.0 || ^4.0"
             },
             "type": "composer-plugin",
             "extra": {
@@ -44,7 +44,7 @@
             "license": [
                 "MIT"
             ],
-            "time": "2017-09-11T13:13:58+00:00"
+            "time": "2019-03-17T12:38:04+00:00"
         }
     ],
     "aliases": [],

From f243479d2d74218d8cd8a856120fbc270475af76 Mon Sep 17 00:00:00 2001
From: Phil Davis <phil@jankaritech.com>
Date: Tue, 2 Apr 2019 12:09:21 +0545
Subject: [PATCH 2/3] Adjust PHPUnit Framework namespace for PHPUnit6

---
 tests/lib/configtest.php | 18 +++++++++---------
 tests/lib/utiltest.php   |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/lib/configtest.php b/tests/lib/configtest.php
index 937288d3d21..fa75bf2a6eb 100644
--- a/tests/lib/configtest.php
+++ b/tests/lib/configtest.php
@@ -11,7 +11,7 @@
  *
  * @package OCA\FirstRunWizard\Tests
  */
-class ConfigTest extends \PHPUnit_Framework_TestCase {
+class ConfigTest extends \PHPUnit\Framework\TestCase {
 
 	/**
 	 * @param bool $isUserAvailable
@@ -22,12 +22,12 @@ class ConfigTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testEnable($isUserAvailable) {
 		/**
-		 * @var IConfig | \PHPUnit_Framework_MockObject_MockObject $config
+		 * @var IConfig | \PHPUnit\Framework\MockObject\MockObject $config
 		 */
 		$config = $this->getMockBuilder('\OCP\IConfig')
 			->disableOriginalConstructor()->getMock();
 		/**
-		 * @var IUserSession | \PHPUnit_Framework_MockObject_MockObject $userSession
+		 * @var IUserSession | \PHPUnit\Framework\MockObject\MockObject $userSession
 		 */
 		$userSession = $this->getMockBuilder('\OCP\IUserSession')
 			->disableOriginalConstructor()->getMock();
@@ -72,12 +72,12 @@ public function testEnable($isUserAvailable) {
 	 */
 	public function testDisable($isUserAvailable) {
 		/**
-		 * @var IConfig | \PHPUnit_Framework_MockObject_MockObject $config
+		 * @var IConfig | \PHPUnit\Framework\MockObject\MockObject $config
 		 */
 		$config = $this->getMockBuilder('\OCP\IConfig')
 			->disableOriginalConstructor()->getMock();
 		/**
-		 * @var IUserSession | \PHPUnit_Framework_MockObject_MockObject $userSession
+		 * @var IUserSession | \PHPUnit\Framework\MockObject\MockObject $userSession
 		 */
 		$userSession = $this->getMockBuilder('\OCP\IUserSession')
 			->disableOriginalConstructor()->getMock();
@@ -132,12 +132,12 @@ public function enableDisableData() {
 	 */
 	public function testIsEnabled($isEnabled) {
 		/**
-		 * @var IConfig | \PHPUnit_Framework_MockObject_MockObject $config
+		 * @var IConfig | \PHPUnit\Framework\MockObject\MockObject $config
 		 */
 		$config = $this->getMockBuilder('\OCP\IConfig')
 			->disableOriginalConstructor()->getMock();
 		/**
-		 * @var IUserSession | \PHPUnit_Framework_MockObject_MockObject $userSession
+		 * @var IUserSession | \PHPUnit\Framework\MockObject\MockObject $userSession
 		 */
 		$userSession = $this->getMockBuilder('\OCP\IUserSession')
 			->disableOriginalConstructor()->getMock();
@@ -215,7 +215,7 @@ public function testResetAllUsers() {
 		$users[] = $this->getMockBuilder('\OCP\IUser')
 			->disableOriginalConstructor()->getMock();
 		/**
-		 * @var IConfig | \PHPUnit_Framework_MockObject_MockObject $config
+		 * @var IConfig | \PHPUnit\Framework\MockObject\MockObject $config
 		 */
 		$config = $this->getMockBuilder('\OCP\IConfig')
 			->disableOriginalConstructor()->getMock();
@@ -225,7 +225,7 @@ public function testResetAllUsers() {
 		$config->expects($this->exactly(\count($users)))
 			->method('setUserValue');
 		/**
-		 * @var IUserSession | \PHPUnit_Framework_MockObject_MockObject $userSession
+		 * @var IUserSession | \PHPUnit\Framework\MockObject\MockObject $userSession
 		 */
 		$userSession = $this->getMockBuilder('\OCP\IUserSession')
 			->disableOriginalConstructor()->getMock();
diff --git a/tests/lib/utiltest.php b/tests/lib/utiltest.php
index 1afa496ea31..672e97b7032 100644
--- a/tests/lib/utiltest.php
+++ b/tests/lib/utiltest.php
@@ -7,7 +7,7 @@
 use OCP\Defaults;
 use OCP\IConfig;
 
-class UtilTest extends \PHPUnit_Framework_TestCase {
+class UtilTest extends \PHPUnit\Framework\TestCase {
 
 	/**
 	 * same code as in core: tests/lib/UtilTest.php
@@ -24,10 +24,10 @@ public function testGetSyncClientUrls($configValues, $defaultValues) {
 		/** @var IAppManager $appManager */
 		$appManager = $this->getMockBuilder('\OCP\App\IAppManager')
 			->disableOriginalConstructor()->getMock();
-		/** @var IConfig | \PHPUnit_Framework_MockObject_MockObject $config */
+		/** @var IConfig | \PHPUnit\Framework\MockObject\MockObject $config */
 		$config = $this->getMockBuilder('\OCP\IConfig')
 			->disableOriginalConstructor()->getMock();
-		/** @var Defaults | \PHPUnit_Framework_MockObject_MockObject $defaults */
+		/** @var Defaults | \PHPUnit\Framework\MockObject\MockObject $defaults */
 		$defaults = $this->getMockBuilder('\OCP\Defaults')
 			->disableOriginalConstructor()->getMock();
 

From ccd4b51eec0eaf9fafe21addfb3f8d978f6ef099 Mon Sep 17 00:00:00 2001
From: Phil Davis <phil@jankaritech.com>
Date: Tue, 2 Apr 2019 12:10:27 +0545
Subject: [PATCH 3/3] phpunit enable failOnRisky failOnWarning

---
 phpunit.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/phpunit.xml b/phpunit.xml
index 1f0b00f4476..8349a685602 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <phpunit bootstrap="../../tests/bootstrap.php"
 		 verbose="true"
+		 failOnRisky="true"
+		 failOnWarning="true"
 		 timeoutForSmallTests="900"
 		 timeoutForMediumTests="900"
 		 timeoutForLargeTests="900"