Inspection of "Minor refactor in repository to reduce cyclomatic..." - jenskooij/cloudcontrol - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — develop ( 111896...eb49e9 )

by Jens

created 2017-03-17 13:08 UTC

Status

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

@@ -56,7 +56,7 @@  discard block
 block discarded – undo
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_CONFIGURATION);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_USERNAME])) {
 			$cmsComponent->storage->getUsers()->addUser($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/users');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/users');
 			exit;
 		}
 	}
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
 	private function deleteRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->getUsers()->deleteUserBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/users');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/users');
 		exit;
 	}
 
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_USER, $cmsComponent->storage->getUsers()->getUserBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]));
 		if (isset($_POST[CmsComponent::POST_PARAMETER_USERNAME])) {
 			$cmsComponent->storage->getUsers()->saveUser($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/users');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/users');
 			exit;
 		}
 	}

Please login to merge, or discard this patch.

cloudcontrol/library/storage/storage/AbstractStorage.php 1 patch

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

@@ -35,19 +35,19 @@
 block discarded – undo
 			array_pop($fileParts);
 			$fileNameWithoutExtension = implode('-', $fileParts);
 			$fileNameWithoutExtension = slugify($fileNameWithoutExtension);
-			$filename = $fileNameWithoutExtension . '.' . $extension;
+			$filename = $fileNameWithoutExtension.'.'.$extension;
 		} else {
 			$filename = slugify($filename);
 		}
 
-		if (file_exists($path . '/' . $filename)) {
+		if (file_exists($path.'/'.$filename)) {
 			$fileParts = explode('.', $filename);
 			if (count($fileParts) > 1) {
 				$extension = end($fileParts);
 				array_pop($fileParts);
 				$fileNameWithoutExtension = implode('-', $fileParts);
 				$fileNameWithoutExtension .= '-copy';
-				$filename = $fileNameWithoutExtension . '.' . $extension;
+				$filename = $fileNameWithoutExtension.'.'.$extension;
 			} else {
 				$filename .= '-copy';
 			}

Please login to merge, or discard this patch.

cloudcontrol/library/components/cms/configuration/BricksRouting.php 1 patch

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

@@ -55,7 +55,7 @@  discard block
 block discarded – undo
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_CONFIGURATION);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
 			$cmsComponent->storage->getBricks()->addBrick($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/bricks');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/bricks');
 			exit;
 		}
 	}
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
 		$brick = $cmsComponent->storage->getBricks()->getBrickBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
 			$cmsComponent->storage->getBricks()->saveBrick($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/bricks');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/bricks');
 			exit;
 		}
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_BRICK, $brick);
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
 	private function deleteRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->getBricks()->deleteBrickBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/bricks');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/bricks');
 		exit;
 	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

cloudcontrol/library/components/cms/configuration/DocumentTypeRouting.php 1 patch

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

@@ -56,7 +56,7 @@  discard block
 block discarded – undo
 		$bricks = $cmsComponent->storage->getBricks()->getBricks();
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
 			$cmsComponent->storage->getDocumentTypes()->addDocumentType($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/document-types');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/document-types');
 			exit;
 		}
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_BRICKS, $bricks);
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
 		$bricks = $cmsComponent->storage->getBricks()->getBricks();
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
 			$cmsComponent->storage->getDocumentTypes()->saveDocumentType($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/document-types');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/document-types');
 			exit;
 		}
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT_TYPE, $documentType);
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
 	private function deleteRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->getDocumentTypes()->deleteDocumentTypeBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/document-types');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/document-types');
 		exit;
 	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

cloudcontrol/library/search/DocumentTokenizer.php 1 patch

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

