diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2020-01-20 14:23:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-20 14:23:48 +0300 |
| commit | 7391954f4826c8f69ad3a0fff05231731893b8d3 (patch) | |
| tree | 61663cabbca225eb9447c928d1a4bcbdd49d7c3d | |
| parent | a60beefa878dd0f971b9776eef3686ab565a6304 (diff) | |
| parent | 3dd7b42c29fef5c0438791c1250b470e50e3317c (diff) | |
Merge pull request #164 from nextcloud/backport/160/stable18
[stable18] Update master php testing versions
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rw-r--r-- | tests/Unit/Controller/DisplayControllerTest.php (renamed from tests/unit/controller/displaycontrollertest.php) | 20 |
2 files changed, 13 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml index be04dfa..5f36cbf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,9 @@ language: php sudo: required php: - - 7.1 - 7.2 - 7.3 + - 7.4snapshot services: - mysql @@ -56,13 +56,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 fast_finish: true diff --git a/tests/unit/controller/displaycontrollertest.php b/tests/Unit/Controller/DisplayControllerTest.php index edcafd9..0d260c8 100644 --- a/tests/unit/controller/displaycontrollertest.php +++ b/tests/Unit/Controller/DisplayControllerTest.php @@ -8,8 +8,9 @@ * See the COPYING-README file. */ -namespace OCA\Files_PdfViewer\Controller; +namespace OCA\Files_PdfViewer\Tests\Unit\Controller; +use OCA\Files_PdfViewer\Controller\DisplayController; use OCP\AppFramework\Http\ContentSecurityPolicy; use OCP\AppFramework\Http\TemplateResponse; use OCP\IRequest; @@ -23,20 +24,15 @@ class DisplayControllerTest extends TestCase { private $request; /** @var IURLGenerator */ private $urlGenerator; - /** @var DisplayController */ + /** @var DisplayController + */ private $controller; - public function setUp(){ + protected function setUp(): void { $this->appName = 'files_pdfviewer'; - $this->request = $this->getMockBuilder( - '\OCP\IRequest') - ->disableOriginalConstructor() - ->getMock(); - $this->urlGenerator = $this->getMockBuilder( - '\OCP\IUrlGenerator') - ->disableOriginalConstructor() - ->getMock(); + $this->request = $this->createMock(IRequest::class); + $this->urlGenerator = $this->createMock(IURLGenerator::class); $this->controller = new DisplayController( $this->appName, $this->request, @@ -46,7 +42,7 @@ class DisplayControllerTest extends TestCase { parent::setUp(); } - public function testShowPdfViewer() { + public function testShowPdfViewer(): void { $params = [ 'urlGenerator' => $this->urlGenerator, 'minmode' => false |