Browse Source

Fix dynamic properties and other problems in tests for PHP 8.2

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
pull/35156/head
Côme Chilliet 3 years ago
parent
commit
70e2217d1c
No known key found for this signature in database GPG Key ID: A3E2F658B28C760A
  1. 4
      tests/lib/DB/MigrationsTest.php
  2. 9
      tests/lib/Encryption/Keys/StorageTest.php
  3. 11
      tests/lib/Security/VerificationToken/VerificationTokenTest.php
  4. 20
      tests/lib/Settings/ManagerTest.php

4
tests/lib/DB/MigrationsTest.php

@ -31,7 +31,6 @@ use OCP\Migration\IMigrationStep;
* @package Test\DB
*/
class MigrationsTest extends \Test\TestCase {
/** @var MigrationService | \PHPUnit\Framework\MockObject\MockObject */
private $migrationService;
/** @var \PHPUnit\Framework\MockObject\MockObject | IDBConnection $db */
@ -247,6 +246,9 @@ class MigrationsTest extends \Test\TestCase {
->willReturn(\str_repeat('a', 30));
$primaryKey = $this->createMock(Index::class);
$primaryKey->expects($this->once())
->method('getName')
->willReturn(\str_repeat('a', 30));
$table->expects($this->once())
->method('getColumns')

9
tests/lib/Encryption/Keys/StorageTest.php

@ -31,22 +31,23 @@ use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;
class StorageTest extends TestCase {
/** @var Storage */
protected $storage;
/** @var \PHPUnit\Framework\MockObject\MockObject */
/** @var MockObject */
protected $util;
/** @var \PHPUnit\Framework\MockObject\MockObject */
/** @var MockObject */
protected $view;
/** @var \PHPUnit\Framework\MockObject\MockObject */
/** @var MockObject */
protected $config;
/** @var MockObject|ICrypto */
protected $crypto;
private array $mkdirStack = [];
protected function setUp(): void {
parent::setUp();

11
tests/lib/Security/VerificationToken/VerificationTokenTest.php

@ -35,18 +35,21 @@ use OCP\Security\ICrypto;
use OCP\Security\ISecureRandom;
use OCP\Security\VerificationToken\InvalidTokenException;
use Test\TestCase;
use PHPUnit\Framework\MockObject\MockObject;
class VerificationTokenTest extends TestCase {
/** @var VerificationToken */
protected $token;
/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
/** @var IConfig|MockObject */
protected $config;
/** @var ISecureRandom|\PHPUnit\Framework\MockObject\MockObject */
/** @var ISecureRandom|MockObject */
protected $secureRandom;
/** @var ICrypto|\PHPUnit\Framework\MockObject\MockObject */
/** @var ICrypto|MockObject */
protected $crypto;
/** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */
/** @var ITimeFactory|MockObject */
protected $timeFactory;
/** @var IJobList|MockObject */
protected $jobList
protected function setUp(): void {
parent::setUp();

20
tests/lib/Settings/ManagerTest.php

@ -36,24 +36,26 @@ use OCP\Settings\ISettings;
use OCP\Settings\ISubAdminSettings;
use Psr\Log\LoggerInterface;
use Test\TestCase;
use PHPUnit\Framework\MockObject\MockObject;
class ManagerTest extends TestCase {
/** @var Manager|\PHPUnit\Framework\MockObject\MockObject */
/** @var Manager|MockObject */
private $manager;
/** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */
/** @var LoggerInterface|MockObject */
private $logger;
/** @var IDBConnection|\PHPUnit\Framework\MockObject\MockObject */
/** @var IDBConnection|MockObject */
private $l10n;
/** @var IFactory|\PHPUnit\Framework\MockObject\MockObject */
/** @var IFactory|MockObject */
private $l10nFactory;
/** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */
/** @var IURLGenerator|MockObject */
private $url;
/** @var IServerContainer|\PHPUnit\Framework\MockObject\MockObject */
/** @var IServerContainer|MockObject */
private $container;
/** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */
/** @var AuthorizedGroupMapper|MockObject */
private $mapper;
/** @var IGroupManager|MockObject */
private $groupManager;
/** @var ISubAdmin|\PHPUnit\Framework\MockObject\MockObject */
/** @var ISubAdmin|MockObject */
private $subAdmin;
protected function setUp(): void {

Loading…
Cancel
Save