@@ -89,11 +89,11 @@  discard block
 block discarded – undo
 
 	private function tokenizeBrick($brick, $brickSlug)
 	{
-		$fields  = $brick->fields;
+		$fields = $brick->fields;
 		$brickDefinition = $this->storage->getBricks()->getBrickBySlug($brick->type);
 		foreach ($fields as $fieldName => $field) {
 			$fieldType = $this->getFieldType($fieldName, $brickDefinition);
-			$this->tokenizeField($field, $brickSlug . '__' . $fieldName, $fieldType);
+			$this->tokenizeField($field, $brickSlug.'__'.$fieldName, $fieldType);
 		}
 	}
 
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
 	{
 		$dynamicBricks = $this->document->dynamicBricks;
 		foreach ($dynamicBricks as $key => $brick) {
-			$this->tokenizeBrick($brick, 'dynamicBricks__' . $brick->type . $key);
+			$this->tokenizeBrick($brick, 'dynamicBricks__'.$brick->type.$key);
 		}
 	}
 
@@ -154,6 +154,6 @@  discard block
 block discarded – undo
 			}
 		}
 
-		throw new \Exception('Unknown field type for field' . $fieldName . ' in document ' . $this->document->path);
+		throw new \Exception('Unknown field type for field'.$fieldName.' in document '.$this->document->path);
 	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

library/components/cms/configuration/ApplicationComponentRouting.php 1 patch

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

@@ -55,7 +55,7 @@  discard block
 block discarded – undo
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_CONFIGURATION);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
 			$cmsComponent->storage->getApplicationComponents()->addApplicationComponent($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/application-components');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/application-components');
 			exit;
 		}
 	}
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
 		$applicationComponent = $cmsComponent->storage->getApplicationComponents()->getApplicationComponentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
 			$cmsComponent->storage->getApplicationComponents()->saveApplicationComponent($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/application-components');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/application-components');
 			exit;
 		}
 
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
 	private function deleteRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->getApplicationComponents()->deleteApplicationComponentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/application-components');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/application-components');
 		exit;
 	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

cloudcontrol/library/storage/Storage.php 1 patch

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

