Inspection of "Merge pull request #18674 from nextcloud/enh/no_gl..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 32f79c...03cdff )

by Roeland

created 2020-01-06 07:06 UTC

Status

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -370,18 +370,18 @@  discard block
 block discarded – undo
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR).$ext;
 
         $first = $class[0];
         if (isset($this->prefixLengthsPsr4[$first])) {
             $subPath = $class;
             while (false !== $lastPos = strrpos($subPath, '\\')) {
                 $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath . '\\';
+                $search = $subPath.'\\';
                 if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+                    $pathEnd = DIRECTORY_SEPARATOR.substr($logicalPathPsr4, $lastPos + 1);
                     foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
+                        if (file_exists($file = $dir.$pathEnd)) {
                             return $file;
                         }
                     }
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
 
         // PSR-4 fallback dirs
         foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr4)) {
                 return $file;
             }
         }
@@ -403,14 +403,14 @@  discard block
 block discarded – undo
                 . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
         } else {
             // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR).$ext;
         }
 
         if (isset($this->prefixesPsr0[$first])) {
             foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                        if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                             return $file;
                         }
                     }
@@ -420,7 +420,7 @@  discard block
 block discarded – undo
 
         // PSR-0 fallback dirs
         foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                 return $file;
             }
         }

Please login to merge, or discard this patch.

apps/comments/composer/composer/ClassLoader.php 1 patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -370,18 +370,18 @@  discard block
 block discarded – undo
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR).$ext;
 
         $first = $class[0];
         if (isset($this->prefixLengthsPsr4[$first])) {
             $subPath = $class;
             while (false !== $lastPos = strrpos($subPath, '\\')) {
                 $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath . '\\';
+                $search = $subPath.'\\';
                 if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+                    $pathEnd = DIRECTORY_SEPARATOR.substr($logicalPathPsr4, $lastPos + 1);
                     foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
+                        if (file_exists($file = $dir.$pathEnd)) {
                             return $file;
                         }
                     }
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
 
         // PSR-4 fallback dirs
         foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr4)) {
                 return $file;
             }
         }
@@ -403,14 +403,14 @@  discard block
 block discarded – undo
                 . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
         } else {
             // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR).$ext;
         }
 
         if (isset($this->prefixesPsr0[$first])) {
             foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                        if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                             return $file;
                         }
                     }
@@ -420,7 +420,7 @@  discard block
 block discarded – undo
 
         // PSR-0 fallback dirs
         foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                 return $file;
             }
         }

Please login to merge, or discard this patch.

apps/provisioning_api/composer/composer/ClassLoader.php 1 patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -370,18 +370,18 @@  discard block
 block discarded – undo
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR).$ext;
 
         $first = $class[0];
         if (isset($this->prefixLengthsPsr4[$first])) {
             $subPath = $class;
             while (false !== $lastPos = strrpos($subPath, '\\')) {
                 $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath . '\\';
+                $search = $subPath.'\\';
                 if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+                    $pathEnd = DIRECTORY_SEPARATOR.substr($logicalPathPsr4, $lastPos + 1);
                     foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
+                        if (file_exists($file = $dir.$pathEnd)) {
                             return $file;
                         }
                     }
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
 
         // PSR-4 fallback dirs
         foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr4)) {
                 return $file;
             }
         }
@@ -403,14 +403,14 @@  discard block
 block discarded – undo
                 . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
         } else {
             // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR).$ext;
         }
 
         if (isset($this->prefixesPsr0[$first])) {
             foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                        if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                             return $file;
                         }
                     }
@@ -420,7 +420,7 @@  discard block
 block discarded – undo
 
         // PSR-0 fallback dirs
         foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                 return $file;
             }
         }

Please login to merge, or discard this patch.

apps/federatedfilesharing/composer/composer/ClassLoader.php 1 patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -370,18 +370,18 @@  discard block
 block discarded – undo
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR).$ext;
 
         $first = $class[0];
         if (isset($this->prefixLengthsPsr4[$first])) {
             $subPath = $class;
             while (false !== $lastPos = strrpos($subPath, '\\')) {
                 $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath . '\\';
+                $search = $subPath.'\\';
                 if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+                    $pathEnd = DIRECTORY_SEPARATOR.substr($logicalPathPsr4, $lastPos + 1);
                     foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
+                        if (file_exists($file = $dir.$pathEnd)) {
                             return $file;
                         }
                     }
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
 
         // PSR-4 fallback dirs
         foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr4)) {
                 return $file;
             }
         }
@@ -403,14 +403,14 @@  discard block
 block discarded – undo
                 . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
         } else {
             // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR).$ext;
         }
 
         if (isset($this->prefixesPsr0[$first])) {
             foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                        if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                             return $file;
                         }
                     }
@@ -420,7 +420,7 @@  discard block
 block discarded – undo
 
         // PSR-0 fallback dirs
         foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                 return $file;
             }
         }

Please login to merge, or discard this patch.

apps/files/composer/composer/ClassLoader.php 1 patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -370,18 +370,18 @@  discard block
 block discarded – undo
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR).$ext;
 
         $first = $class[0];
         if (isset($this->prefixLengthsPsr4[$first])) {
             $subPath = $class;
             while (false !== $lastPos = strrpos($subPath, '\\')) {
                 $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath . '\\';
+                $search = $subPath.'\\';
                 if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+                    $pathEnd = DIRECTORY_SEPARATOR.substr($logicalPathPsr4, $lastPos + 1);
                     foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
+                        if (file_exists($file = $dir.$pathEnd)) {
                             return $file;
                         }
                     }
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
 
         // PSR-4 fallback dirs
         foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr4)) {
                 return $file;
             }
         }
@@ -403,14 +403,14 @@  discard block
 block discarded – undo
                 . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
         } else {
             // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR).$ext;
         }
 
         if (isset($this->prefixesPsr0[$first])) {
             foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                        if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                             return $file;
                         }
                     }
@@ -420,7 +420,7 @@  discard block
 block discarded – undo
 
         // PSR-0 fallback dirs
         foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                 return $file;
             }
         }

Please login to merge, or discard this patch.

