nextcloud / cms_pico

lib/Controller/PicoController.php

Indentation -2 removed lines

@@ -81,7 +81,6 @@ 
 	 *
 	 * @PublicPage
 	 * @NoCSRFRequired
-
 	 * @return Response
 	 */
 	public function getRoot($site) {
@@ -92,7 +91,6 @@ 
 	/**
 	 * @param string $site
 	 * @param $page
-
 	 * @PublicPage
 	 * @NoCSRFRequired
 	 *

Doc Comments +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
 
 	/**
 	 * @param string $site
-	 * @param $page
+	 * @param string $page
 
 	 * @PublicPage
 	 * @NoCSRFRequired

lib/Pico.php

Doc Comments +3 added lines

@@ -54,6 +54,9 @@
 	}
 
 
+	/**
+	 * @param string $requestUrl
+	 */
 	public function setRequestUrl($requestUrl) {
 		$this->requestUrl = $requestUrl;
 	}

Spacing +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
 	protected function getTwigVariables() {
 		$twigVariables = parent::getTwigVariables();
 		$twigVariables['theme_url'] =
-			\OC_App::getAppWebPath(Application::APP_NAME) . '/Pico/themes/' . $this->getConfig('theme');
+			\OC_App::getAppWebPath(Application::APP_NAME).'/Pico/themes/'.$this->getConfig('theme');
 
 		return $twigVariables;
 	}

lib/Service/PicoService.php

Doc Comments +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
 
 	/**
 	 * @param Website $website
-	 * @param $asset
+	 * @param string $asset
 	 *
 	 * @return string
 	 * @throws AssetDoesNotExistException

Spacing +4 added lines, -4 removed lines

@@ -123,11 +123,11 @@ 
 		$website->pathCantContainSpecificFolders($asset);
 
 		try {
-			$website->viewerMustHaveAccess(self::DIR_ASSETS . $asset);
+			$website->viewerMustHaveAccess(self::DIR_ASSETS.$asset);
 			$userFolder = $this->rootFolder->getUserFolder($website->getUserId());
 
 			/** @var File $file */
-			$file = $userFolder->get($website->getPath() . self::DIR_ASSETS . $asset);
+			$file = $userFolder->get($website->getPath().self::DIR_ASSETS.$asset);
 			$content = $file->getContent();
 
 			return $content;
@@ -186,11 +186,11 @@ 
 
 		$this->themesService->hasToBeAValidTheme($website->getTheme());
 
-		$appBaseUrl = \OC::$WEBROOT . '/index.php/apps/' . Application::APP_NAME;
+		$appBaseUrl = \OC::$WEBROOT.'/index.php/apps/'.Application::APP_NAME;
 		$pico->setConfig(
 			[
 				'site_title'     => $website->getName(),
-				'base_url'       => $appBaseUrl . '/pico/' . $website->getSite(),
+				'base_url'       => $appBaseUrl.'/pico/'.$website->getSite(),
 				'theme'          => $website->getTheme(),
 				'content_dir'    => 'content/',
 				'content_ext'    => '.md',

lib/Service/ThemesService.php

Doc Comments +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 	/**
 	 * Check if a theme exist.
 	 *
-	 * @param $theme
+	 * @param string $theme
 	 *
 	 * @throws ThemeDoesNotExistException
 	 */

lib/Db/CoreRequestBuilder.php

Spacing +2 added lines, -2 removed lines

@@ -136,8 +136,8 @@
 	 */
 	private function limitToDBField(IQueryBuilder &$qb, $field, $value) {
 		$expr = $qb->expr();
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->defaultSelectAlias . '.' : '';
-		$qb->andWhere($expr->eq($pf . $field, $qb->createNamedParameter($value)));
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->defaultSelectAlias.'.' : '';
+		$qb->andWhere($expr->eq($pf.$field, $qb->createNamedParameter($value)));
 	}
 
 }

lib/Model/Website.php

Spacing +2 added lines, -2 removed lines

@@ -83,7 +83,7 @@ 
 			return;
 		}
 
-		$this->ownerView = new View($this->getUserId() . '/files/');
+		$this->ownerView = new View($this->getUserId().'/files/');
 	}
 
 
@@ -140,7 +140,7 @@ 
 
 		try {
 			$ownerFile = $this->rootFolder->getUserFolder($this->getUserId())
-										  ->get($this->getPath() . $local);
+										  ->get($this->getPath().$local);
 
 			return $ownerFile->getId();
 		} catch (NotFoundException $e) {

lib/Model/TemplateFile.php

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
 		$this->filename = $filename;
 
 		// TODO: get the content from File
-		$this->content = file_get_contents($base . $filename);
+		$this->content = file_get_contents($base.$filename);
 	}
 
 