@@ -82,7 +82,7 @@  discard block
 block discarded – undo
 		 */
 		private function config()
 		{
-			$storagePath = __DIR__ . '/../../' . $this->storageDir;
+			$storagePath = __DIR__.'/../../'.$this->storageDir;
 			if (realpath($storagePath) === false) {
 				initFramework();
 				if (Repository::create($storagePath)) {
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
 					$repository->init();
 					$this->repository = $repository;
 				} else {
-					throw new \Exception('Could not create repository directory: ' . $storagePath);
+					throw new \Exception('Could not create repository directory: '.$storagePath);
 				}
 			} else {
 				$this->repository = new Repository($storagePath);
@@ -133,9 +133,9 @@  discard block
 block discarded – undo
 		{
 			$documentFolderObject = DocumentFolderFactory::createDocumentFolderFromPostValues($postValues);
 			if ($postValues['path'] === '/') {
-				$documentFolderObject->path = $postValues['path'] . $documentFolderObject->slug;
+				$documentFolderObject->path = $postValues['path'].$documentFolderObject->slug;
 			} else {
-				$documentFolderObject->path = $postValues['path'] . '/' . $documentFolderObject->slug;
+				$documentFolderObject->path = $postValues['path'].'/'.$documentFolderObject->slug;
 			}
 			$this->repository->saveDocument($documentFolderObject);
 		}
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
 		 */
 		public function deleteDocumentFolderBySlug($slug)
 		{
-			$path = '/' . $slug;
+			$path = '/'.$slug;
 			$this->repository->deleteDocumentByPath($path);
 		}
 
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
 		 */
 		public function getDocumentFolderBySlug($slug)
 		{
-			$path = '/' . $slug;
+			$path = '/'.$slug;
 
 			return $this->repository->getDocumentByPath($path);
 		}

Please login to merge, or discard this patch.

cloudcontrol/library/search/Indexer.php 1 patch

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

@@ -58,7 +58,7 @@  discard block
 block discarded – undo
 		$this->resetIndex();
 		$this->addLog('Retrieving documents to be indexed.');
 		$documents = $this->storage->getDocuments()->getDocuments();
-		$this->addLog('Start Document Term Count for ' . count($documents) . ' documents');
+		$this->addLog('Start Document Term Count for '.count($documents).' documents');
 		$this->createDocumentTermCount($documents);
 		$this->addLog('Start Document Term Frequency.');
 		$this->createDocumentTermFrequency();
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
 	private function addLog($string)
 	{
 		$currentTime = round(microtime(true) * 1000);
-		$this->log .= date('d-m-Y H:i:s - ') . str_pad($string, 50, " ", STR_PAD_RIGHT) . "\t" . ($currentTime - $this->lastLog) . 'ms since last log. ' . "\t" . ($currentTime - $this->loggingStart) . 'ms since start.' . PHP_EOL;
+		$this->log .= date('d-m-Y H:i:s - ').str_pad($string, 50, " ", STR_PAD_RIGHT)."\t".($currentTime - $this->lastLog).'ms since last log. '."\t".($currentTime - $this->loggingStart).'ms since start.'.PHP_EOL;
 		$this->lastLog = round(microtime(true) * 1000);
 	}
 
@@ -171,8 +171,8 @@  discard block
 block discarded – undo
 	protected function getSearchDbHandle()
 	{
 		if ($this->searchDbHandle === null) {
-			$path = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . $this->storageDir . DIRECTORY_SEPARATOR;
-			$this->searchDbHandle = new \PDO('sqlite:' . $path . self::SEARCH_TEMP_DB);
+			$path = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.$this->storageDir.DIRECTORY_SEPARATOR;
+			$this->searchDbHandle = new \PDO('sqlite:'.$path.self::SEARCH_TEMP_DB);
 		}
 		return $this->searchDbHandle;
 	}
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
 	public function replaceOldIndex()
 	{
 		$this->searchDbHandle = null;
-		$path = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . $this->storageDir . DIRECTORY_SEPARATOR;
-		rename($path . self::SEARCH_TEMP_DB, $path . 'search.db');
+		$path = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.$this->storageDir.DIRECTORY_SEPARATOR;
+		rename($path.self::SEARCH_TEMP_DB, $path.'search.db');
 	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

cloudcontrol/library/components/DocumentComponent.php 1 patch

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

@@ -85,7 +85,7 @@  discard block
 block discarded – undo
 			if (isset($this->parameters['document'])) {
 				$this->runByDocumentParameter();
 			} else {
-				throw new \Exception('When not using a regex, you need to set the parameter `document` with the path to the document in this sitemap item: ' . $this->matchedSitemapItem->title);
+				throw new \Exception('When not using a regex, you need to set the parameter `document` with the path to the document in this sitemap item: '.$this->matchedSitemapItem->title);
 			}
 		}
 
@@ -102,9 +102,9 @@  discard block
 block discarded – undo
 				$relativeDocumentUri = current($this->matchedSitemapItem->matches[1]);
 				if (isset($this->parameters['folder'])) {
 					if (substr($this->parameters['folder'], -1) !== '/') {
-						$this->parameters['folder'] = $this->parameters['folder'] . '/';
+						$this->parameters['folder'] = $this->parameters['folder'].'/';
 					}
-					$relativeDocumentUri = $this->parameters['folder'] . $relativeDocumentUri;
+					$relativeDocumentUri = $this->parameters['folder'].$relativeDocumentUri;
 				}
 
 				$document = $this->storage->getDocuments()->getDocumentBySlug($relativeDocumentUri);

Please login to merge, or discard this patch.

		@@ -35,19 +35,19 @@
		block discarded – undo
35	35	array_pop($fileParts);
36	36	$fileNameWithoutExtension = implode('-', $fileParts);
37	37	$fileNameWithoutExtension = slugify($fileNameWithoutExtension);
38		- $filename = $fileNameWithoutExtension . '.' . $extension;
	38	+ $filename = $fileNameWithoutExtension.'.'.$extension;
39	39	} else {
40	40	$filename = slugify($filename);
41	41	}
42	42
43		- if (file_exists($path . '/' . $filename)) {
	43	+ if (file_exists($path.'/'.$filename)) {
44	44	$fileParts = explode('.', $filename);
45	45	if (count($fileParts) > 1) {
46	46	$extension = end($fileParts);
47	47	array_pop($fileParts);
48	48	$fileNameWithoutExtension = implode('-', $fileParts);
49	49	$fileNameWithoutExtension .= '-copy';
50		- $filename = $fileNameWithoutExtension . '.' . $extension;
	50	+ $filename = $fileNameWithoutExtension.'.'.$extension;
51	51	} else {
52	52	$filename .= '-copy';
53	53	}

		@@ -89,11 +89,11 @@ discard block
		block discarded – undo
89	89
90	90	private function tokenizeBrick($brick, $brickSlug)
91	91	{
92		- $fields = $brick->fields;
	92	+ $fields = $brick->fields;
93	93	$brickDefinition = $this->storage->getBricks()->getBrickBySlug($brick->type);
94	94	foreach ($fields as $fieldName => $field) {
95	95	$fieldType = $this->getFieldType($fieldName, $brickDefinition);
96		- $this->tokenizeField($field, $brickSlug . '__' . $fieldName, $fieldType);
	96	+ $this->tokenizeField($field, $brickSlug.'__'.$fieldName, $fieldType);
97	97	}
98	98	}
99	99
		@@ -101,7 +101,7 @@ discard block
		block discarded – undo
101	101	{
102	102	$dynamicBricks = $this->document->dynamicBricks;
103	103	foreach ($dynamicBricks as $key => $brick) {
104		- $this->tokenizeBrick($brick, 'dynamicBricks__' . $brick->type . $key);
	104	+ $this->tokenizeBrick($brick, 'dynamicBricks__'.$brick->type.$key);
105	105	}
106	106	}
107	107
		@@ -154,6 +154,6 @@ discard block
		block discarded – undo
154	154	}
155	155	}
156	156
157		- throw new \Exception('Unknown field type for field' . $fieldName . ' in document ' . $this->document->path);
	157	+ throw new \Exception('Unknown field type for field'.$fieldName.' in document '.$this->document->path);
158	158	}
159	159	}
160	160	\ No newline at end of file

		@@ -56,7 +56,7 @@ discard block
		block discarded – undo