apps/updatenotification/lib/Settings/Admin.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -116,22 +116,22 @@
 block discarded – undo
 
 	protected function filterChanges(array $changes): array {
 		$filtered = [];
-		if(isset($changes['changelogURL'])) {
+		if (isset($changes['changelogURL'])) {
 			$filtered['changelogURL'] = $changes['changelogURL'];
 		}
-		if(!isset($changes['whatsNew'])) {
+		if (!isset($changes['whatsNew'])) {
 			return $filtered;
 		}
 
 		$iterator = $this->l10nFactory->getLanguageIterator();
 		do {
 			$lang = $iterator->current();
-			if(isset($changes['whatsNew'][$lang])) {
+			if (isset($changes['whatsNew'][$lang])) {
 				$filtered['whatsNew'] = $changes['whatsNew'][$lang];
 				return $filtered;
 			}
 			$iterator->next();
-		} while($lang !== 'en' && $iterator->valid());
+		} while ($lang !== 'en' && $iterator->valid());
 
 		return $filtered;
 	}

Please login to merge, or discard this patch.

apps/encryption/composer/composer/autoload_classmap.php 1 patch

Spacing +26 added lines, -26 removed lines patch added patch discarded remove patch

@@ -6,30 +6,30 @@
 block discarded – undo
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\Encryption\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
-    'OCA\\Encryption\\Command\\DisableMasterKey' => $baseDir . '/../lib/Command/DisableMasterKey.php',
-    'OCA\\Encryption\\Command\\EnableMasterKey' => $baseDir . '/../lib/Command/EnableMasterKey.php',
-    'OCA\\Encryption\\Command\\RecoverUser' => $baseDir . '/../lib/Command/RecoverUser.php',
-    'OCA\\Encryption\\Controller\\RecoveryController' => $baseDir . '/../lib/Controller/RecoveryController.php',
-    'OCA\\Encryption\\Controller\\SettingsController' => $baseDir . '/../lib/Controller/SettingsController.php',
-    'OCA\\Encryption\\Controller\\StatusController' => $baseDir . '/../lib/Controller/StatusController.php',
-    'OCA\\Encryption\\Crypto\\Crypt' => $baseDir . '/../lib/Crypto/Crypt.php',
-    'OCA\\Encryption\\Crypto\\DecryptAll' => $baseDir . '/../lib/Crypto/DecryptAll.php',
-    'OCA\\Encryption\\Crypto\\EncryptAll' => $baseDir . '/../lib/Crypto/EncryptAll.php',
-    'OCA\\Encryption\\Crypto\\Encryption' => $baseDir . '/../lib/Crypto/Encryption.php',
-    'OCA\\Encryption\\Exceptions\\MultiKeyDecryptException' => $baseDir . '/../lib/Exceptions/MultiKeyDecryptException.php',
-    'OCA\\Encryption\\Exceptions\\MultiKeyEncryptException' => $baseDir . '/../lib/Exceptions/MultiKeyEncryptException.php',
-    'OCA\\Encryption\\Exceptions\\PrivateKeyMissingException' => $baseDir . '/../lib/Exceptions/PrivateKeyMissingException.php',
-    'OCA\\Encryption\\Exceptions\\PublicKeyMissingException' => $baseDir . '/../lib/Exceptions/PublicKeyMissingException.php',
-    'OCA\\Encryption\\HookManager' => $baseDir . '/../lib/HookManager.php',
-    'OCA\\Encryption\\Hooks\\Contracts\\IHook' => $baseDir . '/../lib/Hooks/Contracts/IHook.php',
-    'OCA\\Encryption\\Hooks\\UserHooks' => $baseDir . '/../lib/Hooks/UserHooks.php',
-    'OCA\\Encryption\\KeyManager' => $baseDir . '/../lib/KeyManager.php',
-    'OCA\\Encryption\\Migration\\SetMasterKeyStatus' => $baseDir . '/../lib/Migration/SetMasterKeyStatus.php',
-    'OCA\\Encryption\\Recovery' => $baseDir . '/../lib/Recovery.php',
-    'OCA\\Encryption\\Session' => $baseDir . '/../lib/Session.php',
-    'OCA\\Encryption\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',
-    'OCA\\Encryption\\Settings\\Personal' => $baseDir . '/../lib/Settings/Personal.php',
-    'OCA\\Encryption\\Users\\Setup' => $baseDir . '/../lib/Users/Setup.php',
-    'OCA\\Encryption\\Util' => $baseDir . '/../lib/Util.php',
+    'OCA\\Encryption\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
+    'OCA\\Encryption\\Command\\DisableMasterKey' => $baseDir.'/../lib/Command/DisableMasterKey.php',
+    'OCA\\Encryption\\Command\\EnableMasterKey' => $baseDir.'/../lib/Command/EnableMasterKey.php',
+    'OCA\\Encryption\\Command\\RecoverUser' => $baseDir.'/../lib/Command/RecoverUser.php',
+    'OCA\\Encryption\\Controller\\RecoveryController' => $baseDir.'/../lib/Controller/RecoveryController.php',
+    'OCA\\Encryption\\Controller\\SettingsController' => $baseDir.'/../lib/Controller/SettingsController.php',
+    'OCA\\Encryption\\Controller\\StatusController' => $baseDir.'/../lib/Controller/StatusController.php',
+    'OCA\\Encryption\\Crypto\\Crypt' => $baseDir.'/../lib/Crypto/Crypt.php',
+    'OCA\\Encryption\\Crypto\\DecryptAll' => $baseDir.'/../lib/Crypto/DecryptAll.php',
+    'OCA\\Encryption\\Crypto\\EncryptAll' => $baseDir.'/../lib/Crypto/EncryptAll.php',
+    'OCA\\Encryption\\Crypto\\Encryption' => $baseDir.'/../lib/Crypto/Encryption.php',
+    'OCA\\Encryption\\Exceptions\\MultiKeyDecryptException' => $baseDir.'/../lib/Exceptions/MultiKeyDecryptException.php',
+    'OCA\\Encryption\\Exceptions\\MultiKeyEncryptException' => $baseDir.'/../lib/Exceptions/MultiKeyEncryptException.php',
+    'OCA\\Encryption\\Exceptions\\PrivateKeyMissingException' => $baseDir.'/../lib/Exceptions/PrivateKeyMissingException.php',
+    'OCA\\Encryption\\Exceptions\\PublicKeyMissingException' => $baseDir.'/../lib/Exceptions/PublicKeyMissingException.php',
+    'OCA\\Encryption\\HookManager' => $baseDir.'/../lib/HookManager.php',
+    'OCA\\Encryption\\Hooks\\Contracts\\IHook' => $baseDir.'/../lib/Hooks/Contracts/IHook.php',
+    'OCA\\Encryption\\Hooks\\UserHooks' => $baseDir.'/../lib/Hooks/UserHooks.php',
+    'OCA\\Encryption\\KeyManager' => $baseDir.'/../lib/KeyManager.php',
+    'OCA\\Encryption\\Migration\\SetMasterKeyStatus' => $baseDir.'/../lib/Migration/SetMasterKeyStatus.php',
+    'OCA\\Encryption\\Recovery' => $baseDir.'/../lib/Recovery.php',
+    'OCA\\Encryption\\Session' => $baseDir.'/../lib/Session.php',
+    'OCA\\Encryption\\Settings\\Admin' => $baseDir.'/../lib/Settings/Admin.php',
+    'OCA\\Encryption\\Settings\\Personal' => $baseDir.'/../lib/Settings/Personal.php',
+    'OCA\\Encryption\\Users\\Setup' => $baseDir.'/../lib/Users/Setup.php',
+    'OCA\\Encryption\\Util' => $baseDir.'/../lib/Util.php',
 );

Please login to merge, or discard this patch.

apps/encryption/composer/composer/autoload_static.php 1 patch

Spacing +33 added lines, -33 removed lines patch added patch discarded remove patch

@@ -6,52 +6,52 @@
 block discarded – undo
 
 class ComposerStaticInitEncryption
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' => 
-        array (
+        array(
             'OCA\\Encryption\\' => 15,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\Encryption\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'OCA\\Encryption\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\Encryption\\Command\\DisableMasterKey' => __DIR__ . '/..' . '/../lib/Command/DisableMasterKey.php',
-        'OCA\\Encryption\\Command\\EnableMasterKey' => __DIR__ . '/..' . '/../lib/Command/EnableMasterKey.php',
-        'OCA\\Encryption\\Command\\RecoverUser' => __DIR__ . '/..' . '/../lib/Command/RecoverUser.php',
-        'OCA\\Encryption\\Controller\\RecoveryController' => __DIR__ . '/..' . '/../lib/Controller/RecoveryController.php',
-        'OCA\\Encryption\\Controller\\SettingsController' => __DIR__ . '/..' . '/../lib/Controller/SettingsController.php',
-        'OCA\\Encryption\\Controller\\StatusController' => __DIR__ . '/..' . '/../lib/Controller/StatusController.php',
-        'OCA\\Encryption\\Crypto\\Crypt' => __DIR__ . '/..' . '/../lib/Crypto/Crypt.php',
-        'OCA\\Encryption\\Crypto\\DecryptAll' => __DIR__ . '/..' . '/../lib/Crypto/DecryptAll.php',
-        'OCA\\Encryption\\Crypto\\EncryptAll' => __DIR__ . '/..' . '/../lib/Crypto/EncryptAll.php',
-        'OCA\\Encryption\\Crypto\\Encryption' => __DIR__ . '/..' . '/../lib/Crypto/Encryption.php',
-        'OCA\\Encryption\\Exceptions\\MultiKeyDecryptException' => __DIR__ . '/..' . '/../lib/Exceptions/MultiKeyDecryptException.php',
-        'OCA\\Encryption\\Exceptions\\MultiKeyEncryptException' => __DIR__ . '/..' . '/../lib/Exceptions/MultiKeyEncryptException.php',
-        'OCA\\Encryption\\Exceptions\\PrivateKeyMissingException' => __DIR__ . '/..' . '/../lib/Exceptions/PrivateKeyMissingException.php',
-        'OCA\\Encryption\\Exceptions\\PublicKeyMissingException' => __DIR__ . '/..' . '/../lib/Exceptions/PublicKeyMissingException.php',
-        'OCA\\Encryption\\HookManager' => __DIR__ . '/..' . '/../lib/HookManager.php',
-        'OCA\\Encryption\\Hooks\\Contracts\\IHook' => __DIR__ . '/..' . '/../lib/Hooks/Contracts/IHook.php',
-        'OCA\\Encryption\\Hooks\\UserHooks' => __DIR__ . '/..' . '/../lib/Hooks/UserHooks.php',
-        'OCA\\Encryption\\KeyManager' => __DIR__ . '/..' . '/../lib/KeyManager.php',
-        'OCA\\Encryption\\Migration\\SetMasterKeyStatus' => __DIR__ . '/..' . '/../lib/Migration/SetMasterKeyStatus.php',
-        'OCA\\Encryption\\Recovery' => __DIR__ . '/..' . '/../lib/Recovery.php',
-        'OCA\\Encryption\\Session' => __DIR__ . '/..' . '/../lib/Session.php',
-        'OCA\\Encryption\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php',
-        'OCA\\Encryption\\Settings\\Personal' => __DIR__ . '/..' . '/../lib/Settings/Personal.php',
-        'OCA\\Encryption\\Users\\Setup' => __DIR__ . '/..' . '/../lib/Users/Setup.php',
-        'OCA\\Encryption\\Util' => __DIR__ . '/..' . '/../lib/Util.php',
+    public static $classMap = array(
+        'OCA\\Encryption\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\Encryption\\Command\\DisableMasterKey' => __DIR__.'/..'.'/../lib/Command/DisableMasterKey.php',
+        'OCA\\Encryption\\Command\\EnableMasterKey' => __DIR__.'/..'.'/../lib/Command/EnableMasterKey.php',
+        'OCA\\Encryption\\Command\\RecoverUser' => __DIR__.'/..'.'/../lib/Command/RecoverUser.php',
+        'OCA\\Encryption\\Controller\\RecoveryController' => __DIR__.'/..'.'/../lib/Controller/RecoveryController.php',
+        'OCA\\Encryption\\Controller\\SettingsController' => __DIR__.'/..'.'/../lib/Controller/SettingsController.php',
+        'OCA\\Encryption\\Controller\\StatusController' => __DIR__.'/..'.'/../lib/Controller/StatusController.php',
+        'OCA\\Encryption\\Crypto\\Crypt' => __DIR__.'/..'.'/../lib/Crypto/Crypt.php',
+        'OCA\\Encryption\\Crypto\\DecryptAll' => __DIR__.'/..'.'/../lib/Crypto/DecryptAll.php',
+        'OCA\\Encryption\\Crypto\\EncryptAll' => __DIR__.'/..'.'/../lib/Crypto/EncryptAll.php',
+        'OCA\\Encryption\\Crypto\\Encryption' => __DIR__.'/..'.'/../lib/Crypto/Encryption.php',
+        'OCA\\Encryption\\Exceptions\\MultiKeyDecryptException' => __DIR__.'/..'.'/../lib/Exceptions/MultiKeyDecryptException.php',
+        'OCA\\Encryption\\Exceptions\\MultiKeyEncryptException' => __DIR__.'/..'.'/../lib/Exceptions/MultiKeyEncryptException.php',
+        'OCA\\Encryption\\Exceptions\\PrivateKeyMissingException' => __DIR__.'/..'.'/../lib/Exceptions/PrivateKeyMissingException.php',
+        'OCA\\Encryption\\Exceptions\\PublicKeyMissingException' => __DIR__.'/..'.'/../lib/Exceptions/PublicKeyMissingException.php',
+        'OCA\\Encryption\\HookManager' => __DIR__.'/..'.'/../lib/HookManager.php',
+        'OCA\\Encryption\\Hooks\\Contracts\\IHook' => __DIR__.'/..'.'/../lib/Hooks/Contracts/IHook.php',
+        'OCA\\Encryption\\Hooks\\UserHooks' => __DIR__.'/..'.'/../lib/Hooks/UserHooks.php',
+        'OCA\\Encryption\\KeyManager' => __DIR__.'/..'.'/../lib/KeyManager.php',
+        'OCA\\Encryption\\Migration\\SetMasterKeyStatus' => __DIR__.'/..'.'/../lib/Migration/SetMasterKeyStatus.php',
+        'OCA\\Encryption\\Recovery' => __DIR__.'/..'.'/../lib/Recovery.php',
+        'OCA\\Encryption\\Session' => __DIR__.'/..'.'/../lib/Session.php',
+        'OCA\\Encryption\\Settings\\Admin' => __DIR__.'/..'.'/../lib/Settings/Admin.php',
+        'OCA\\Encryption\\Settings\\Personal' => __DIR__.'/..'.'/../lib/Settings/Personal.php',
+        'OCA\\Encryption\\Users\\Setup' => __DIR__.'/..'.'/../lib/Users/Setup.php',
+        'OCA\\Encryption\\Util' => __DIR__.'/..'.'/../lib/Util.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitEncryption::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitEncryption::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitEncryption::$classMap;

Please login to merge, or discard this patch.

apps/encryption/lib/Command/RecoverUser.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -81,7 +81,7 @@  discard block
 block discarded – undo
 
 		$isMasterKeyEnabled = $this->util->isMasterKeyEnabled();
 
-		if($isMasterKeyEnabled) {
+		if ($isMasterKeyEnabled) {
 			$output->writeln('You use the master key, no individual user recovery needed.');
 			return;
 		}
@@ -89,13 +89,13 @@  discard block
 block discarded – undo
 		$uid = $input->getArgument('user');
 		$userExists = $this->userManager->userExists($uid);
 		if ($userExists === false) {
-			$output->writeln('User "' . $uid . '" unknown.');
+			$output->writeln('User "'.$uid.'" unknown.');
 			return;
 		}
 
 		$recoveryKeyEnabled = $this->util->isRecoveryEnabledForUser($uid);
-		if($recoveryKeyEnabled === false) {
-			$output->writeln('Recovery key is not enabled for: ' . $uid);
+		if ($recoveryKeyEnabled === false) {
+			$output->writeln('Recovery key is not enabled for: '.$uid);
 			return;
 		}
 

Please login to merge, or discard this patch.

		@@ -370,18 +370,18 @@ discard block
		block discarded – undo
370	370	private function findFileWithExtension($class, $ext)
371	371	{
372	372	// PSR-4 lookup
373		- $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
	373	+ $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR).$ext;
374	374
375	375	$first = $class[0];
376	376	if (isset($this->prefixLengthsPsr4[$first])) {
377	377	$subPath = $class;
378	378	while (false !== $lastPos = strrpos($subPath, '\\')) {
379	379	$subPath = substr($subPath, 0, $lastPos);
380		- $search = $subPath . '\\';
	380	+ $search = $subPath.'\\';
381	381	if (isset($this->prefixDirsPsr4[$search])) {
382		- $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
	382	+ $pathEnd = DIRECTORY_SEPARATOR.substr($logicalPathPsr4, $lastPos + 1);
383	383	foreach ($this->prefixDirsPsr4[$search] as $dir) {
384		- if (file_exists($file = $dir . $pathEnd)) {
	384	+ if (file_exists($file = $dir.$pathEnd)) {
385	385	return $file;
386	386	}
387	387	}
		@@ -391,7 +391,7 @@ discard block
		block discarded – undo
391	391
392	392	// PSR-4 fallback dirs
393	393	foreach ($this->fallbackDirsPsr4 as $dir) {
394		- if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
	394	+ if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr4)) {
395	395	return $file;
396	396	}
397	397	}
		@@ -403,14 +403,14 @@ discard block
		block discarded – undo
403	403	. strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
404	404	} else {
405	405	// PEAR-like class name
406		- $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
	406	+ $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR).$ext;
407	407	}
408	408
409	409	if (isset($this->prefixesPsr0[$first])) {
410	410	foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
411	411	if (0 === strpos($class, $prefix)) {
412	412	foreach ($dirs as $dir) {
413		- if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
	413	+ if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
414	414	return $file;
415	415	}
416	416	}
		@@ -420,7 +420,7 @@ discard block
		block discarded – undo
420	420
421	421	// PSR-0 fallback dirs
422	422	foreach ($this->fallbackDirsPsr0 as $dir) {
423		- if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
	423	+ if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
424	424	return $file;
425	425	}
426	426	}

		@@ -370,18 +370,18 @@ discard block
		block discarded – undo
370	370	private function findFileWithExtension($class, $ext)
371	371	{
372	372	// PSR-4 lookup
373		- $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
	373	+ $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR).$ext;
374	374
375	375	$first = $class[0];
376	376	if (isset($this->prefixLengthsPsr4[$first])) {
377	377	$subPath = $class;
378	378	while (false !== $lastPos = strrpos($subPath, '\\')) {
379	379	$subPath = substr($subPath, 0, $lastPos);
380		- $search = $subPath . '\\';
	380	+ $search = $subPath.'\\';
381	381	if (isset($this->prefixDirsPsr4[$search])) {
382		- $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
	382	+ $pathEnd = DIRECTORY_SEPARATOR.substr($logicalPathPsr4, $lastPos + 1);
383	383	foreach ($this->prefixDirsPsr4[$search] as $dir) {
384		- if (file_exists($file = $dir . $pathEnd)) {
	384	+ if (file_exists($file = $dir.$pathEnd)) {
385	385	return $file;
386	386	}
387	387	}
		@@ -391,7 +391,7 @@ discard block
		block discarded – undo
391	391
392	392	// PSR-4 fallback dirs
393	393	foreach ($this->fallbackDirsPsr4 as $dir) {
394		- if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
	394	+ if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr4)) {
395	395	return $file;
396	396	}
397	397	}
		@@ -403,14 +403,14 @@ discard block
		block discarded – undo
403	403	. strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
404	404	} else {
405	405	// PEAR-like class name
406		- $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
	406	+ $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR).$ext;
407	407	}
408	408
409	409	if (isset($this->prefixesPsr0[$first])) {
410	410	foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
411	411	if (0 === strpos($class, $prefix)) {
412	412	foreach ($dirs as $dir) {
413		- if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
	413	+ if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
414	414	return $file;
415	415	}
416	416	}
		@@ -420,7 +420,7 @@ discard block
		block discarded – undo
420	420
421	421	// PSR-0 fallback dirs
422	422	foreach ($this->fallbackDirsPsr0 as $dir) {
423		- if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
	423	+ if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
424	424	return $file;
425	425	}
426	426	}

		@@ -370,18 +370,18 @@ discard block
		block discarded – undo
370	370	private function findFileWithExtension($class, $ext)
371	371	{
372	372	// PSR-4 lookup
373		- $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
	373	+ $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR).$ext;
374	374
375	375	$first = $class[0];
376	376	if (isset($this->prefixLengthsPsr4[$first])) {
377	377	$subPath = $class;
378	378	while (false !== $lastPos = strrpos($subPath, '\\')) {
379	379	$subPath = substr($subPath, 0, $lastPos);
380		- $search = $subPath . '\\';
	380	+ $search = $subPath.'\\';
381	381	if (isset($this->prefixDirsPsr4[$search])) {
382		- $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
	382	+ $pathEnd = DIRECTORY_SEPARATOR.substr($logicalPathPsr4, $lastPos + 1);
383	383	foreach ($this->prefixDirsPsr4[$search] as $dir) {
384		- if (file_exists($file = $dir . $pathEnd)) {
	384	+ if (file_exists($file = $dir.$pathEnd)) {
385	385	return $file;
386	386	}
387	387	}
		@@ -391,7 +391,7 @@ discard block
		block discarded – undo
391	391
392	392	// PSR-4 fallback dirs
393	393	foreach ($this->fallbackDirsPsr4 as $dir) {
394		- if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
	394	+ if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr4)) {
395	395	return $file;
396	396	}
397	397	}
		@@ -403,14 +403,14 @@ discard block
		block discarded – undo
403	403	. strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
404	404	} else {
405	405	// PEAR-like class name
406		- $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
	406	+ $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR).$ext;
407	407	}
408	408
409	409	if (isset($this->prefixesPsr0[$first])) {
410	410	foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
411	411	if (0 === strpos($class, $prefix)) {
412	412	foreach ($dirs as $dir) {
413		- if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
	413	+ if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
414	414	return $file;
415	415	}
416	416	}
		@@ -420,7 +420,7 @@ discard block
		block discarded – undo
420	420
421	421	// PSR-0 fallback dirs
422	422	foreach ($this->fallbackDirsPsr0 as $dir) {
423		- if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
	423	+ if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
424	424	return $file;
425	425	}
426	426	}

		@@ -370,18 +370,18 @@ discard block
		block discarded – undo
370	370	private function findFileWithExtension($class, $ext)
371	371	{
372	372	// PSR-4 lookup
373		- $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
	373	+ $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR).$ext;
374	374
375	375	$first = $class[0];
376	376	if (isset($this->prefixLengthsPsr4[$first])) {
377	377	$subPath = $class;
378	378	while (false !== $lastPos = strrpos($subPath, '\\')) {
379	379	$subPath = substr($subPath, 0, $lastPos);
380		- $search = $subPath . '\\';
	380	+ $search = $subPath.'\\';
381	381	if (isset($this->prefixDirsPsr4[$search])) {
382		- $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
	382	+ $pathEnd = DIRECTORY_SEPARATOR.substr($logicalPathPsr4, $lastPos + 1);
383	383	foreach ($this->prefixDirsPsr4[$search] as $dir) {
384		- if (file_exists($file = $dir . $pathEnd)) {
	384	+ if (file_exists($file = $dir.$pathEnd)) {
385	385	return $file;
386	386	}
387	387	}
		@@ -391,7 +391,7 @@ discard block
		block discarded – undo
391	391
392	392	// PSR-4 fallback dirs
393	393	foreach ($this->fallbackDirsPsr4 as $dir) {
394		- if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
	394	+ if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr4)) {
395	395	return $file;
396	396	}
397	397	}
		@@ -403,14 +403,14 @@ discard block
		block discarded – undo
403	403	. strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
404	404	} else {
405	405	// PEAR-like class name
406		- $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
	406	+ $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR).$ext;
407	407	}
408	408
409	409	if (isset($this->prefixesPsr0[$first])) {
410	410	foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
411	411	if (0 === strpos($class, $prefix)) {
412	412	foreach ($dirs as $dir) {
413		- if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
	413	+ if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
414	414	return $file;
415	415	}
416	416	}
		@@ -420,7 +420,7 @@ discard block
		block discarded – undo
420	420
421	421	// PSR-0 fallback dirs
422	422	foreach ($this->fallbackDirsPsr0 as $dir) {
423		- if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
	423	+ if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
424	424	return $file;
425	425	}
426	426	}

		@@ -370,18 +370,18 @@ discard block
		block discarded – undo
370	370	private function findFileWithExtension($class, $ext)
371	371	{
372	372	// PSR-4 lookup
373		- $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
	373	+ $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR).$ext;
374	374
375	375	$first = $class[0];
376	376	if (isset($this->prefixLengthsPsr4[$first])) {
377	377	$subPath = $class;
378	378	while (false !== $lastPos = strrpos($subPath, '\\')) {
379	379	$subPath = substr($subPath, 0, $lastPos);
380		- $search = $subPath . '\\';
	380	+ $search = $subPath.'\\';
381	381	if (isset($this->prefixDirsPsr4[$search])) {
382		- $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
	382	+ $pathEnd = DIRECTORY_SEPARATOR.substr($logicalPathPsr4, $lastPos + 1);
383	383	foreach ($this->prefixDirsPsr4[$search] as $dir) {
384		- if (file_exists($file = $dir . $pathEnd)) {
	384	+ if (file_exists($file = $dir.$pathEnd)) {
385	385	return $file;
386	386	}
387	387	}
		@@ -391,7 +391,7 @@ discard block
		block discarded – undo
391	391
392	392	// PSR-4 fallback dirs
393	393	foreach ($this->fallbackDirsPsr4 as $dir) {
394		- if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
	394	+ if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr4)) {
395	395	return $file;
396	396	}
397	397	}
		@@ -403,14 +403,14 @@ discard block
		block discarded – undo
403	403	. strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
404	404	} else {
405	405	// PEAR-like class name
406		- $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
	406	+ $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR).$ext;
407	407	}
408	408
409	409	if (isset($this->prefixesPsr0[$first])) {
410	410	foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
411	411	if (0 === strpos($class, $prefix)) {
412	412	foreach ($dirs as $dir) {
413		- if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
	413	+ if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
414	414	return $file;
415	415	}
416	416	}
		@@ -420,7 +420,7 @@ discard block
		block discarded – undo
420	420
421	421	// PSR-0 fallback dirs
422	422	foreach ($this->fallbackDirsPsr0 as $dir) {
423		- if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
	423	+ if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
424	424	return $file;
425	425	}
426	426	}

		@@ -116,22 +116,22 @@
		block discarded – undo
116	116
117	117	protected function filterChanges(array $changes): array {
118	118	$filtered = [];
119		- if(isset($changes['changelogURL'])) {
	119	+ if (isset($changes['changelogURL'])) {
120	120	$filtered['changelogURL'] = $changes['changelogURL'];
121	121	}
122		- if(!isset($changes['whatsNew'])) {
	122	+ if (!isset($changes['whatsNew'])) {
123	123	return $filtered;
124	124	}
125	125
126	126	$iterator = $this->l10nFactory->getLanguageIterator();
127	127	do {
128	128	$lang = $iterator->current();
129		- if(isset($changes['whatsNew'][$lang])) {
	129	+ if (isset($changes['whatsNew'][$lang])) {
130	130	$filtered['whatsNew'] = $changes['whatsNew'][$lang];
131	131	return $filtered;
132	132	}
133	133	$iterator->next();
134		- } while($lang !== 'en' && $iterator->valid());
	134	+ } while ($lang !== 'en' && $iterator->valid());
135	135
136	136	return $filtered;
137	137	}

		@@ -6,30 +6,30 @@
		block discarded – undo
6	6	$baseDir = $vendorDir;
7	7
8	8	return array(
9		- 'OCA\\Encryption\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
10		- 'OCA\\Encryption\\Command\\DisableMasterKey' => $baseDir . '/../lib/Command/DisableMasterKey.php',
11		- 'OCA\\Encryption\\Command\\EnableMasterKey' => $baseDir . '/../lib/Command/EnableMasterKey.php',
12		- 'OCA\\Encryption\\Command\\RecoverUser' => $baseDir . '/../lib/Command/RecoverUser.php',
13		- 'OCA\\Encryption\\Controller\\RecoveryController' => $baseDir . '/../lib/Controller/RecoveryController.php',
14		- 'OCA\\Encryption\\Controller\\SettingsController' => $baseDir . '/../lib/Controller/SettingsController.php',
15		- 'OCA\\Encryption\\Controller\\StatusController' => $baseDir . '/../lib/Controller/StatusController.php',
16		- 'OCA\\Encryption\\Crypto\\Crypt' => $baseDir . '/../lib/Crypto/Crypt.php',
17		- 'OCA\\Encryption\\Crypto\\DecryptAll' => $baseDir . '/../lib/Crypto/DecryptAll.php',
18		- 'OCA\\Encryption\\Crypto\\EncryptAll' => $baseDir . '/../lib/Crypto/EncryptAll.php',
19		- 'OCA\\Encryption\\Crypto\\Encryption' => $baseDir . '/../lib/Crypto/Encryption.php',
20		- 'OCA\\Encryption\\Exceptions\\MultiKeyDecryptException' => $baseDir . '/../lib/Exceptions/MultiKeyDecryptException.php',
21		- 'OCA\\Encryption\\Exceptions\\MultiKeyEncryptException' => $baseDir . '/../lib/Exceptions/MultiKeyEncryptException.php',
22		- 'OCA\\Encryption\\Exceptions\\PrivateKeyMissingException' => $baseDir . '/../lib/Exceptions/PrivateKeyMissingException.php',
23		- 'OCA\\Encryption\\Exceptions\\PublicKeyMissingException' => $baseDir . '/../lib/Exceptions/PublicKeyMissingException.php',
24		- 'OCA\\Encryption\\HookManager' => $baseDir . '/../lib/HookManager.php',
25		- 'OCA\\Encryption\\Hooks\\Contracts\\IHook' => $baseDir . '/../lib/Hooks/Contracts/IHook.php',
26		- 'OCA\\Encryption\\Hooks\\UserHooks' => $baseDir . '/../lib/Hooks/UserHooks.php',
27		- 'OCA\\Encryption\\KeyManager' => $baseDir . '/../lib/KeyManager.php',
28		- 'OCA\\Encryption\\Migration\\SetMasterKeyStatus' => $baseDir . '/../lib/Migration/SetMasterKeyStatus.php',
29		- 'OCA\\Encryption\\Recovery' => $baseDir . '/../lib/Recovery.php',
30		- 'OCA\\Encryption\\Session' => $baseDir . '/../lib/Session.php',
31		- 'OCA\\Encryption\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',
32		- 'OCA\\Encryption\\Settings\\Personal' => $baseDir . '/../lib/Settings/Personal.php',
33		- 'OCA\\Encryption\\Users\\Setup' => $baseDir . '/../lib/Users/Setup.php',
34		- 'OCA\\Encryption\\Util' => $baseDir . '/../lib/Util.php',
	9	+ 'OCA\\Encryption\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
	10	+ 'OCA\\Encryption\\Command\\DisableMasterKey' => $baseDir.'/../lib/Command/DisableMasterKey.php',
	11	+ 'OCA\\Encryption\\Command\\EnableMasterKey' => $baseDir.'/../lib/Command/EnableMasterKey.php',
	12	+ 'OCA\\Encryption\\Command\\RecoverUser' => $baseDir.'/../lib/Command/RecoverUser.php',
	13	+ 'OCA\\Encryption\\Controller\\RecoveryController' => $baseDir.'/../lib/Controller/RecoveryController.php',
	14	+ 'OCA\\Encryption\\Controller\\SettingsController' => $baseDir.'/../lib/Controller/SettingsController.php',
	15	+ 'OCA\\Encryption\\Controller\\StatusController' => $baseDir.'/../lib/Controller/StatusController.php',
	16	+ 'OCA\\Encryption\\Crypto\\Crypt' => $baseDir.'/../lib/Crypto/Crypt.php',
	17	+ 'OCA\\Encryption\\Crypto\\DecryptAll' => $baseDir.'/../lib/Crypto/DecryptAll.php',
	18	+ 'OCA\\Encryption\\Crypto\\EncryptAll' => $baseDir.'/../lib/Crypto/EncryptAll.php',
	19	+ 'OCA\\Encryption\\Crypto\\Encryption' => $baseDir.'/../lib/Crypto/Encryption.php',
	20	+ 'OCA\\Encryption\\Exceptions\\MultiKeyDecryptException' => $baseDir.'/../lib/Exceptions/MultiKeyDecryptException.php',
	21	+ 'OCA\\Encryption\\Exceptions\\MultiKeyEncryptException' => $baseDir.'/../lib/Exceptions/MultiKeyEncryptException.php',
	22	+ 'OCA\\Encryption\\Exceptions\\PrivateKeyMissingException' => $baseDir.'/../lib/Exceptions/PrivateKeyMissingException.php',
	23	+ 'OCA\\Encryption\\Exceptions\\PublicKeyMissingException' => $baseDir.'/../lib/Exceptions/PublicKeyMissingException.php',
	24	+ 'OCA\\Encryption\\HookManager' => $baseDir.'/../lib/HookManager.php',
	25	+ 'OCA\\Encryption\\Hooks\\Contracts\\IHook' => $baseDir.'/../lib/Hooks/Contracts/IHook.php',
	26	+ 'OCA\\Encryption\\Hooks\\UserHooks' => $baseDir.'/../lib/Hooks/UserHooks.php',
	27	+ 'OCA\\Encryption\\KeyManager' => $baseDir.'/../lib/KeyManager.php',
	28	+ 'OCA\\Encryption\\Migration\\SetMasterKeyStatus' => $baseDir.'/../lib/Migration/SetMasterKeyStatus.php',
	29	+ 'OCA\\Encryption\\Recovery' => $baseDir.'/../lib/Recovery.php',
	30	+ 'OCA\\Encryption\\Session' => $baseDir.'/../lib/Session.php',
	31	+ 'OCA\\Encryption\\Settings\\Admin' => $baseDir.'/../lib/Settings/Admin.php',
	32	+ 'OCA\\Encryption\\Settings\\Personal' => $baseDir.'/../lib/Settings/Personal.php',
	33	+ 'OCA\\Encryption\\Users\\Setup' => $baseDir.'/../lib/Users/Setup.php',
	34	+ 'OCA\\Encryption\\Util' => $baseDir.'/../lib/Util.php',
35	35	);

		@@ -6,52 +6,52 @@
		block discarded – undo
6	6
7	7	class ComposerStaticInitEncryption
8	8	{
9		- public static $prefixLengthsPsr4 = array (
	9	+ public static $prefixLengthsPsr4 = array(
10	10	'O' =>
11		- array (
	11	+ array(
12	12	'OCA\\Encryption\\' => 15,
13	13	),
14	14	);
15	15
16		- public static $prefixDirsPsr4 = array (
	16	+ public static $prefixDirsPsr4 = array(
17	17	'OCA\\Encryption\\' =>
18		- array (
19		- 0 => __DIR__ . '/..' . '/../lib',
	18	+ array(
	19	+ 0 => __DIR__.'/..'.'/../lib',
20	20	),
21	21	);
22	22
23		- public static $classMap = array (
24		- 'OCA\\Encryption\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
25		- 'OCA\\Encryption\\Command\\DisableMasterKey' => __DIR__ . '/..' . '/../lib/Command/DisableMasterKey.php',
26		- 'OCA\\Encryption\\Command\\EnableMasterKey' => __DIR__ . '/..' . '/../lib/Command/EnableMasterKey.php',
27		- 'OCA\\Encryption\\Command\\RecoverUser' => __DIR__ . '/..' . '/../lib/Command/RecoverUser.php',
28		- 'OCA\\Encryption\\Controller\\RecoveryController' => __DIR__ . '/..' . '/../lib/Controller/RecoveryController.php',
29		- 'OCA\\Encryption\\Controller\\SettingsController' => __DIR__ . '/..' . '/../lib/Controller/SettingsController.php',
30		- 'OCA\\Encryption\\Controller\\StatusController' => __DIR__ . '/..' . '/../lib/Controller/StatusController.php',
31		- 'OCA\\Encryption\\Crypto\\Crypt' => __DIR__ . '/..' . '/../lib/Crypto/Crypt.php',
32		- 'OCA\\Encryption\\Crypto\\DecryptAll' => __DIR__ . '/..' . '/../lib/Crypto/DecryptAll.php',
33		- 'OCA\\Encryption\\Crypto\\EncryptAll' => __DIR__ . '/..' . '/../lib/Crypto/EncryptAll.php',
34		- 'OCA\\Encryption\\Crypto\\Encryption' => __DIR__ . '/..' . '/../lib/Crypto/Encryption.php',
35		- 'OCA\\Encryption\\Exceptions\\MultiKeyDecryptException' => __DIR__ . '/..' . '/../lib/Exceptions/MultiKeyDecryptException.php',
36		- 'OCA\\Encryption\\Exceptions\\MultiKeyEncryptException' => __DIR__ . '/..' . '/../lib/Exceptions/MultiKeyEncryptException.php',
37		- 'OCA\\Encryption\\Exceptions\\PrivateKeyMissingException' => __DIR__ . '/..' . '/../lib/Exceptions/PrivateKeyMissingException.php',
38		- 'OCA\\Encryption\\Exceptions\\PublicKeyMissingException' => __DIR__ . '/..' . '/../lib/Exceptions/PublicKeyMissingException.php',
39		- 'OCA\\Encryption\\HookManager' => __DIR__ . '/..' . '/../lib/HookManager.php',
40		- 'OCA\\Encryption\\Hooks\\Contracts\\IHook' => __DIR__ . '/..' . '/../lib/Hooks/Contracts/IHook.php',
41		- 'OCA\\Encryption\\Hooks\\UserHooks' => __DIR__ . '/..' . '/../lib/Hooks/UserHooks.php',
42		- 'OCA\\Encryption\\KeyManager' => __DIR__ . '/..' . '/../lib/KeyManager.php',
43		- 'OCA\\Encryption\\Migration\\SetMasterKeyStatus' => __DIR__ . '/..' . '/../lib/Migration/SetMasterKeyStatus.php',
44		- 'OCA\\Encryption\\Recovery' => __DIR__ . '/..' . '/../lib/Recovery.php',
45		- 'OCA\\Encryption\\Session' => __DIR__ . '/..' . '/../lib/Session.php',
46		- 'OCA\\Encryption\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php',
47		- 'OCA\\Encryption\\Settings\\Personal' => __DIR__ . '/..' . '/../lib/Settings/Personal.php',
48		- 'OCA\\Encryption\\Users\\Setup' => __DIR__ . '/..' . '/../lib/Users/Setup.php',
49		- 'OCA\\Encryption\\Util' => __DIR__ . '/..' . '/../lib/Util.php',
	23	+ public static $classMap = array(
	24	+ 'OCA\\Encryption\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
	25	+ 'OCA\\Encryption\\Command\\DisableMasterKey' => __DIR__.'/..'.'/../lib/Command/DisableMasterKey.php',
	26	+ 'OCA\\Encryption\\Command\\EnableMasterKey' => __DIR__.'/..'.'/../lib/Command/EnableMasterKey.php',
	27	+ 'OCA\\Encryption\\Command\\RecoverUser' => __DIR__.'/..'.'/../lib/Command/RecoverUser.php',
	28	+ 'OCA\\Encryption\\Controller\\RecoveryController' => __DIR__.'/..'.'/../lib/Controller/RecoveryController.php',
	29	+ 'OCA\\Encryption\\Controller\\SettingsController' => __DIR__.'/..'.'/../lib/Controller/SettingsController.php',
	30	+ 'OCA\\Encryption\\Controller\\StatusController' => __DIR__.'/..'.'/../lib/Controller/StatusController.php',
	31	+ 'OCA\\Encryption\\Crypto\\Crypt' => __DIR__.'/..'.'/../lib/Crypto/Crypt.php',
	32	+ 'OCA\\Encryption\\Crypto\\DecryptAll' => __DIR__.'/..'.'/../lib/Crypto/DecryptAll.php',
	33	+ 'OCA\\Encryption\\Crypto\\EncryptAll' => __DIR__.'/..'.'/../lib/Crypto/EncryptAll.php',
	34	+ 'OCA\\Encryption\\Crypto\\Encryption' => __DIR__.'/..'.'/../lib/Crypto/Encryption.php',
	35	+ 'OCA\\Encryption\\Exceptions\\MultiKeyDecryptException' => __DIR__.'/..'.'/../lib/Exceptions/MultiKeyDecryptException.php',
	36	+ 'OCA\\Encryption\\Exceptions\\MultiKeyEncryptException' => __DIR__.'/..'.'/../lib/Exceptions/MultiKeyEncryptException.php',
	37	+ 'OCA\\Encryption\\Exceptions\\PrivateKeyMissingException' => __DIR__.'/..'.'/../lib/Exceptions/PrivateKeyMissingException.php',
	38	+ 'OCA\\Encryption\\Exceptions\\PublicKeyMissingException' => __DIR__.'/..'.'/../lib/Exceptions/PublicKeyMissingException.php',
	39	+ 'OCA\\Encryption\\HookManager' => __DIR__.'/..'.'/../lib/HookManager.php',
	40	+ 'OCA\\Encryption\\Hooks\\Contracts\\IHook' => __DIR__.'/..'.'/../lib/Hooks/Contracts/IHook.php',
	41	+ 'OCA\\Encryption\\Hooks\\UserHooks' => __DIR__.'/..'.'/../lib/Hooks/UserHooks.php',
	42	+ 'OCA\\Encryption\\KeyManager' => __DIR__.'/..'.'/../lib/KeyManager.php',
	43	+ 'OCA\\Encryption\\Migration\\SetMasterKeyStatus' => __DIR__.'/..'.'/../lib/Migration/SetMasterKeyStatus.php',
	44	+ 'OCA\\Encryption\\Recovery' => __DIR__.'/..'.'/../lib/Recovery.php',
	45	+ 'OCA\\Encryption\\Session' => __DIR__.'/..'.'/../lib/Session.php',
	46	+ 'OCA\\Encryption\\Settings\\Admin' => __DIR__.'/..'.'/../lib/Settings/Admin.php',
	47	+ 'OCA\\Encryption\\Settings\\Personal' => __DIR__.'/..'.'/../lib/Settings/Personal.php',
	48	+ 'OCA\\Encryption\\Users\\Setup' => __DIR__.'/..'.'/../lib/Users/Setup.php',
	49	+ 'OCA\\Encryption\\Util' => __DIR__.'/..'.'/../lib/Util.php',
50	50	);
51	51
52	52	public static function getInitializer(ClassLoader $loader)
53	53	{
54		- return \Closure::bind(function () use ($loader) {
	54	+ return \Closure::bind(function() use ($loader) {
55	55	$loader->prefixLengthsPsr4 = ComposerStaticInitEncryption::$prefixLengthsPsr4;
56	56	$loader->prefixDirsPsr4 = ComposerStaticInitEncryption::$prefixDirsPsr4;
57	57	$loader->classMap = ComposerStaticInitEncryption::$classMap;

		@@ -81,7 +81,7 @@ discard block
		block discarded – undo
81	81
82	82	$isMasterKeyEnabled = $this->util->isMasterKeyEnabled();
83	83
84		- if($isMasterKeyEnabled) {
	84	+ if ($isMasterKeyEnabled) {
85	85	$output->writeln('You use the master key, no individual user recovery needed.');
86	86	return;
87	87	}
		@@ -89,13 +89,13 @@ discard block
		block discarded – undo
89	89	$uid = $input->getArgument('user');
90	90	$userExists = $this->userManager->userExists($uid);
91	91	if ($userExists === false) {
92		- $output->writeln('User "' . $uid . '" unknown.');
	92	+ $output->writeln('User "'.$uid.'" unknown.');
93	93	return;
94	94	}
95	95
96	96	$recoveryKeyEnabled = $this->util->isRecoveryEnabledForUser($uid);
97		- if($recoveryKeyEnabled === false) {
98		- $output->writeln('Recovery key is not enabled for: ' . $uid);
	97	+ if ($recoveryKeyEnabled === false) {
	98	+ $output->writeln('Recovery key is not enabled for: '.$uid);
99	99	return;
100	100	}
101	101

nextcloud / server

Push — master ( 32f79c...03cdff )

Status

Category

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +26 added lines, -26 removed lines patch added patch discarded remove patch

Spacing +33 added lines, -33 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch