Skip to content

Support PHP 8.1 - First batch #29432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PVince81 merged 17 commits into from
Nov 23, 2021
Merged

Support PHP 8.1 - First batch #29432

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
113756d
Fix ArrayAccess and JsonSerializable return types
come-nc Oct 19, 2021
af7bf98
Fix Iterator return types
come-nc Oct 21, 2021
66bdda5
Fix Guzzle function calls
come-nc Oct 21, 2021
bc3acfc
Fix test class names
come-nc Oct 21, 2021
3a1b374
Fix DateTime constructor calls with null
come-nc Oct 21, 2021
008b79d
Fix type errors
come-nc Oct 21, 2021
bb9c099
Fix FolderTest calls to Mountpoint constructor with wrong type
come-nc Oct 25, 2021
0655315
Fix Encryption tests on PHP 8.1
come-nc Oct 25, 2021
9d170f1
Fix warning about passing null to rtrim
come-nc Oct 25, 2021
ee7ef77
Fix warning about passing null to substr_count
come-nc Oct 25, 2021
25fa0b8
Fix TempManager test errors about passing null to is_dir
come-nc Oct 25, 2021
cd72045
Make mock config return default value to fix warnings
come-nc Oct 25, 2021
8b271b8
Fix tests and avoid PHP errors in them
come-nc Oct 25, 2021
5a20e20
Fix errors in AvatarController when data() returns null
come-nc Oct 25, 2021
5cd5245
Fix dav application tests and code for PHP 8.1
come-nc Oct 25, 2021
10dfded
Fix errors from files applications tests on PHP 8.1
come-nc Oct 25, 2021
18a91f0
Fix default value for $type in OC\DB\QueryBuilder\ExpressionBuilder\E…
come-nc Oct 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Make mock config return default value to fix warnings 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Nov 23, 2021
commit cd72045433eafc8f73a620239dc5afa6a0a6d84d
13 changes: 12 additions & 1 deletion tests/lib/Files/Config/UserMountCacheTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,18 @@ class UserMountCacheTest extends TestCase {
protected function setUp(): void {
$this->fileIds = [];
$this->connection = \OC::$server->getDatabaseConnection();
$this->userManager = new Manager($this->createMock(IConfig::class), $this->createMock(EventDispatcherInterface::class), $this->createMock(ICacheFactory::class), $this->createMock(IEventDispatcher::class));
$config = $this->getMockBuilder(IConfig::class)
->disableOriginalConstructor()
->getMock();
$config
->expects($this->any())
->method('getUserValue')
->willReturnArgument(3);
$config
->expects($this->any())
->method('getAppValue')
->willReturnArgument(2);
$this->userManager = new Manager($config, $this->createMock(EventDispatcherInterface::class), $this->createMock(ICacheFactory::class), $this->createMock(IEventDispatcher::class));
$userBackend = new Dummy();
$userBackend->createUser('u1', '');
$userBackend->createUser('u2', '');
Expand Down
14 changes: 13 additions & 1 deletion tests/lib/User/ManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,19 @@ public function testCallForSeenUsers() {
}

public function testDeleteUser() {
$manager = new \OC\User\Manager($this->config, $this->oldDispatcher, $this->cacheFactory, $this->eventDispatcher);
$config = $this->getMockBuilder(AllConfig::class)
->disableOriginalConstructor()
->getMock();
$config
->expects($this->any())
->method('getUserValue')
->willReturnArgument(3);
$config
->expects($this->any())
->method('getAppValue')
->willReturnArgument(2);

$manager = new \OC\User\Manager($config, $this->oldDispatcher, $this->cacheFactory, $this->eventDispatcher);
$backend = new \Test\Util\User\Dummy();

$manager->registerBackend($backend);
Expand Down