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

Completed

Push — master ( 699049...e2795b )

by Morris

created 2018-06-13 21:14 UTC

Status

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

@@ -38,139 +38,139 @@
 block discarded – undo
 use OCP\IRequest;
 
 class IconController extends Controller {
-	/** @var ThemingDefaults */
-	private $themingDefaults;
-	/** @var IconBuilder */
-	private $iconBuilder;
-	/** @var ImageManager */
-	private $imageManager;
-	/** @var FileAccessHelper */
-	private $fileAccessHelper;
+    /** @var ThemingDefaults */
+    private $themingDefaults;
+    /** @var IconBuilder */
+    private $iconBuilder;
+    /** @var ImageManager */
+    private $imageManager;
+    /** @var FileAccessHelper */
+    private $fileAccessHelper;
 
-	/**
-	 * IconController constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param ThemingDefaults $themingDefaults
-	 * @param IconBuilder $iconBuilder
-	 * @param ImageManager $imageManager
-	 * @param FileAccessHelper $fileAccessHelper
-	 */
-	public function __construct(
-		$appName,
-		IRequest $request,
-		ThemingDefaults $themingDefaults,
-		IconBuilder $iconBuilder,
-		ImageManager $imageManager,
-		FileAccessHelper $fileAccessHelper
-	) {
-		parent::__construct($appName, $request);
+    /**
+     * IconController constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param ThemingDefaults $themingDefaults
+     * @param IconBuilder $iconBuilder
+     * @param ImageManager $imageManager
+     * @param FileAccessHelper $fileAccessHelper
+     */
+    public function __construct(
+        $appName,
+        IRequest $request,
+        ThemingDefaults $themingDefaults,
+        IconBuilder $iconBuilder,
+        ImageManager $imageManager,
+        FileAccessHelper $fileAccessHelper
+    ) {
+        parent::__construct($appName, $request);
 
-		$this->themingDefaults = $themingDefaults;
-		$this->iconBuilder = $iconBuilder;
-		$this->imageManager = $imageManager;
-		$this->fileAccessHelper = $fileAccessHelper;
-	}
+        $this->themingDefaults = $themingDefaults;
+        $this->iconBuilder = $iconBuilder;
+        $this->imageManager = $imageManager;
+        $this->fileAccessHelper = $fileAccessHelper;
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @param $app string app name
-	 * @param $image string image file name (svg required)
-	 * @return FileDisplayResponse|NotFoundResponse
-	 * @throws \Exception
-	 */
-	public function getThemedIcon(string $app, string $image): Response {
-		try {
-			$iconFile = $this->imageManager->getCachedImage('icon-' . $app . '-' . str_replace('/', '_',$image));
-		} catch (NotFoundException $exception) {
-			$icon = $this->iconBuilder->colorSvg($app, $image);
-			if ($icon === false || $icon === '') {
-				return new NotFoundResponse();
-			}
-			$iconFile = $this->imageManager->setCachedImage('icon-' . $app . '-' . str_replace('/', '_',$image), $icon);
-		}
-		if ($iconFile !== false) {
-			$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/svg+xml']);
-			$response->cacheFor(86400);
-			return $response;
-		}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @param $app string app name
+     * @param $image string image file name (svg required)
+     * @return FileDisplayResponse|NotFoundResponse
+     * @throws \Exception
+     */
+    public function getThemedIcon(string $app, string $image): Response {
+        try {
+            $iconFile = $this->imageManager->getCachedImage('icon-' . $app . '-' . str_replace('/', '_',$image));
+        } catch (NotFoundException $exception) {
+            $icon = $this->iconBuilder->colorSvg($app, $image);
+            if ($icon === false || $icon === '') {
+                return new NotFoundResponse();
+            }
+            $iconFile = $this->imageManager->setCachedImage('icon-' . $app . '-' . str_replace('/', '_',$image), $icon);
+        }
+        if ($iconFile !== false) {
+            $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/svg+xml']);
+            $response->cacheFor(86400);
+            return $response;
+        }
 
-		return new NotFoundResponse();
-	}
+        return new NotFoundResponse();
+    }
 
-	/**
-	 * Return a 32x32 favicon as png
-	 *
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @param $app string app name
-	 * @return FileDisplayResponse|DataDisplayResponse
-	 * @throws \Exception
-	 */
-	public function getFavicon(string $app = 'core'): Response {
-		$response = null;
-		$iconFile = null;
-		try {
-			$iconFile = $this->imageManager->getImage('favicon');
-			$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
-		} catch (NotFoundException $e) {
-		}
-		if ($iconFile === null && $this->themingDefaults->shouldReplaceIcons()) {
-			try {
-				$iconFile = $this->imageManager->getCachedImage('favIcon-' . $app);
-			} catch (NotFoundException $exception) {
-				$icon = $this->iconBuilder->getFavicon($app);
-				$iconFile = $this->imageManager->setCachedImage('favIcon-' . $app, $icon);
-			}
-			if ($iconFile !== false) {
-				$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
-			}
-		}
-		if($response === null) {
-			$fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon.png';
-			$response = new DataDisplayResponse($this->fileAccessHelper->file_get_contents($fallbackLogo), Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
-		}
-		$response->cacheFor(86400);
-		return $response;
-	}
+    /**
+     * Return a 32x32 favicon as png
+     *
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @param $app string app name
+     * @return FileDisplayResponse|DataDisplayResponse
+     * @throws \Exception
+     */
+    public function getFavicon(string $app = 'core'): Response {
+        $response = null;
+        $iconFile = null;
+        try {
+            $iconFile = $this->imageManager->getImage('favicon');
+            $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
+        } catch (NotFoundException $e) {
+        }
+        if ($iconFile === null && $this->themingDefaults->shouldReplaceIcons()) {
+            try {
+                $iconFile = $this->imageManager->getCachedImage('favIcon-' . $app);
+            } catch (NotFoundException $exception) {
+                $icon = $this->iconBuilder->getFavicon($app);
+                $iconFile = $this->imageManager->setCachedImage('favIcon-' . $app, $icon);
+            }
+            if ($iconFile !== false) {
+                $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
+            }
+        }
+        if($response === null) {
+            $fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon.png';
+            $response = new DataDisplayResponse($this->fileAccessHelper->file_get_contents($fallbackLogo), Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
+        }
+        $response->cacheFor(86400);
+        return $response;
+    }
 
-	/**
-	 * Return a 512x512 icon for touch devices
-	 *
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @param $app string app name
-	 * @return FileDisplayResponse|NotFoundResponse
-	 * @throws \Exception
-	 */
-	public function getTouchIcon(string $app = 'core'): Response {
-		$response = null;
-		try {
-			$iconFile = $this->imageManager->getImage('favicon');
-			$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
-		} catch (NotFoundException $e) {
-		}
-		if ($this->themingDefaults->shouldReplaceIcons()) {
-			try {
-				$iconFile = $this->imageManager->getCachedImage('touchIcon-' . $app);
-			} catch (NotFoundException $exception) {
-				$icon = $this->iconBuilder->getTouchIcon($app);
-				$iconFile = $this->imageManager->setCachedImage('touchIcon-' . $app, $icon);
-			}
-			if ($iconFile !== false) {
-				$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/png']);
-			}
-		}
-		if($response === null) {
-			$fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon-touch.png';
-			$response = new DataDisplayResponse($this->fileAccessHelper->file_get_contents($fallbackLogo), Http::STATUS_OK, ['Content-Type' => 'image/png']);
-		}
-		$response->cacheFor(86400);
-		return $response;
-	}
+    /**
+     * Return a 512x512 icon for touch devices
+     *
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @param $app string app name
+     * @return FileDisplayResponse|NotFoundResponse
+     * @throws \Exception
+     */
+    public function getTouchIcon(string $app = 'core'): Response {
+        $response = null;
+        try {
+            $iconFile = $this->imageManager->getImage('favicon');
+            $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
+        } catch (NotFoundException $e) {
+        }
+        if ($this->themingDefaults->shouldReplaceIcons()) {
+            try {
+                $iconFile = $this->imageManager->getCachedImage('touchIcon-' . $app);
+            } catch (NotFoundException $exception) {
+                $icon = $this->iconBuilder->getTouchIcon($app);
+                $iconFile = $this->imageManager->setCachedImage('touchIcon-' . $app, $icon);
+            }
+            if ($iconFile !== false) {
+                $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/png']);
+            }
+        }
+        if($response === null) {
+            $fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon-touch.png';
+            $response = new DataDisplayResponse($this->fileAccessHelper->file_get_contents($fallbackLogo), Http::STATUS_OK, ['Content-Type' => 'image/png']);
+        }
+        $response->cacheFor(86400);
+        return $response;
+    }
 }

Please login to merge, or discard this patch.

		@@ -38,139 +38,139 @@
		block discarded – undo
38	38	use OCP\IRequest;
39	39
40	40	class IconController extends Controller {
41		- /** @var ThemingDefaults */
42		- private $themingDefaults;
43		- /** @var IconBuilder */
44		- private $iconBuilder;
45		- /** @var ImageManager */
46		- private $imageManager;
47		- /** @var FileAccessHelper */
48		- private $fileAccessHelper;
	41	+ /** @var ThemingDefaults */
	42	+ private $themingDefaults;
	43	+ /** @var IconBuilder */
	44	+ private $iconBuilder;
	45	+ /** @var ImageManager */
	46	+ private $imageManager;
	47	+ /** @var FileAccessHelper */
	48	+ private $fileAccessHelper;
49	49
50		- /**
51		- * IconController constructor.
52		- *
53		- * @param string $appName
54		- * @param IRequest $request
55		- * @param ThemingDefaults $themingDefaults
56		- * @param IconBuilder $iconBuilder
57		- * @param ImageManager $imageManager
58		- * @param FileAccessHelper $fileAccessHelper
59		- */
60		- public function __construct(
61		- $appName,
62		- IRequest $request,
63		- ThemingDefaults $themingDefaults,
64		- IconBuilder $iconBuilder,
65		- ImageManager $imageManager,
66		- FileAccessHelper $fileAccessHelper
67		- ) {
68		- parent::__construct($appName, $request);
	50	+ /**
	51	+ * IconController constructor.
	52	+ *
	53	+ * @param string $appName
	54	+ * @param IRequest $request
	55	+ * @param ThemingDefaults $themingDefaults
	56	+ * @param IconBuilder $iconBuilder
	57	+ * @param ImageManager $imageManager
	58	+ * @param FileAccessHelper $fileAccessHelper
	59	+ */
	60	+ public function __construct(
	61	+ $appName,
	62	+ IRequest $request,
	63	+ ThemingDefaults $themingDefaults,
	64	+ IconBuilder $iconBuilder,
	65	+ ImageManager $imageManager,
	66	+ FileAccessHelper $fileAccessHelper
	67	+ ) {
	68	+ parent::__construct($appName, $request);
69	69
70		- $this->themingDefaults = $themingDefaults;
71		- $this->iconBuilder = $iconBuilder;
72		- $this->imageManager = $imageManager;
73		- $this->fileAccessHelper = $fileAccessHelper;
74		- }
	70	+ $this->themingDefaults = $themingDefaults;
	71	+ $this->iconBuilder = $iconBuilder;
	72	+ $this->imageManager = $imageManager;
	73	+ $this->fileAccessHelper = $fileAccessHelper;
	74	+ }
75	75
76		- /**
77		- * @PublicPage
78		- * @NoCSRFRequired
79		- *
80		- * @param $app string app name
81		- * @param $image string image file name (svg required)
82		- * @return FileDisplayResponse\|NotFoundResponse
83		- * @throws \Exception
84		- */
85		- public function getThemedIcon(string $app, string $image): Response {
86		- try {
87		- $iconFile = $this->imageManager->getCachedImage('icon-' . $app . '-' . str_replace('/', '_',$image));
88		- } catch (NotFoundException $exception) {
89		- $icon = $this->iconBuilder->colorSvg($app, $image);
90		- if ($icon === false \|\| $icon === '') {
91		- return new NotFoundResponse();
92		- }
93		- $iconFile = $this->imageManager->setCachedImage('icon-' . $app . '-' . str_replace('/', '_',$image), $icon);
94		- }
95		- if ($iconFile !== false) {
96		- $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/svg+xml']);
97		- $response->cacheFor(86400);
98		- return $response;
99		- }
	76	+ /**
	77	+ * @PublicPage
	78	+ * @NoCSRFRequired
	79	+ *
	80	+ * @param $app string app name
	81	+ * @param $image string image file name (svg required)
	82	+ * @return FileDisplayResponse\|NotFoundResponse
	83	+ * @throws \Exception
	84	+ */
	85	+ public function getThemedIcon(string $app, string $image): Response {
	86	+ try {
	87	+ $iconFile = $this->imageManager->getCachedImage('icon-' . $app . '-' . str_replace('/', '_',$image));
	88	+ } catch (NotFoundException $exception) {
	89	+ $icon = $this->iconBuilder->colorSvg($app, $image);
	90	+ if ($icon === false \|\| $icon === '') {
	91	+ return new NotFoundResponse();
	92	+ }
	93	+ $iconFile = $this->imageManager->setCachedImage('icon-' . $app . '-' . str_replace('/', '_',$image), $icon);
	94	+ }
	95	+ if ($iconFile !== false) {
	96	+ $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/svg+xml']);
	97	+ $response->cacheFor(86400);
	98	+ return $response;
	99	+ }
100	100
101		- return new NotFoundResponse();
102		- }
	101	+ return new NotFoundResponse();
	102	+ }
103	103
104		- /**
105		- * Return a 32x32 favicon as png
106		- *
107		- * @PublicPage
108		- * @NoCSRFRequired
109		- *
110		- * @param $app string app name
111		- * @return FileDisplayResponse\|DataDisplayResponse
112		- * @throws \Exception
113		- */
114		- public function getFavicon(string $app = 'core'): Response {
115		- $response = null;
116		- $iconFile = null;
117		- try {
118		- $iconFile = $this->imageManager->getImage('favicon');
119		- $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
120		- } catch (NotFoundException $e) {
121		- }
122		- if ($iconFile === null && $this->themingDefaults->shouldReplaceIcons()) {
123		- try {
124		- $iconFile = $this->imageManager->getCachedImage('favIcon-' . $app);
125		- } catch (NotFoundException $exception) {
126		- $icon = $this->iconBuilder->getFavicon($app);
127		- $iconFile = $this->imageManager->setCachedImage('favIcon-' . $app, $icon);
128		- }
129		- if ($iconFile !== false) {
130		- $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
131		- }
132		- }
133		- if($response === null) {
134		- $fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon.png';
135		- $response = new DataDisplayResponse($this->fileAccessHelper->file_get_contents($fallbackLogo), Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
136		- }
137		- $response->cacheFor(86400);
138		- return $response;
139		- }
	104	+ /**
	105	+ * Return a 32x32 favicon as png
	106	+ *
	107	+ * @PublicPage
	108	+ * @NoCSRFRequired
	109	+ *
	110	+ * @param $app string app name
	111	+ * @return FileDisplayResponse\|DataDisplayResponse
	112	+ * @throws \Exception
	113	+ */
	114	+ public function getFavicon(string $app = 'core'): Response {
	115	+ $response = null;
	116	+ $iconFile = null;
	117	+ try {
	118	+ $iconFile = $this->imageManager->getImage('favicon');
	119	+ $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
	120	+ } catch (NotFoundException $e) {
	121	+ }
	122	+ if ($iconFile === null && $this->themingDefaults->shouldReplaceIcons()) {
	123	+ try {
	124	+ $iconFile = $this->imageManager->getCachedImage('favIcon-' . $app);
	125	+ } catch (NotFoundException $exception) {
	126	+ $icon = $this->iconBuilder->getFavicon($app);
	127	+ $iconFile = $this->imageManager->setCachedImage('favIcon-' . $app, $icon);
	128	+ }
	129	+ if ($iconFile !== false) {
	130	+ $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
	131	+ }
	132	+ }
	133	+ if($response === null) {
	134	+ $fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon.png';
	135	+ $response = new DataDisplayResponse($this->fileAccessHelper->file_get_contents($fallbackLogo), Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
	136	+ }
	137	+ $response->cacheFor(86400);
	138	+ return $response;
	139	+ }
140	140
141		- /**
142		- * Return a 512x512 icon for touch devices
143		- *
144		- * @PublicPage
145		- * @NoCSRFRequired
146		- *
147		- * @param $app string app name
148		- * @return FileDisplayResponse\|NotFoundResponse
149		- * @throws \Exception
150		- */
151		- public function getTouchIcon(string $app = 'core'): Response {
152		- $response = null;
153		- try {
154		- $iconFile = $this->imageManager->getImage('favicon');
155		- $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
156		- } catch (NotFoundException $e) {
157		- }
158		- if ($this->themingDefaults->shouldReplaceIcons()) {
159		- try {
160		- $iconFile = $this->imageManager->getCachedImage('touchIcon-' . $app);
161		- } catch (NotFoundException $exception) {
162		- $icon = $this->iconBuilder->getTouchIcon($app);
163		- $iconFile = $this->imageManager->setCachedImage('touchIcon-' . $app, $icon);
164		- }
165		- if ($iconFile !== false) {
166		- $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/png']);
167		- }
168		- }
169		- if($response === null) {
170		- $fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon-touch.png';
171		- $response = new DataDisplayResponse($this->fileAccessHelper->file_get_contents($fallbackLogo), Http::STATUS_OK, ['Content-Type' => 'image/png']);
172		- }
173		- $response->cacheFor(86400);
174		- return $response;
175		- }
	141	+ /**
	142	+ * Return a 512x512 icon for touch devices
	143	+ *
	144	+ * @PublicPage
	145	+ * @NoCSRFRequired
	146	+ *
	147	+ * @param $app string app name
	148	+ * @return FileDisplayResponse\|NotFoundResponse
	149	+ * @throws \Exception
	150	+ */
	151	+ public function getTouchIcon(string $app = 'core'): Response {
	152	+ $response = null;
	153	+ try {
	154	+ $iconFile = $this->imageManager->getImage('favicon');
	155	+ $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
	156	+ } catch (NotFoundException $e) {
	157	+ }
	158	+ if ($this->themingDefaults->shouldReplaceIcons()) {
	159	+ try {
	160	+ $iconFile = $this->imageManager->getCachedImage('touchIcon-' . $app);
	161	+ } catch (NotFoundException $exception) {
	162	+ $icon = $this->iconBuilder->getTouchIcon($app);
	163	+ $iconFile = $this->imageManager->setCachedImage('touchIcon-' . $app, $icon);
	164	+ }
	165	+ if ($iconFile !== false) {
	166	+ $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/png']);
	167	+ }
	168	+ }
	169	+ if($response === null) {
	170	+ $fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon-touch.png';
	171	+ $response = new DataDisplayResponse($this->fileAccessHelper->file_get_contents($fallbackLogo), Http::STATUS_OK, ['Content-Type' => 'image/png']);
	172	+ }
	173	+ $response->cacheFor(86400);
	174	+ return $response;
	175	+ }
176	176	}

nextcloud / server

Push — master ( 699049...e2795b )

Status

Category

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