56	56	$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_CONFIGURATION);
57	57	if (isset($request::$post[CmsComponent::POST_PARAMETER_USERNAME])) {
58	58	$cmsComponent->storage->getUsers()->addUser($request::$post);
59		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/users');
	59	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/users');
60	60	exit;
61	61	}
62	62	}
		@@ -68,7 +68,7 @@ discard block
		block discarded – undo
68	68	private function deleteRoute($request, $cmsComponent)
69	69	{
70	70	$cmsComponent->storage->getUsers()->deleteUserBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
71		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/users');
	71	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/users');
72	72	exit;
73	73	}
74	74
		@@ -83,7 +83,7 @@ discard block
		block discarded – undo
83	83	$cmsComponent->setParameter(CmsComponent::PARAMETER_USER, $cmsComponent->storage->getUsers()->getUserBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]));
84	84	if (isset($_POST[CmsComponent::POST_PARAMETER_USERNAME])) {
85	85	$cmsComponent->storage->getUsers()->saveUser($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
86		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/users');
	86	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/users');
87	87	exit;
88	88	}
89	89	}

		@@ -55,7 +55,7 @@ discard block
		block discarded – undo
55	55	$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_CONFIGURATION);
56	56	if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
57	57	$cmsComponent->storage->getBricks()->addBrick($request::$post);
58		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/bricks');
	58	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/bricks');
59	59	exit;
60	60	}
61	61	}
		@@ -71,7 +71,7 @@ discard block
		block discarded – undo
71	71	$brick = $cmsComponent->storage->getBricks()->getBrickBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
72	72	if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
73	73	$cmsComponent->storage->getBricks()->saveBrick($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
74		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/bricks');
	74	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/bricks');
75	75	exit;
76	76	}
77	77	$cmsComponent->setParameter(CmsComponent::PARAMETER_BRICK, $brick);
		@@ -84,7 +84,7 @@ discard block
		block discarded – undo
