Merge pull request #143 from nextcloud/update-master-php-testing-versions

Update master php testing versions

Author: blizzz

.travis.yml

@@ -1,8 +1,8 @@
 language: php
 php:
-  - 7.1
   - 7.2
   - 7.3
+  - 7.4snapshot
 
 services:
   - mysql
@@ -51,13 +51,13 @@ script:
 
 matrix:
   include:
-    - php: 7.1
+    - php: 7.3
       env: DB=mysql
-    - php: 7.1
+    - php: 7.3
       env: DB=pgsql
-    - php: 7.1
+    - php: 7.3
       env: DB=mysql;CODECHECK=1
-    - php: 7.1
+    - php: 7.3
       env: DB=mysql;CODECHECK=2
   allow_failures:
     - env: DB=mysql;CODECHECK=2

tests/StorageWrapperTest.php

@@ -24,6 +24,8 @@
 use OCA\FilesAccessControl\StorageWrapper;
 use OCP\Files\ForbiddenException;
 use Test\TestCase;
+use OCP\Files\Storage\IStorage;
+use OCA\FilesAccessControl\Operation;
 
 class StorageWrapperTest extends TestCase {
 
@@ -33,19 +35,16 @@ class StorageWrapperTest extends TestCase {
 	/** @var \OCA\FilesAccessControl\Operation|\PHPUnit_Framework_MockObject_MockObject */
 	protected $operation;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
-		$this->storage = $this->getMockBuilder('OCP\Files\Storage\IStorage')
-			->getMock();
+		$this->storage = $this->createMock(IStorage::class);
 
-		$this->operation = $this->getMockBuilder('OCA\FilesAccessControl\Operation')
-			->disableOriginalConstructor()
-			->getMock();
+		$this->operation = $this->createMock(Operation::class);
 	}
 
 	protected function getInstance(array $methods = []) {
-		return $this->getMockBuilder('OCA\FilesAccessControl\StorageWrapper')
+		return $this->getMockBuilder(StorageWrapper::class)
 			->setConstructorArgs([
 				[
 					'storage' => $this->storage,

tests/phpunit.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <phpunit bootstrap="bootstrap.php"
-		 strict="true"
 		 verbose="true"
 		 timeoutForSmallTests="900"
 		 timeoutForMediumTests="900"