Inspection of "Merge pull request #31737 from nextcloud/fix/oc_oa..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 87e079...eea05b )

by Joas

created 2022-03-31 11:43 UTC

Status

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -30,14 +30,14 @@
 block discarded – undo
  * Class Version14000Date20180712153140
  */
 class Version14000Date20180712153140 extends SimpleMigrationStep {
-	public function changeSchema(\OCP\Migration\IOutput $output, \Closure $schemaClosure, array $options) {
+    public function changeSchema(\OCP\Migration\IOutput $output, \Closure $schemaClosure, array $options) {
 
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->getTable('share');
-		$table->addColumn('note', 'text', ['notnull' => false]);
+        $table = $schema->getTable('share');
+        $table->addColumn('note', 'text', ['notnull' => false]);
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

Please login to merge, or discard this patch.

core/Controller/NavigationController.php 1 patch

Indentation +82 added lines, -82 removed lines patch added patch discarded remove patch

@@ -31,92 +31,92 @@
 block discarded – undo
 
 class NavigationController extends OCSController {
 
-	/** @var INavigationManager */
-	private $navigationManager;
+    /** @var INavigationManager */
+    private $navigationManager;
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	public function __construct(string $appName, IRequest $request, INavigationManager $navigationManager, IURLGenerator $urlGenerator) {
-		parent::__construct($appName, $request);
-		$this->navigationManager = $navigationManager;
-		$this->urlGenerator = $urlGenerator;
-	}
+    public function __construct(string $appName, IRequest $request, INavigationManager $navigationManager, IURLGenerator $urlGenerator) {
+        parent::__construct($appName, $request);
+        $this->navigationManager = $navigationManager;
+        $this->urlGenerator = $urlGenerator;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 *
-	 * @param bool $absolute
-	 * @return DataResponse
-	 */
-	public function getAppsNavigation(bool $absolute = false): DataResponse {
-		$navigation = $this->navigationManager->getAll();
-		if ($absolute) {
-			$navigation = $this->rewriteToAbsoluteUrls($navigation);
-		}
-		$navigation = array_values($navigation);
-		$etag = $this->generateETag($navigation);
-		if ($this->request->getHeader('If-None-Match') === $etag) {
-			return new DataResponse([], Http::STATUS_NOT_MODIFIED);
-		}
-		$response = new DataResponse($navigation);
-		$response->setETag($etag);
-		return $response;
-	}
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     *
+     * @param bool $absolute
+     * @return DataResponse
+     */
+    public function getAppsNavigation(bool $absolute = false): DataResponse {
+        $navigation = $this->navigationManager->getAll();
+        if ($absolute) {
+            $navigation = $this->rewriteToAbsoluteUrls($navigation);
+        }
+        $navigation = array_values($navigation);
+        $etag = $this->generateETag($navigation);
+        if ($this->request->getHeader('If-None-Match') === $etag) {
+            return new DataResponse([], Http::STATUS_NOT_MODIFIED);
+        }
+        $response = new DataResponse($navigation);
+        $response->setETag($etag);
+        return $response;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 *
-	 * @param bool $absolute
-	 * @return DataResponse
-	 */
-	public function getSettingsNavigation(bool $absolute = false): DataResponse {
-		$navigation = $this->navigationManager->getAll('settings');
-		if ($absolute) {
-			$navigation = $this->rewriteToAbsoluteUrls($navigation);
-		}
-		$navigation = array_values($navigation);
-		$etag = $this->generateETag($navigation);
-		if ($this->request->getHeader('If-None-Match') === $etag) {
-			return new DataResponse([], Http::STATUS_NOT_MODIFIED);
-		}
-		$response = new DataResponse($navigation);
-		$response->setETag($etag);
-		return $response;
-	}
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     *
+     * @param bool $absolute
+     * @return DataResponse
+     */
+    public function getSettingsNavigation(bool $absolute = false): DataResponse {
+        $navigation = $this->navigationManager->getAll('settings');
+        if ($absolute) {
+            $navigation = $this->rewriteToAbsoluteUrls($navigation);
+        }
+        $navigation = array_values($navigation);
+        $etag = $this->generateETag($navigation);
+        if ($this->request->getHeader('If-None-Match') === $etag) {
+            return new DataResponse([], Http::STATUS_NOT_MODIFIED);
+        }
+        $response = new DataResponse($navigation);
+        $response->setETag($etag);
+        return $response;
+    }
 
-	/**
-	 * Generate an ETag for a list of navigation entries
-	 *
-	 * @param array $navigation
-	 * @return string
-	 */
-	private function generateETag(array $navigation): string {
-		foreach ($navigation as &$nav) {
-			if ($nav['id'] === 'logout') {
-				$nav['href'] = 'logout';
-			}
-		}
-		return md5(json_encode($navigation));
-	}
+    /**
+     * Generate an ETag for a list of navigation entries
+     *
+     * @param array $navigation
+     * @return string
+     */
+    private function generateETag(array $navigation): string {
+        foreach ($navigation as &$nav) {
+            if ($nav['id'] === 'logout') {
+                $nav['href'] = 'logout';
+            }
+        }
+        return md5(json_encode($navigation));
+    }
 
-	/**
-	 * Rewrite href attribute of navigation entries to an absolute URL
-	 *
-	 * @param array $navigation
-	 * @return array
-	 */
-	private function rewriteToAbsoluteUrls(array $navigation): array {
-		foreach ($navigation as &$entry) {
-			if (0 !== strpos($entry['href'], $this->urlGenerator->getBaseUrl())) {
-				$entry['href'] = $this->urlGenerator->getAbsoluteURL($entry['href']);
-			}
-			if (0 !== strpos($entry['icon'], $this->urlGenerator->getBaseUrl())) {
-				$entry['icon'] = $this->urlGenerator->getAbsoluteURL($entry['icon']);
-			}
-		}
-		return $navigation;
-	}
+    /**
+     * Rewrite href attribute of navigation entries to an absolute URL
+     *
+     * @param array $navigation
+     * @return array
+     */
+    private function rewriteToAbsoluteUrls(array $navigation): array {
+        foreach ($navigation as &$entry) {
+            if (0 !== strpos($entry['href'], $this->urlGenerator->getBaseUrl())) {
+                $entry['href'] = $this->urlGenerator->getAbsoluteURL($entry['href']);
+            }
+            if (0 !== strpos($entry['icon'], $this->urlGenerator->getBaseUrl())) {
+                $entry['icon'] = $this->urlGenerator->getAbsoluteURL($entry['icon']);
+            }
+        }
+        return $navigation;
+    }
 }

Please login to merge, or discard this patch.

apps/lookup_server_connector/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/systemtags/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/sharebymail/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/federation/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_sharing/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_versions/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/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.

		@@ -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	}

		@@ -30,14 +30,14 @@
		block discarded – undo
30	30	* Class Version14000Date20180712153140
31	31	*/
32	32	class Version14000Date20180712153140 extends SimpleMigrationStep {
33		- public function changeSchema(\OCP\Migration\IOutput $output, \Closure $schemaClosure, array $options) {
	33	+ public function changeSchema(\OCP\Migration\IOutput $output, \Closure $schemaClosure, array $options) {
34	34
35		- /** @var ISchemaWrapper $schema */
36		- $schema = $schemaClosure();
	35	+ /** @var ISchemaWrapper $schema */
	36	+ $schema = $schemaClosure();
37	37
38		- $table = $schema->getTable('share');
39		- $table->addColumn('note', 'text', ['notnull' => false]);
	38	+ $table = $schema->getTable('share');
	39	+ $table->addColumn('note', 'text', ['notnull' => false]);
40	40
41		- return $schema;
42		- }
	41	+ return $schema;
	42	+ }
43	43	}

		@@ -31,92 +31,92 @@
		block discarded – undo
31	31
32	32	class NavigationController extends OCSController {
33	33
34		- /** @var INavigationManager */
35		- private $navigationManager;
	34	+ /** @var INavigationManager */
	35	+ private $navigationManager;
36	36
37		- /** @var IURLGenerator */
38		- private $urlGenerator;
	37	+ /** @var IURLGenerator */
	38	+ private $urlGenerator;
39	39
40		- public function __construct(string $appName, IRequest $request, INavigationManager $navigationManager, IURLGenerator $urlGenerator) {
41		- parent::__construct($appName, $request);
42		- $this->navigationManager = $navigationManager;
43		- $this->urlGenerator = $urlGenerator;
44		- }
	40	+ public function __construct(string $appName, IRequest $request, INavigationManager $navigationManager, IURLGenerator $urlGenerator) {
	41	+ parent::__construct($appName, $request);
	42	+ $this->navigationManager = $navigationManager;
	43	+ $this->urlGenerator = $urlGenerator;
	44	+ }
45	45
46		- /**
47		- * @NoAdminRequired
48		- * @NoCSRFRequired
49		- *
50		- * @param bool $absolute
51		- * @return DataResponse
52		- */
53		- public function getAppsNavigation(bool $absolute = false): DataResponse {
54		- $navigation = $this->navigationManager->getAll();
55		- if ($absolute) {
56		- $navigation = $this->rewriteToAbsoluteUrls($navigation);
57		- }
58		- $navigation = array_values($navigation);
59		- $etag = $this->generateETag($navigation);
60		- if ($this->request->getHeader('If-None-Match') === $etag) {
61		- return new DataResponse([], Http::STATUS_NOT_MODIFIED);
62		- }
63		- $response = new DataResponse($navigation);
64		- $response->setETag($etag);
65		- return $response;
66		- }
	46	+ /**
	47	+ * @NoAdminRequired
	48	+ * @NoCSRFRequired
	49	+ *
	50	+ * @param bool $absolute
	51	+ * @return DataResponse
	52	+ */
	53	+ public function getAppsNavigation(bool $absolute = false): DataResponse {
	54	+ $navigation = $this->navigationManager->getAll();
	55	+ if ($absolute) {
	56	+ $navigation = $this->rewriteToAbsoluteUrls($navigation);
	57	+ }
	58	+ $navigation = array_values($navigation);
	59	+ $etag = $this->generateETag($navigation);
	60	+ if ($this->request->getHeader('If-None-Match') === $etag) {
	61	+ return new DataResponse([], Http::STATUS_NOT_MODIFIED);
	62	+ }
	63	+ $response = new DataResponse($navigation);
	64	+ $response->setETag($etag);
	65	+ return $response;
	66	+ }
67	67
68		- /**
69		- * @NoAdminRequired
70		- * @NoCSRFRequired
71		- *
72		- * @param bool $absolute
73		- * @return DataResponse
74		- */
75		- public function getSettingsNavigation(bool $absolute = false): DataResponse {
76		- $navigation = $this->navigationManager->getAll('settings');
77		- if ($absolute) {
78		- $navigation = $this->rewriteToAbsoluteUrls($navigation);
79		- }
80		- $navigation = array_values($navigation);
81		- $etag = $this->generateETag($navigation);
82		- if ($this->request->getHeader('If-None-Match') === $etag) {
83		- return new DataResponse([], Http::STATUS_NOT_MODIFIED);
84		- }
85		- $response = new DataResponse($navigation);
86		- $response->setETag($etag);
87		- return $response;
88		- }
	68	+ /**
	69	+ * @NoAdminRequired
	70	+ * @NoCSRFRequired
	71	+ *
	72	+ * @param bool $absolute
	73	+ * @return DataResponse
	74	+ */
	75	+ public function getSettingsNavigation(bool $absolute = false): DataResponse {
	76	+ $navigation = $this->navigationManager->getAll('settings');
	77	+ if ($absolute) {
	78	+ $navigation = $this->rewriteToAbsoluteUrls($navigation);
	79	+ }
	80	+ $navigation = array_values($navigation);
	81	+ $etag = $this->generateETag($navigation);
	82	+ if ($this->request->getHeader('If-None-Match') === $etag) {
	83	+ return new DataResponse([], Http::STATUS_NOT_MODIFIED);
	84	+ }
	85	+ $response = new DataResponse($navigation);
	86	+ $response->setETag($etag);
	87	+ return $response;
	88	+ }
89	89
90		- /**
91		- * Generate an ETag for a list of navigation entries
92		- *
93		- * @param array $navigation
94		- * @return string
95		- */
96		- private function generateETag(array $navigation): string {
97		- foreach ($navigation as &$nav) {
98		- if ($nav['id'] === 'logout') {
99		- $nav['href'] = 'logout';
100		- }
101		- }
102		- return md5(json_encode($navigation));
103		- }
	90	+ /**
	91	+ * Generate an ETag for a list of navigation entries
	92	+ *
	93	+ * @param array $navigation
	94	+ * @return string
	95	+ */
	96	+ private function generateETag(array $navigation): string {
	97	+ foreach ($navigation as &$nav) {
	98	+ if ($nav['id'] === 'logout') {
	99	+ $nav['href'] = 'logout';
	100	+ }
	101	+ }
	102	+ return md5(json_encode($navigation));
	103	+ }
104	104
105		- /**
106		- * Rewrite href attribute of navigation entries to an absolute URL
107		- *
108		- * @param array $navigation
109		- * @return array
110		- */
111		- private function rewriteToAbsoluteUrls(array $navigation): array {
112		- foreach ($navigation as &$entry) {
113		- if (0 !== strpos($entry['href'], $this->urlGenerator->getBaseUrl())) {
114		- $entry['href'] = $this->urlGenerator->getAbsoluteURL($entry['href']);
115		- }
116		- if (0 !== strpos($entry['icon'], $this->urlGenerator->getBaseUrl())) {
117		- $entry['icon'] = $this->urlGenerator->getAbsoluteURL($entry['icon']);
118		- }
119		- }
120		- return $navigation;
121		- }
	105	+ /**
	106	+ * Rewrite href attribute of navigation entries to an absolute URL
	107	+ *
	108	+ * @param array $navigation
	109	+ * @return array
	110	+ */
	111	+ private function rewriteToAbsoluteUrls(array $navigation): array {
	112	+ foreach ($navigation as &$entry) {
	113	+ if (0 !== strpos($entry['href'], $this->urlGenerator->getBaseUrl())) {
	114	+ $entry['href'] = $this->urlGenerator->getAbsoluteURL($entry['href']);
	115	+ }
	116	+ if (0 !== strpos($entry['icon'], $this->urlGenerator->getBaseUrl())) {
	117	+ $entry['icon'] = $this->urlGenerator->getAbsoluteURL($entry['icon']);
	118	+ }
	119	+ }
	120	+ return $navigation;
	121	+ }
122	122	}

nextcloud / server

Push — master ( 87e079...eea05b )

Status

Category

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

Indentation +82 added lines, -82 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 +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