refactor(apps): Use PHP 5.5 features #48362

provokateurin · 2024-09-26T07:24:47Z

Summary

Setting rector PHP level to 5.3 and 5.4 did not lead to any changes so we can start at 5.5 right away.

Checklist

Code is properly formatted
Sign-off message is added to all commits
Tests (unit, integration, api and/or acceptance) are included
Screenshots before/after for front-end changes
Documentation (manuals or wiki) has been updated or is not required
Backports requested where applicable (ex: critical bugfixes)

Signed-off-by: provokateurin <kate@provokateurin.de>

apps/admin_audit/lib/AppInfo/Application.php

@@ -232,6 +232,6 @@
 	private function trashbinHooks(IAuditLogger $logger): void {
 		$trashActions = new Trashbin($logger);
 		Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete');
-		Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore');
+		Util::connectHook(\OCA\Files_Trashbin\Trashbin::class, 'post_restore', $trashActions, 'restore');


apps/files/lib/AppInfo/Application.php

@@ -147,6 +147,6 @@
 	}

 	private function registerHooks(): void {
-		Util::connectHook('\OCP\Config', 'js', '\OCA\Files\App', 'extendJsConfig');
+		Util::connectHook('\OCP\Config', 'js', \OCA\Files\App::class, 'extendJsConfig');


apps/files_external/lib/Command/Scan.php

@@ -70,13 +70,13 @@
 		/** @var Scanner $scanner */
 		$scanner = $storage->getScanner();

-		$scanner->listen('\OC\Files\Cache\Scanner', 'scanFile', function (string $path) use ($output): void {
+		$scanner->listen(\OC\Files\Cache\Scanner::class, 'scanFile', function (string $path) use ($output): void {


apps/files_external/lib/Command/Scan.php

 			$output->writeln("\tFile\t<info>$path</info>", OutputInterface::VERBOSITY_VERBOSE);
 			++$this->filesCounter;
 			$this->abortIfInterrupted();
 		});

-		$scanner->listen('\OC\Files\Cache\Scanner', 'scanFolder', function (string $path) use ($output): void {
+		$scanner->listen(\OC\Files\Cache\Scanner::class, 'scanFolder', function (string $path) use ($output): void {


apps/files_sharing/lib/Controller/DeletedShareAPIController.php

@@ -226,7 +226,7 @@
 			throw new QueryException();
 		}

-		return $this->serverContainer->get('\OCA\Talk\Share\Helper\DeletedShareAPIController');
+		return $this->serverContainer->get(\OCA\Talk\Share\Helper\DeletedShareAPIController::class);


apps/files_sharing/lib/Helper.php

@@ -12,10 +12,10 @@

 class Helper {
 	public static function registerHooks() {
-		\OCP\Util::connectHook('OC_Filesystem', 'post_rename', '\OCA\Files_Sharing\Updater', 'renameHook');
-		\OCP\Util::connectHook('OC_Filesystem', 'post_delete', '\OCA\Files_Sharing\Hooks', 'unshareChildren');
+		\OCP\Util::connectHook('OC_Filesystem', 'post_rename', \OCA\Files_Sharing\Updater::class, 'renameHook');


apps/files_sharing/lib/Helper.php

-		\OCP\Util::connectHook('OC_Filesystem', 'post_rename', '\OCA\Files_Sharing\Updater', 'renameHook');
-		\OCP\Util::connectHook('OC_Filesystem', 'post_delete', '\OCA\Files_Sharing\Hooks', 'unshareChildren');
+		\OCP\Util::connectHook('OC_Filesystem', 'post_rename', \OCA\Files_Sharing\Updater::class, 'renameHook');
+		\OCP\Util::connectHook('OC_Filesystem', 'post_delete', \OCA\Files_Sharing\Hooks::class, 'unshareChildren');


apps/files_sharing/lib/Helper.php


-		\OCP\Util::connectHook('OC_User', 'post_deleteUser', '\OCA\Files_Sharing\Hooks', 'deleteUser');
+		\OCP\Util::connectHook('OC_User', 'post_deleteUser', \OCA\Files_Sharing\Hooks::class, 'deleteUser');


apps/files_trashbin/lib/Command/RestoreAllFiles.php

@@ -256,7 +256,7 @@
 			 * That's why PSALM doesn't know the class GroupTrashItem.
 			 * @psalm-suppress RedundantCondition
 			 */
-			if ($scope === self::SCOPE_GROUPFOLDERS && $trashItemClass !== 'OCA\GroupFolders\Trash\GroupTrashItem') {
+			if ($scope === self::SCOPE_GROUPFOLDERS && $trashItemClass !== \OCA\GroupFolders\Trash\GroupTrashItem::class) {


apps/files_trashbin/lib/Trashbin.php

@@ -505,7 +505,7 @@
 			$view->chroot('/' . $user . '/files');
 			$view->touch('/' . $location . '/' . $uniqueFilename, $mtime);
 			$view->chroot($fakeRoot);
-			\OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', ['filePath' => $targetPath, 'trashPath' => $sourcePath]);
+			\OCP\Util::emitHook(\OCA\Files_Trashbin\Trashbin::class, 'post_restore', ['filePath' => $targetPath, 'trashPath' => $sourcePath]);


nickvergessen · 2024-09-26T07:36:28Z

apps/admin_audit/lib/AppInfo/Application.php

@@ -232,6 +232,6 @@ private function versionsHooks(IAuditLogger $logger): void {
 	private function trashbinHooks(IAuditLogger $logger): void {
 		$trashActions = new Trashbin($logger);
 		Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete');
-		Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore');
+		Util::connectHook(\OCA\Files_Trashbin\Trashbin::class, 'post_restore', $trashActions, 'restore');


This was created by Christoph the other day.
It is a breaking change:

var_dump('\OCA\Files_Trashbin\Trashbin' === \OCA\Files_Trashbin\Trashbin::class); // bool(false)

We can only do this, if we modify the hooker itself and basically trim leading slashes on connect and emit

So the comparison fails, but shouldn't the ::class result in the exact same string content?
Maybe I'm missing something here.

\OCA\Files_Trashbin\Trashbin::class is 'OCA\Files_Trashbin\Trashbin' without the first \

I see, in the preview IntelliJ displayed it to me with the leading backslash 🤷‍♀️

provokateurin · 2024-09-26T11:05:54Z

Another problem as Psalm reported it: Class strings for classes from apps outside of server don't work. Using stubs for that should be fine, right? And there shouldn't be any problem with loading that code even if the class is not available?

come-nc · 2024-09-26T12:24:16Z

Another problem as Psalm reported it: Class strings for classes from apps outside of server don't work. Using stubs for that should be fine, right? And there shouldn't be any problem with loading that code even if the class is not available?

Yeah psalm is annoying with that. It’s perfectly valid to use \My\Fully\Qualified\Name::class even if the class does not exists, it still works.

refactor(apps): Use PHP 5.5 features

b9115da

Signed-off-by: provokateurin <kate@provokateurin.de>

provokateurin added technical debt ♻️ refactor Refactor code (not a bug fix, not a feature just refactoring) labels Sep 26, 2024

provokateurin added this to the Nextcloud 31 milestone Sep 26, 2024

provokateurin requested review from nickvergessen and come-nc September 26, 2024 07:24

provokateurin requested review from ChristophWurst, miaulalala and tcitworld as code owners September 26, 2024 07:24

github-advanced-security bot found potential problems Sep 26, 2024

View reviewed changes

nickvergessen requested changes Sep 26, 2024

View reviewed changes

provokateurin added the 3. to review Waiting for reviews label Sep 26, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor(apps): Use PHP 5.5 features #48362

refactor(apps): Use PHP 5.5 features #48362

provokateurin commented Sep 26, 2024

nickvergessen Sep 26, 2024

provokateurin Sep 26, 2024

come-nc Sep 26, 2024

provokateurin Sep 26, 2024

provokateurin commented Sep 26, 2024

come-nc commented Sep 26, 2024


		\OCP\Util::connectHook('OC_User', 'post_deleteUser', '\OCA\Files_Sharing\Hooks', 'deleteUser');
		\OCP\Util::connectHook('OC_User', 'post_deleteUser', \OCA\Files_Sharing\Hooks::class, 'deleteUser');

refactor(apps): Use PHP 5.5 features #48362

refactor(apps): Use PHP 5.5 features #48362

Conversation

provokateurin commented Sep 26, 2024

Summary

Checklist

nickvergessen Sep 26, 2024

Choose a reason for hiding this comment

provokateurin Sep 26, 2024

Choose a reason for hiding this comment

come-nc Sep 26, 2024

Choose a reason for hiding this comment

provokateurin Sep 26, 2024

Choose a reason for hiding this comment

provokateurin commented Sep 26, 2024

come-nc commented Sep 26, 2024