84	84	private function deleteRoute($request, $cmsComponent)
85	85	{
86	86	$cmsComponent->storage->getBricks()->deleteBrickBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
87		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/bricks');
	87	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/bricks');
88	88	exit;
89	89	}
90	90	}
91	91	\ No newline at end of file

		@@ -56,7 +56,7 @@ discard block
		block discarded – undo
56	56	$bricks = $cmsComponent->storage->getBricks()->getBricks();
57	57	if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
58	58	$cmsComponent->storage->getDocumentTypes()->addDocumentType($request::$post);
59		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/document-types');
	59	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/document-types');
60	60	exit;
61	61	}
62	62	$cmsComponent->setParameter(CmsComponent::PARAMETER_BRICKS, $bricks);
		@@ -74,7 +74,7 @@ discard block
		block discarded – undo
74	74	$bricks = $cmsComponent->storage->getBricks()->getBricks();
75	75	if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
76	76	$cmsComponent->storage->getDocumentTypes()->saveDocumentType($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
77		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/document-types');
	77	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/document-types');
78	78	exit;
79	79	}
80	80	$cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT_TYPE, $documentType);
		@@ -88,7 +88,7 @@ discard block
		block discarded – undo
88	88	private function deleteRoute($request, $cmsComponent)
89	89	{
90	90	$cmsComponent->storage->getDocumentTypes()->deleteDocumentTypeBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
91		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/document-types');
	91	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/document-types');
92	92	exit;
93	93	}
94	94	}
95	95	\ No newline at end of file

		@@ -82,7 +82,7 @@ discard block
		block discarded – undo