@@ -81,7 +81,7 @@ 
 		$ak = array_keys($data);
 		$temp = $this->getContent();
 		foreach ($ak as $k) {
-			$temp = str_replace('%%' . $k . '%%', $data[$k], $temp);
+			$temp = str_replace('%%'.$k.'%%', $data[$k], $temp);
 		}
 
 		$this->setContent($temp);

lib/Service/FileService.php

Spacing +12 added lines, -12 removed lines

@@ -36,7 +36,7 @@ 
 class FileService {
 
 
-	const INSTALL_DIR = __DIR__ . '/../../Pico/';
+	const INSTALL_DIR = __DIR__.'/../../Pico/';
 
 	/** @var IRootFolder */
 	private $rootFolder;
@@ -96,19 +96,19 @@ 
 		$dir = MiscService::endSlash($dir);
 
 		$files = [];
-		foreach (new DirectoryIterator($base . $dir) as $file) {
+		foreach (new DirectoryIterator($base.$dir) as $file) {
 
 			if (substr($file->getFilename(), 0, 1) === '.') {
 				continue;
 			}
 
 			if ($file->isDir()) {
-				$files[] = $dir . $file->getFilename() . '/';
-				$files = array_merge($files, $this->getSourceFiles($base, $dir . $file->getFilename()));
+				$files[] = $dir.$file->getFilename().'/';
+				$files = array_merge($files, $this->getSourceFiles($base, $dir.$file->getFilename()));
 				continue;
 			}
 
-			$files[] = $dir . $file->getFilename();
+			$files[] = $dir.$file->getFilename();
 		}
 
 		return $files;
@@ -129,19 +129,19 @@ 
 		$dir = MiscService::endSlash($dir);
 
 		$files = [];
-		foreach (new DirectoryIterator($base . $dir) as $file) {
+		foreach (new DirectoryIterator($base.$dir) as $file) {
 
 			if (substr($file->getFilename(), 0, 1) === '.') {
 				continue;
 			}
 
 			if ($file->isDir()) {
-				$files[] = $dir . $file->getFilename() . '/';
-				$files = array_merge($files, $this->getSourceFiles($base, $dir . $file->getFilename()));
+				$files[] = $dir.$file->getFilename().'/';
+				$files = array_merge($files, $this->getSourceFiles($base, $dir.$file->getFilename()));
 				continue;
 			}
 
-			$files[] = $dir . $file->getFilename();
+			$files[] = $dir.$file->getFilename();
 		}
 
 		return $files;
@@ -187,13 +187,13 @@ 
 	private function createAppDataFolder(Folder $appNode, $dir) {
 		$appFolder = $appNode->newFolder($dir);
 
-		$files = $this->getSourceFiles(self::INSTALL_DIR . $dir);
+		$files = $this->getSourceFiles(self::INSTALL_DIR.$dir);
 		foreach ($files as $file) {
 			if (substr($file, -1) === '/') {
 				$appFolder->newFolder($file);
 			} else {
 				$newFile = $appFolder->newFile($file);
-				$newFile->putContent(file_get_contents(self::INSTALL_DIR . $dir . '/' . $file));
+				$newFile->putContent(file_get_contents(self::INSTALL_DIR.$dir.'/'.$file));
 			}
 		}
 	}
@@ -208,7 +208,7 @@ 
 		if ($this->appDataFolder === null) {
 
 			$instanceId = $this->configService->getSystemValue('instanceid', null);
-			$name = 'appdata_' . $instanceId;
+			$name = 'appdata_'.$instanceId;
 
 			/** @var Folder $globalAppDataFolder */
 			try {

lib/Service/TemplatesService.php

Spacing +3 added lines, -3 removed lines

@@ -164,13 +164,13 @@ 
 	 */
 	private function generateFile(TemplateFile $file, Website $website) {
 		try {
-			$this->initFolder(pathinfo($website->getPath() . $file->getFilename(), PATHINFO_DIRNAME));
+			$this->initFolder(pathinfo($website->getPath().$file->getFilename(), PATHINFO_DIRNAME));
 
 			if (substr($file->getFilename(), -5) === 'empty') {
 				return;
 			}
 
-			$new = $this->websiteFolder->newFile($website->getPath() . $file->getFilename());
+			$new = $this->websiteFolder->newFile($website->getPath().$file->getFilename());
 			$new->putContent($file->getContent());
 		} catch (Exception $e) {
 			throw new WriteAccessException(
@@ -198,7 +198,7 @@ 
 	private function generateData(Website $website) {
 		return [
 			'site_title' => $website->getName(),
-			'base_url'   => \OC::$WEBROOT . $website->getSite()
+			'base_url'   => \OC::$WEBROOT.$website->getSite()
 		];
 	}