diff --git a/lib/GroupBackend.php b/lib/GroupBackend.php
index 13184b0f..8fd6aca6 100644
--- a/lib/GroupBackend.php
+++ b/lib/GroupBackend.php
@@ -20,7 +20,7 @@
 
 class GroupBackend extends ABackend implements IAddToGroupBackend, ICountUsersBackend, ICreateGroupBackend, IDeleteGroupBackend, IGetDisplayNameBackend, IRemoveFromGroupBackend, INamedBackend {
 
-	/** @var array  */
+	/** @var array */
 	private $groupCache = [];
 
 	public const TABLE_GROUPS = 'user_saml_groups';
diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php
index 12e0079e..45b9d1dd 100644
--- a/lib/Settings/Admin.php
+++ b/lib/Settings/Admin.php
@@ -234,8 +234,8 @@ public function getSection() {
 
 	/**
 	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
+	 *             the admin section. The forms are arranged in ascending order of the
+	 *             priority values. It is required to return a value between 0 and 100.
 	 *
 	 * keep the server setting at the top, right after "server settings"
 	 */
diff --git a/templates/admin.php b/templates/admin.php
index d5772441..dae6a8e0 100644
--- a/templates/admin.php
+++ b/templates/admin.php
@@ -117,7 +117,7 @@
 					<?php foreach ($_['name-id-formats'] as $key => $value): ?>
 					<option value="<?php p($key) ?>"
 						<?php if ($value['selected'] ?? false) {
-							p("selected");
+							p('selected');
 						} ?> ><?php p($value['label']) ?></option>
 					<?php endforeach; ?>
 				</select>
diff --git a/templates/selectUserBackEnd.php b/templates/selectUserBackEnd.php
index b0fda10a..c7622047 100644
--- a/templates/selectUserBackEnd.php
+++ b/templates/selectUserBackEnd.php
@@ -9,7 +9,7 @@
 Util::addScript('user_saml', 'selectUserBackEnd');
 
 /** @var array $_ */
-/** @var $l \OCP\IL10N */
+/** @var \OCP\IL10N $l */
 ?>
 
 <div id="saml-select-user-back-end">
diff --git a/tests/unit/Command/GetMetadataTest.php b/tests/unit/Command/GetMetadataTest.php
index 078bbc22..d5f3dd00 100644
--- a/tests/unit/Command/GetMetadataTest.php
+++ b/tests/unit/Command/GetMetadataTest.php
@@ -14,9 +14,9 @@
 
 class GetMetadataTest extends \Test\TestCase {
 
-	/** @var GetMetadata|MockObject*/
+	/** @var GetMetadata|MockObject */
 	protected $GetMetadata;
-	/** @var SAMLSettings|MockObject*/
+	/** @var SAMLSettings|MockObject */
 	private $samlSettings;
 
 	protected function setUp(): void {
diff --git a/tests/unit/Controller/SAMLControllerTest.php b/tests/unit/Controller/SAMLControllerTest.php
index 9c1fac1c..3987ac12 100644
--- a/tests/unit/Controller/SAMLControllerTest.php
+++ b/tests/unit/Controller/SAMLControllerTest.php
@@ -40,7 +40,7 @@ class SAMLControllerTest extends TestCase {
 	private $session;
 	/** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */
 	private $userSession;
-	/** @var SAMLSettings|\PHPUnit_Framework_MockObject_MockObject*/
+	/** @var SAMLSettings|\PHPUnit_Framework_MockObject_MockObject */
 	private $samlSettings;
 	/** @var UserBackend|\PHPUnit_Framework_MockObject_MockObject */
 	private $userBackend;
diff --git a/tests/unit/GroupBackendTest.php b/tests/unit/GroupBackendTest.php
index ecc65adc..285ba043 100644
--- a/tests/unit/GroupBackendTest.php
+++ b/tests/unit/GroupBackendTest.php
@@ -88,9 +88,9 @@ public function testInGroup() {
 			foreach ($this->users as $user) {
 				$result = $this->groupBackend->inGroup($user['uid'], $group['gid']);
 				if (in_array($group['gid'], $user['groups'])) {
-					$this->assertTrue($result, sprintf("User %s should be member of group %s", $user['uid'], $group['gid']));
+					$this->assertTrue($result, sprintf('User %s should be member of group %s', $user['uid'], $group['gid']));
 				} else {
-					$this->assertFalse($result, sprintf("User %s should not be member of group %s", $user['uid'], $group['gid']));
+					$this->assertFalse($result, sprintf('User %s should not be member of group %s', $user['uid'], $group['gid']));
 				}
 			}
 		}
diff --git a/tests/unit/Settings/SectionTest.php b/tests/unit/Settings/SectionTest.php
index 7ade5503..2aaaea20 100644
--- a/tests/unit/Settings/SectionTest.php
+++ b/tests/unit/Settings/SectionTest.php
@@ -14,7 +14,7 @@ class SectionTest extends \Test\TestCase {
 	private $section;
 	/** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */
 	private $l10n;
-	/** @var  IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */
+	/** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */
 	private $urlGenerator;
 
 	protected function setUp(): void {