82	82	*/
83	83	private function config()
84	84	{
85		- $storagePath = __DIR__ . '/../../' . $this->storageDir;
	85	+ $storagePath = __DIR__.'/../../'.$this->storageDir;
86	86	if (realpath($storagePath) === false) {
87	87	initFramework();
88	88	if (Repository::create($storagePath)) {
		@@ -90,7 +90,7 @@ discard block
		block discarded – undo
90	90	$repository->init();
91	91	$this->repository = $repository;
92	92	} else {
93		- throw new \Exception('Could not create repository directory: ' . $storagePath);
	93	+ throw new \Exception('Could not create repository directory: '.$storagePath);
94	94	}
95	95	} else {
96	96	$this->repository = new Repository($storagePath);
		@@ -133,9 +133,9 @@ discard block
		block discarded – undo
133	133	{
134	134	$documentFolderObject = DocumentFolderFactory::createDocumentFolderFromPostValues($postValues);
135	135	if ($postValues['path'] === '/') {
136		- $documentFolderObject->path = $postValues['path'] . $documentFolderObject->slug;
	136	+ $documentFolderObject->path = $postValues['path'].$documentFolderObject->slug;
137	137	} else {
138		- $documentFolderObject->path = $postValues['path'] . '/' . $documentFolderObject->slug;
	138	+ $documentFolderObject->path = $postValues['path'].'/'.$documentFolderObject->slug;
139	139	}
140	140	$this->repository->saveDocument($documentFolderObject);
141	141	}
		@@ -149,7 +149,7 @@ discard block
		block discarded – undo
149	149	*/
150	150	public function deleteDocumentFolderBySlug($slug)
151	151	{
152		- $path = '/' . $slug;
	152	+ $path = '/'.$slug;
153	153	$this->repository->deleteDocumentByPath($path);
154	154	}
155	155
		@@ -163,7 +163,7 @@ discard block
		block discarded – undo
163	163	*/
164	164	public function getDocumentFolderBySlug($slug)
165	165	{
166		- $path = '/' . $slug;
	166	+ $path = '/'.$slug;
167	167
168	168	return $this->repository->getDocumentByPath($path);
169	169	}

		@@ -58,7 +58,7 @@ discard block
		block discarded – undo
58	58	$this->resetIndex();
59	59	$this->addLog('Retrieving documents to be indexed.');
60	60	$documents = $this->storage->getDocuments()->getDocuments();
61		- $this->addLog('Start Document Term Count for ' . count($documents) . ' documents');
	61	+ $this->addLog('Start Document Term Count for '.count($documents).' documents');
62	62	$this->createDocumentTermCount($documents);
63	63	$this->addLog('Start Document Term Frequency.');
64	64	$this->createDocumentTermFrequency();
		@@ -159,7 +159,7 @@ discard block
		block discarded – undo
159	159	private function addLog($string)
160	160	{
161	161	$currentTime = round(microtime(true) * 1000);
162		- $this->log .= date('d-m-Y H:i:s - ') . str_pad($string, 50, " ", STR_PAD_RIGHT) . "\t" . ($currentTime - $this->lastLog) . 'ms since last log. ' . "\t" . ($currentTime - $this->loggingStart) . 'ms since start.' . PHP_EOL;
	162	+ $this->log .= date('d-m-Y H:i:s - ').str_pad($string, 50, " ", STR_PAD_RIGHT)."\t".($currentTime - $this->lastLog).'ms since last log. '."\t".($currentTime - $this->loggingStart).'ms since start.'.PHP_EOL;
163	163	$this->lastLog = round(microtime(true) * 1000);
164	164	}
165	165
		@@ -171,8 +171,8 @@ discard block
		block discarded – undo
171	171	protected function getSearchDbHandle()
172	172	{
173	173	if ($this->searchDbHandle === null) {
174		- $path = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . $this->storageDir . DIRECTORY_SEPARATOR;
175		- $this->searchDbHandle = new \PDO('sqlite:' . $path . self::SEARCH_TEMP_DB);
	174	+ $path = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.$this->storageDir.DIRECTORY_SEPARATOR;
	175	+ $this->searchDbHandle = new \PDO('sqlite:'.$path.self::SEARCH_TEMP_DB);
176	176	}
177	177	return $this->searchDbHandle;
178	178	}
		@@ -183,7 +183,7 @@ discard block
		block discarded – undo
183	183	public function replaceOldIndex()
184	184	{
185	185	$this->searchDbHandle = null;
186		- $path = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . $this->storageDir . DIRECTORY_SEPARATOR;
187		- rename($path . self::SEARCH_TEMP_DB, $path . 'search.db');
	186	+ $path = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.$this->storageDir.DIRECTORY_SEPARATOR;
	187	+ rename($path.self::SEARCH_TEMP_DB, $path.'search.db');
188	188	}
189	189	}
190	190	\ No newline at end of file

		@@ -85,7 +85,7 @@ discard block
		block discarded – undo
85	85	if (isset($this->parameters['document'])) {
86	86	$this->runByDocumentParameter();
87	87	} else {
88		- throw new \Exception('When not using a regex, you need to set the parameter `document` with the path to the document in this sitemap item: ' . $this->matchedSitemapItem->title);
	88	+ throw new \Exception('When not using a regex, you need to set the parameter `document` with the path to the document in this sitemap item: '.$this->matchedSitemapItem->title);
89	89	}
90	90	}
91	91
		@@ -102,9 +102,9 @@ discard block
		block discarded – undo
102	102	$relativeDocumentUri = current($this->matchedSitemapItem->matches[1]);
103	103	if (isset($this->parameters['folder'])) {
104	104	if (substr($this->parameters['folder'], -1) !== '/') {
105		- $this->parameters['folder'] = $this->parameters['folder'] . '/';
	105	+ $this->parameters['folder'] = $this->parameters['folder'].'/';
106	106	}
107		- $relativeDocumentUri = $this->parameters['folder'] . $relativeDocumentUri;
	107	+ $relativeDocumentUri = $this->parameters['folder'].$relativeDocumentUri;
108	108	}
109	109
110	110	$document = $this->storage->getDocuments()->getDocumentBySlug($relativeDocumentUri);

jenskooij / cloudcontrol

Push — develop ( 111896...eb49e9 )

Status

Category

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

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

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

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

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

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

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

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

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