upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-06 07:13:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 34

Merge pull request #41061 from nextcloud/bugfix/noid/dont-use-indirect-dependency

Browse source 
fix(3rdparty): Don't use indirect dependency "Safe/" for functions
This commit is contained in:
Joas Schilling 2023-10-24 12:12:36 +02:00 committed by GitHub
commit 7a55ea7823
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/dav/tests/integration/UserMigration/CalendarMigratorTest.php
View file

@ -26,7 +26,7 @@ declare(strict_types=1);
namespace OCA\DAV\Tests\integration\UserMigration;
use function Safe\scandir;
use function scandir;
use OCA\DAV\AppInfo\Application;
use OCA\DAV\UserMigration\CalendarMigrator;
use OCP\AppFramework\App;

2
apps/dav/tests/integration/UserMigration/ContactsMigratorTest.php
View file

@ -26,7 +26,7 @@ declare(strict_types=1);
namespace OCA\DAV\Tests\integration\UserMigration;
use function Safe\scandir;
use function scandir;
use OCA\DAV\AppInfo\Application;
use OCA\DAV\UserMigration\ContactsMigrator;
use OCP\AppFramework\App;

6
apps/dav/tests/unit/CalDAV/AppCalendar/AppCalendarTest.php
View file

@ -25,7 +25,7 @@ use OCP\Constants;
use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;
use function Safe\rewind;
use function rewind;
class AppCalendarTest extends TestCase {
private $principal = 'principals/users/foo';
@ -35,7 +35,7 @@ class AppCalendarTest extends TestCase {
private ICalendar|MockObject $calendar;
private ICalendar|MockObject $writeableCalendar;
protected function setUp(): void {
parent::setUp();
@ -115,7 +115,7 @@ class AppCalendarTest extends TestCase {
'principal' => $this->principal,
'protected' => true,
];
// Check that the correct ACL is returned (default be only readable)
$this->assertEquals($expectedRO, $this->appCalendar->getACL());
$this->assertEquals($expectedRW, $this->writeableAppCalendar->getACL());

4
core/Db/ProfileConfig.php
View file

@ -26,8 +26,8 @@ declare(strict_types=1);
namespace OC\Core\Db;
use function Safe\json_decode;
use function Safe\json_encode;
use function json_decode;
use function json_encode;
use \JsonSerializable;
use OCP\AppFramework\Db\Entity;
use OCP\Profile\ParameterDoesNotExistException;

2
lib/private/Profile/Actions/FediverseAction.php
View file

@ -26,7 +26,7 @@ declare(strict_types=1);
namespace OC\Profile\Actions;
use function Safe\substr;
use function substr;
use OCP\Accounts\IAccountManager;
use OCP\IURLGenerator;
use OCP\IUser;

2
lib/private/Profile/Actions/TwitterAction.php
View file

@ -26,7 +26,7 @@ declare(strict_types=1);
namespace OC\Profile\Actions;
use function Safe\substr;
use function substr;
use OCP\Accounts\IAccountManager;
use OCP\IURLGenerator;
use OCP\IUser;