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

Signed-off-by: Joas Schilling <coding@schilljs.com>

diff --git a/apps/dav/tests/integration/UserMigration/CalendarMigratorTest.php b/apps/dav/tests/integration/UserMigration/CalendarMigratorTest.php
index 8c23a30e8794f9d9562e1dc05a265d96310ce9ae..3efc5ab1473aec04eb7a1ae93afd0aa5ea54b36f 100644 (file)
--- a/apps/dav/tests/integration/UserMigration/CalendarMigratorTest.php
+++ b/apps/dav/tests/integration/UserMigration/CalendarMigratorTest.php
@@ -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;

diff --git a/apps/dav/tests/integration/UserMigration/ContactsMigratorTest.php b/apps/dav/tests/integration/UserMigration/ContactsMigratorTest.php
index 568b83396ba1cb933d3e61d2b6e2d18c6e9e9bfe..3fa043df28545d3d38eb4d8d02b67d5b1850be17 100644 (file)
--- a/apps/dav/tests/integration/UserMigration/ContactsMigratorTest.php
+++ b/apps/dav/tests/integration/UserMigration/ContactsMigratorTest.php
@@ -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;

diff --git a/apps/dav/tests/unit/CalDAV/AppCalendar/AppCalendarTest.php b/apps/dav/tests/unit/CalDAV/AppCalendar/AppCalendarTest.php
index 78ebf8b67a44b59bcf2203c95fcbf03f185a7efc..b2a08bddb9806020eb89a80ada7581ec5af9ad17 100644 (file)
--- a/apps/dav/tests/unit/CalDAV/AppCalendar/AppCalendarTest.php
+++ b/apps/dav/tests/unit/CalDAV/AppCalendar/AppCalendarTest.php
@@ -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());

diff --git a/core/Db/ProfileConfig.php b/core/Db/ProfileConfig.php
index b399874adf48e0f28696cfa31c42a2c39589a0a8..0cdf132ca9614ed2edc35b22ceedf7d8046eaa59 100644 (file)
--- a/core/Db/ProfileConfig.php
+++ b/core/Db/ProfileConfig.php
@@ -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;

diff --git a/lib/private/Profile/Actions/FediverseAction.php b/lib/private/Profile/Actions/FediverseAction.php
index 30682ba6b2a0c32953a0c298ce8a997f5fd37db8..f96d2c07de4dae8b3624a9a9bbf8d925d9a5cb19 100644 (file)
--- a/lib/private/Profile/Actions/FediverseAction.php
+++ b/lib/private/Profile/Actions/FediverseAction.php
@@ -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;

diff --git a/lib/private/Profile/Actions/TwitterAction.php b/lib/private/Profile/Actions/TwitterAction.php
index 178bd04c786794f0accc91dbd5a6095568d5b01d..d63c2d3ee083931f789e015d204633fc462040ec 100644 (file)
--- a/lib/private/Profile/Actions/TwitterAction.php
+++ b/lib/private/Profile/Actions/TwitterAction.php
@@ -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;