Skip to content
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

fix(3rdparty): Don't use indirect dependency "Safe/" for functions #41061

Merged
merged 1 commit into from
Oct 24, 2023
Merged

fix(3rdparty): Don't use indirect dependency "Safe/" for functions #41061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion apps/dav/tests/integration/UserMigration/CalendarMigratorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

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;
Expand Down
2 changes: 1 addition & 1 deletion apps/dav/tests/integration/UserMigration/ContactsMigratorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

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;
Expand Down
6 changes: 3 additions & 3 deletions apps/dav/tests/unit/CalDAV/AppCalendar/AppCalendarTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;

use function Safe\rewind;
use function rewind;

class AppCalendarTest extends TestCase {
private $principal = 'principals/users/foo';
Expand All @@ -35,7 +35,7 @@ class AppCalendarTest extends TestCase {

private ICalendar|MockObject $calendar;
private ICalendar|MockObject $writeableCalendar;

protected function setUp(): void {
parent::setUp();

Expand Down Expand Up @@ -115,7 +115,7 @@ public function testGetACL():void {
'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());
Expand Down
4 changes: 2 additions & 2 deletions core/Db/ProfileConfig.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@

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;
Expand Down
2 changes: 1 addition & 1 deletion lib/private/Profile/Actions/FediverseAction.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

namespace OC\Profile\Actions;

use function Safe\substr;
use function substr;
use OCP\Accounts\IAccountManager;
use OCP\IURLGenerator;
use OCP\IUser;
Expand Down
2 changes: 1 addition & 1 deletion lib/private/Profile/Actions/TwitterAction.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

namespace OC\Profile\Actions;

use function Safe\substr;
use function substr;
use OCP\Accounts\IAccountManager;
use OCP\IURLGenerator;
use OCP\IUser;
Expand Down
Loading