From 3a265cee302e390da0f42f953040b22f667d109d Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 23 Oct 2023 15:25:14 +0200
Subject: [PATCH] fix(3rdparty): Don't use indirect dependency "Safe/" for
 functions

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 .../integration/UserMigration/CalendarMigratorTest.php      | 2 +-
 .../integration/UserMigration/ContactsMigratorTest.php      | 2 +-
 apps/dav/tests/unit/CalDAV/AppCalendar/AppCalendarTest.php  | 6 +++---
 core/Db/ProfileConfig.php                                   | 4 ++--
 lib/private/Profile/Actions/FediverseAction.php             | 2 +-
 lib/private/Profile/Actions/TwitterAction.php               | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/dav/tests/integration/UserMigration/CalendarMigratorTest.php b/apps/dav/tests/integration/UserMigration/CalendarMigratorTest.php
index 8c23a30e8794f..3efc5ab1473ae 100644
--- a/apps/dav/tests/integration/UserMigration/CalendarMigratorTest.php
+++ b/apps/dav/tests/integration/UserMigration/CalendarMigratorTest.php
@@ -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;
diff --git a/apps/dav/tests/integration/UserMigration/ContactsMigratorTest.php b/apps/dav/tests/integration/UserMigration/ContactsMigratorTest.php
index 568b83396ba1c..3fa043df28545 100644
--- a/apps/dav/tests/integration/UserMigration/ContactsMigratorTest.php
+++ b/apps/dav/tests/integration/UserMigration/ContactsMigratorTest.php
@@ -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;
diff --git a/apps/dav/tests/unit/CalDAV/AppCalendar/AppCalendarTest.php b/apps/dav/tests/unit/CalDAV/AppCalendar/AppCalendarTest.php
index 78ebf8b67a44b..b2a08bddb9806 100644
--- a/apps/dav/tests/unit/CalDAV/AppCalendar/AppCalendarTest.php
+++ b/apps/dav/tests/unit/CalDAV/AppCalendar/AppCalendarTest.php
@@ -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';
@@ -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 @@ 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());
diff --git a/core/Db/ProfileConfig.php b/core/Db/ProfileConfig.php
index b399874adf48e..0cdf132ca9614 100644
--- a/core/Db/ProfileConfig.php
+++ b/core/Db/ProfileConfig.php
@@ -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;
diff --git a/lib/private/Profile/Actions/FediverseAction.php b/lib/private/Profile/Actions/FediverseAction.php
index 30682ba6b2a0c..f96d2c07de4da 100644
--- a/lib/private/Profile/Actions/FediverseAction.php
+++ b/lib/private/Profile/Actions/FediverseAction.php
@@ -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;
diff --git a/lib/private/Profile/Actions/TwitterAction.php b/lib/private/Profile/Actions/TwitterAction.php
index 178bd04c78679..d63c2d3ee0839 100644
--- a/lib/private/Profile/Actions/TwitterAction.php
+++ b/lib/private/Profile/Actions/TwitterAction.php
@@ -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;