Merge pull request #41061 from nextcloud/bugfix/noid/dont-use-indirec…

…t-dependency fix(3rdparty): Don't use indirect dependency "Safe/" for functions
nextcloud · Oct 24, 2023 · 7a55ea7 · 7a55ea7
2 parents 122e799 + 3a265ce
commit 7a55ea7
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;