Inspection of "Minor refactor to ensure PHP 5.3 compatibilty" - jenskooij/cloudcontrol - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — develop ( d59462...7f0625 )

by Jens

created 2017-06-28 14:41 UTC

Status

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

@@ -115,13 +115,13 @@  discard block
 block discarded – undo
             if (in_array($name, $this->fileBasedSubsets)) {
                 return $this->$name;
             } else {
-                throw new \Exception('Trying to get undefined property from Repository: ' . $name);
+                throw new \Exception('Trying to get undefined property from Repository: '.$name);
             }
         } else {
             if (in_array($name, $this->fileBasedSubsets)) {
                 return $this->loadSubset($name);
             } else {
-                throw new \Exception('Trying to get undefined property from Repository: ' . $name);
+                throw new \Exception('Trying to get undefined property from Repository: '.$name);
             }
         }
     }
@@ -136,10 +136,10 @@  discard block
 block discarded – undo
     {
         if (in_array($name, $this->fileBasedSubsets)) {
             $this->$name = $value;
-            $changes = $name . 'Changes';
+            $changes = $name.'Changes';
             $this->$changes = true;
         } else {
-            throw new \Exception('Trying to persist unknown subset in repository: ' . $name . ' <br /><pre>' . print_r($value, true) . '</pre>');
+            throw new \Exception('Trying to persist unknown subset in repository: '.$name.' <br /><pre>'.print_r($value, true).'</pre>');
         }
     }
 
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
     public function save()
     {
         $host = $this;
-        array_map(function ($value) use ($host) {
+        array_map(function($value) use ($host) {
             $host->saveSubset($value);
 		}, $this->fileBasedSubsets);
     }
@@ -160,14 +160,14 @@  discard block
 block discarded – undo
      */
     public function saveSubset($subset)
     {
-		$changes = $subset . 'Changes';
+		$changes = $subset.'Changes';
 		if ($this->$changes === true) {
             if (!defined('JSON_PRETTY_PRINT')) {
                 $json = json_encode($this->$subset);
             } else {
                 $json = json_encode($this->$subset, JSON_PRETTY_PRINT);
             }
-			$subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json';
+			$subsetStoragePath = $this->storagePath.DIRECTORY_SEPARATOR.$subset.'.json';
 			file_put_contents($subsetStoragePath, $json);
 
 			$this->$changes = false;
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
      */
     protected function loadSubset($subset)
     {
-        $subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json';
+        $subsetStoragePath = $this->storagePath.DIRECTORY_SEPARATOR.$subset.'.json';
         $json = file_get_contents($subsetStoragePath);
         $json = json_decode($json);
         $this->$subset = $json;
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
     public function getContentDbHandle()
     {
         if ($this->contentDbHandle === null) {
-            $this->contentDbHandle = new \PDO('sqlite:' . $this->storagePath . DIRECTORY_SEPARATOR . 'content.db');
+            $this->contentDbHandle = new \PDO('sqlite:'.$this->storagePath.DIRECTORY_SEPARATOR.'content.db');
         }
         return $this->contentDbHandle;
     }
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
     public function getDocuments($state = 'published')
     {
 		if (!in_array($state, Document::$DOCUMENT_STATES)) {
-			throw new \Exception('Unsupported document state: ' . $state);
+			throw new \Exception('Unsupported document state: '.$state);
 		}
         return $this->getDocumentsByPath('/', $state);
     }
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
 	public function getDocumentsWithState($folderPath = '/')
 	{
 		$db = $this->getContentDbHandle();
-		$folderPathWithWildcard = $folderPath . '%';
+		$folderPathWithWildcard = $folderPath.'%';
 
 		$ifRootIndex = 1;
 		if ($folderPath == '/') {
@@ -270,10 +270,10 @@  discard block
 block discarded – undo
               FROM documents_unpublished
 		 LEFT JOIN documents_published
          		ON documents_published.path = documents_unpublished.path
-             WHERE documents_unpublished.`path` LIKE ' . $db->quote($folderPathWithWildcard) . '
-               AND substr(documents_unpublished.`path`, ' . (strlen($folderPath) + $ifRootIndex + 1) . ') NOT LIKE "%/%"
-               AND length(documents_unpublished.`path`) > ' . (strlen($folderPath) + $ifRootIndex) . '
-               AND documents_unpublished.path != ' . $db->quote($folderPath) . '
+             WHERE documents_unpublished.`path` LIKE ' . $db->quote($folderPathWithWildcard).'
+               AND substr(documents_unpublished.`path`, ' . (strlen($folderPath) + $ifRootIndex + 1).') NOT LIKE "%/%"
+               AND length(documents_unpublished.`path`) > ' . (strlen($folderPath) + $ifRootIndex).'
+               AND documents_unpublished.path != ' . $db->quote($folderPath).'
           ORDER BY documents_unpublished.`type` DESC, documents_unpublished.`path` ASC
         ';
 		$stmt = $this->getDbStatement($sql);
@@ -300,16 +300,16 @@  discard block
 block discarded – undo
     public function getDocumentsByPath($folderPath, $state = 'published')
     {
     	if (!in_array($state, Document::$DOCUMENT_STATES)) {
-    		throw new \Exception('Unsupported document state: ' . $state);
+    		throw new \Exception('Unsupported document state: '.$state);
 		}
         $db = $this->getContentDbHandle();
-        $folderPathWithWildcard = $folderPath . '%';
+        $folderPathWithWildcard = $folderPath.'%';
 
         $sql = 'SELECT *
-              FROM documents_' . $state . '
-             WHERE `path` LIKE ' . $db->quote($folderPathWithWildcard) . '
-               AND substr(`path`, ' . (strlen($folderPath) + 1) . ') NOT LIKE "%/%"
-               AND path != ' . $db->quote($folderPath) . '
+              FROM documents_' . $state.'
+             WHERE `path` LIKE ' . $db->quote($folderPathWithWildcard).'
+               AND substr(`path`, ' . (strlen($folderPath) + 1).') NOT LIKE "%/%"
+               AND path != ' . $db->quote($folderPath).'
           ORDER BY `type` DESC, `path` ASC';
         $stmt = $this->getDbStatement($sql);
 
@@ -336,7 +336,7 @@  discard block
 block discarded – undo
         if ($containerPath === '/') {
             return $this->getRootFolder();
         }
-        if (substr($containerPath, -1) === '/'){
+        if (substr($containerPath, -1) === '/') {
 			$containerPath = substr($containerPath, 0, -1);
 		}
         $containerFolder = $this->getDocumentByPath($containerPath, 'unpublished');
@@ -353,13 +353,13 @@  discard block
 block discarded – undo
     public function getDocumentByPath($path, $state = 'published')
     {
 		if (!in_array($state, Document::$DOCUMENT_STATES)) {
-			throw new \Exception('Unsupported document state: ' . $state);
+			throw new \Exception('Unsupported document state: '.$state);
 		}
         $db = $this->getContentDbHandle();
         $document = $this->fetchDocument('
             SELECT *
-              FROM documents_' .  $state . '
-             WHERE path = ' . $db->quote($path) . '
+              FROM documents_' .  $state.'
+             WHERE path = ' . $db->quote($path).'
         ');
         if ($document instanceof Document && $document->type === 'folder') {
             $document->dbHandle = $db;
@@ -379,16 +379,16 @@  discard block
 block discarded – undo
 	public function getTotalDocumentCount($state = 'published')
 	{
 		if (!in_array($state, Document::$DOCUMENT_STATES)) {
-			throw new \Exception('Unsupported document state: ' . $state);
+			throw new \Exception('Unsupported document state: '.$state);
 		}
 		$db = $this->getContentDbHandle();
 		$stmt = $db->query('
 			SELECT count(*)
-			  FROM documents_' . $state . '
+			  FROM documents_' . $state.'
 			 WHERE `type` != "folder"
 		');
 		$result = $stmt->fetch(\PDO::FETCH_ASSOC);
-		if (!is_array($result )) {
+		if (!is_array($result)) {
 			return 0;
 		}
 		return intval(current($result));
@@ -407,7 +407,7 @@  discard block
 block discarded – undo
 		if ($stmt === false || !$stmt->execute()) {
 			$errorInfo = $db->errorInfo();
 			$errorMsg = $errorInfo[2];
-			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
+			throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>');
 		}
 		return $result;
 	}
@@ -417,7 +417,7 @@  discard block
 block discarded – undo
 			$sql = '
 				INSERT OR REPLACE INTO documents_published 
 					  (`id`,`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,`state`,`lastModificationDate`,`creationDate`,`publicationDate`,`lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`)
-				SELECT `id`,`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,"published" as state,`lastModificationDate`,`creationDate`,' . time() . ' as publicationDate, `lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`
+				SELECT `id`,`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,"published" as state,`lastModificationDate`,`creationDate`,' . time().' as publicationDate, `lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`
 				  FROM documents_unpublished
 				 WHERE `path` = :path
 			';
@@ -430,7 +430,7 @@  discard block
 block discarded – undo
 		if ($stmt === false) {
 			$errorInfo = $db->errorInfo();
 			$errorMsg = $errorInfo[2];
-			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
+			throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>');
 		}
 		$stmt->bindValue(':path', $path);
 		$stmt->execute();
@@ -497,7 +497,7 @@  discard block
 block discarded – undo
         if ($stmt === false) {
             $errorInfo = $db->errorInfo();
             $errorMsg = $errorInfo[2];
-            throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
+            throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>');
         }
         return $stmt;
     }
@@ -527,25 +527,25 @@  discard block
 block discarded – undo
     public function saveDocument($documentObject, $state = 'published')
     {
 		if (!in_array($state, Document::$DOCUMENT_STATES)) {
-			throw new \Exception('Unsupported document state: ' . $state);
+			throw new \Exception('Unsupported document state: '.$state);
 		}
         $db = $this->getContentDbHandle();
         $stmt = $this->getDbStatement('
-            INSERT OR REPLACE INTO documents_' . $state . ' (`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,`state`,`lastModificationDate`,`creationDate`,`lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`)
+            INSERT OR REPLACE INTO documents_' . $state.' (`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,`state`,`lastModificationDate`,`creationDate`,`lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`)
             VALUES(
-              ' . $db->quote($documentObject->path) . ',
-              ' . $db->quote($documentObject->title) . ',
-              ' . $db->quote($documentObject->slug) . ',
-              ' . $db->quote($documentObject->type) . ',
-              ' . $db->quote($documentObject->documentType) . ',
-              ' . $db->quote($documentObject->documentTypeSlug) . ',
-              ' . $db->quote($documentObject->state) . ',
-              ' . $db->quote($documentObject->lastModificationDate) . ',
-              ' . $db->quote($documentObject->creationDate) . ',
-              ' . $db->quote($documentObject->lastModifiedBy) . ',
-              ' . $db->quote(json_encode($documentObject->fields)) . ',
-              ' . $db->quote(json_encode($documentObject->bricks)) . ',
-              ' . $db->quote(json_encode($documentObject->dynamicBricks)) . '
+              ' . $db->quote($documentObject->path).',
+              ' . $db->quote($documentObject->title).',
+              ' . $db->quote($documentObject->slug).',
+              ' . $db->quote($documentObject->type).',
+              ' . $db->quote($documentObject->documentType).',
+              ' . $db->quote($documentObject->documentTypeSlug).',
+              ' . $db->quote($documentObject->state).',
+              ' . $db->quote($documentObject->lastModificationDate).',
+              ' . $db->quote($documentObject->creationDate).',
+              ' . $db->quote($documentObject->lastModifiedBy).',
+              ' . $db->quote(json_encode($documentObject->fields)).',
+              ' . $db->quote(json_encode($documentObject->bricks)).',
+              ' . $db->quote(json_encode($documentObject->dynamicBricks)).'
             )
         ');
         $result = $stmt->execute();
@@ -569,16 +569,16 @@  discard block
 block discarded – undo
             if ($documentToDelete->type == 'document') {
                 $stmt = $this->getDbStatement('
                     DELETE FROM documents_unpublished
-                          WHERE path = ' . $db->quote($path) . '
+                          WHERE path = ' . $db->quote($path).'
                 ');
                 $stmt->execute();
             } elseif ($documentToDelete->type == 'folder') {
-                $folderPathWithWildcard = $path . '%';
+                $folderPathWithWildcard = $path.'%';
                 $stmt = $this->getDbStatement('
                     DELETE FROM documents_unpublished
-                          WHERE (path LIKE ' . $db->quote($folderPathWithWildcard) . '
-                            AND substr(`path`, ' . (strlen($path) + 1) . ', 1) = "/")
-                            OR path = ' . $db->quote($path) . '
+                          WHERE (path LIKE ' . $db->quote($folderPathWithWildcard).'
+                            AND substr(`path`, ' . (strlen($path) + 1).', 1) = "/")
+                            OR path = ' . $db->quote($path).'
                 ');
                 $stmt->execute();
             }

Please login to merge, or discard this patch.

		@@ -115,13 +115,13 @@ discard block
		block discarded – undo
115	115	if (in_array($name, $this->fileBasedSubsets)) {
116	116	return $this->$name;
117	117	} else {
118		- throw new \Exception('Trying to get undefined property from Repository: ' . $name);
	118	+ throw new \Exception('Trying to get undefined property from Repository: '.$name);
119	119	}
120	120	} else {
121	121	if (in_array($name, $this->fileBasedSubsets)) {
122	122	return $this->loadSubset($name);
123	123	} else {
124		- throw new \Exception('Trying to get undefined property from Repository: ' . $name);
	124	+ throw new \Exception('Trying to get undefined property from Repository: '.$name);
125	125	}
126	126	}
127	127	}
		@@ -136,10 +136,10 @@ discard block
		block discarded – undo
136	136	{
137	137	if (in_array($name, $this->fileBasedSubsets)) {
138	138	$this->$name = $value;
139		- $changes = $name . 'Changes';
	139	+ $changes = $name.'Changes';
140	140	$this->$changes = true;
141	141	} else {
142		- throw new \Exception('Trying to persist unknown subset in repository: ' . $name . ' <br /><pre>' . print_r($value, true) . '</pre>');
	142	+ throw new \Exception('Trying to persist unknown subset in repository: '.$name.' <br /><pre>'.print_r($value, true).'</pre>');
143	143	}
144	144	}
145	145
		@@ -149,7 +149,7 @@ discard block
		block discarded – undo
149	149	public function save()
150	150	{
151	151	$host = $this;
152		- array_map(function ($value) use ($host) {
	152	+ array_map(function($value) use ($host) {
153	153	$host->saveSubset($value);
154	154	}, $this->fileBasedSubsets);
155	155	}
		@@ -160,14 +160,14 @@ discard block
		block discarded – undo
160	160	*/
161	161	public function saveSubset($subset)
162	162	{
163		- $changes = $subset . 'Changes';
	163	+ $changes = $subset.'Changes';
164	164	if ($this->$changes === true) {
165	165	if (!defined('JSON_PRETTY_PRINT')) {
166	166	$json = json_encode($this->$subset);
167	167	} else {
168	168	$json = json_encode($this->$subset, JSON_PRETTY_PRINT);
169	169	}
170		- $subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json';
	170	+ $subsetStoragePath = $this->storagePath.DIRECTORY_SEPARATOR.$subset.'.json';
171	171	file_put_contents($subsetStoragePath, $json);
172	172
173	173	$this->$changes = false;
		@@ -181,7 +181,7 @@ discard block
		block discarded – undo
181	181	*/
182	182	protected function loadSubset($subset)
183	183	{
184		- $subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json';
	184	+ $subsetStoragePath = $this->storagePath.DIRECTORY_SEPARATOR.$subset.'.json';
185	185	$json = file_get_contents($subsetStoragePath);
186	186	$json = json_decode($json);
187	187	$this->$subset = $json;
		@@ -231,7 +231,7 @@ discard block
		block discarded – undo
231	231	public function getContentDbHandle()
232	232	{
233	233	if ($this->contentDbHandle === null) {
234		- $this->contentDbHandle = new \PDO('sqlite:' . $this->storagePath . DIRECTORY_SEPARATOR . 'content.db');
	234	+ $this->contentDbHandle = new \PDO('sqlite:'.$this->storagePath.DIRECTORY_SEPARATOR.'content.db');
235	235	}
236	236	return $this->contentDbHandle;
237	237	}
		@@ -247,7 +247,7 @@ discard block
		block discarded – undo
247	247	public function getDocuments($state = 'published')
248	248	{
249	249	if (!in_array($state, Document::$DOCUMENT_STATES)) {
250		- throw new \Exception('Unsupported document state: ' . $state);
	250	+ throw new \Exception('Unsupported document state: '.$state);
251	251	}
252	252	return $this->getDocumentsByPath('/', $state);
253	253	}
		@@ -255,7 +255,7 @@ discard block
		block discarded – undo
255	255	public function getDocumentsWithState($folderPath = '/')
256	256	{
257	257	$db = $this->getContentDbHandle();
258		- $folderPathWithWildcard = $folderPath . '%';
	258	+ $folderPathWithWildcard = $folderPath.'%';
259	259
260	260	$ifRootIndex = 1;
261	261	if ($folderPath == '/') {
		@@ -270,10 +270,10 @@ discard block
		block discarded – undo
270	270	FROM documents_unpublished
271	271	LEFT JOIN documents_published
272	272	ON documents_published.path = documents_unpublished.path
273		- WHERE documents_unpublished.`path` LIKE ' . $db->quote($folderPathWithWildcard) . '
274		- AND substr(documents_unpublished.`path`, ' . (strlen($folderPath) + $ifRootIndex + 1) . ') NOT LIKE "%/%"
275		- AND length(documents_unpublished.`path`) > ' . (strlen($folderPath) + $ifRootIndex) . '
276		- AND documents_unpublished.path != ' . $db->quote($folderPath) . '
	273	+ WHERE documents_unpublished.`path` LIKE ' . $db->quote($folderPathWithWildcard).'
	274	+ AND substr(documents_unpublished.`path`, ' . (strlen($folderPath) + $ifRootIndex + 1).') NOT LIKE "%/%"
	275	+ AND length(documents_unpublished.`path`) > ' . (strlen($folderPath) + $ifRootIndex).'
	276	+ AND documents_unpublished.path != ' . $db->quote($folderPath).'
277	277	ORDER BY documents_unpublished.`type` DESC, documents_unpublished.`path` ASC
278	278	';
279	279	$stmt = $this->getDbStatement($sql);
		@@ -300,16 +300,16 @@ discard block
		block discarded – undo
300	300	public function getDocumentsByPath($folderPath, $state = 'published')
301	301	{
302	302	if (!in_array($state, Document::$DOCUMENT_STATES)) {
303		- throw new \Exception('Unsupported document state: ' . $state);
	303	+ throw new \Exception('Unsupported document state: '.$state);
304	304	}
305	305	$db = $this->getContentDbHandle();
306		- $folderPathWithWildcard = $folderPath . '%';
	306	+ $folderPathWithWildcard = $folderPath.'%';
307	307
308	308	$sql = 'SELECT *
309		- FROM documents_' . $state . '
310		- WHERE `path` LIKE ' . $db->quote($folderPathWithWildcard) . '
311		- AND substr(`path`, ' . (strlen($folderPath) + 1) . ') NOT LIKE "%/%"
312		- AND path != ' . $db->quote($folderPath) . '
	309	+ FROM documents_' . $state.'
	310	+ WHERE `path` LIKE ' . $db->quote($folderPathWithWildcard).'
	311	+ AND substr(`path`, ' . (strlen($folderPath) + 1).') NOT LIKE "%/%"
	312	+ AND path != ' . $db->quote($folderPath).'
313	313	ORDER BY `type` DESC, `path` ASC';
314	314	$stmt = $this->getDbStatement($sql);
315	315
		@@ -336,7 +336,7 @@ discard block
		block discarded – undo
336	336	if ($containerPath === '/') {
337	337	return $this->getRootFolder();
338	338	}
339		- if (substr($containerPath, -1) === '/'){
	339	+ if (substr($containerPath, -1) === '/') {
340	340	$containerPath = substr($containerPath, 0, -1);
341	341	}
342	342	$containerFolder = $this->getDocumentByPath($containerPath, 'unpublished');
		@@ -353,13 +353,13 @@ discard block
		block discarded – undo
353	353	public function getDocumentByPath($path, $state = 'published')
354	354	{
355	355	if (!in_array($state, Document::$DOCUMENT_STATES)) {
356		- throw new \Exception('Unsupported document state: ' . $state);
	356	+ throw new \Exception('Unsupported document state: '.$state);
357	357	}
358	358	$db = $this->getContentDbHandle();
359	359	$document = $this->fetchDocument('
360	360	SELECT *
361		- FROM documents_' . $state . '
362		- WHERE path = ' . $db->quote($path) . '
	361	+ FROM documents_' . $state.'
	362	+ WHERE path = ' . $db->quote($path).'
363	363	');
364	364	if ($document instanceof Document && $document->type === 'folder') {
365	365	$document->dbHandle = $db;
		@@ -379,16 +379,16 @@ discard block
		block discarded – undo
379	379	public function getTotalDocumentCount($state = 'published')
380	380	{
381	381	if (!in_array($state, Document::$DOCUMENT_STATES)) {
382		- throw new \Exception('Unsupported document state: ' . $state);
	382	+ throw new \Exception('Unsupported document state: '.$state);
383	383	}
384	384	$db = $this->getContentDbHandle();
385	385	$stmt = $db->query('
386	386	SELECT count(*)
387		- FROM documents_' . $state . '
	387	+ FROM documents_' . $state.'
388	388	WHERE `type` != "folder"
389	389	');
390	390	$result = $stmt->fetch(\PDO::FETCH_ASSOC);
391		- if (!is_array($result )) {
	391	+ if (!is_array($result)) {
392	392	return 0;
393	393	}
394	394	return intval(current($result));
		@@ -407,7 +407,7 @@ discard block
		block discarded – undo
407	407	if ($stmt === false \|\| !$stmt->execute()) {
408	408	$errorInfo = $db->errorInfo();
409	409	$errorMsg = $errorInfo[2];
410		- throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
	410	+ throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>');
411	411	}
412	412	return $result;
413	413	}
		@@ -417,7 +417,7 @@ discard block
		block discarded – undo
417	417	$sql = '
418	418	INSERT OR REPLACE INTO documents_published
419	419	(`id`,`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,`state`,`lastModificationDate`,`creationDate`,`publicationDate`,`lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`)
420		- SELECT `id`,`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,"published" as state,`lastModificationDate`,`creationDate`,' . time() . ' as publicationDate, `lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`
	420	+ SELECT `id`,`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,"published" as state,`lastModificationDate`,`creationDate`,' . time().' as publicationDate, `lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`
421	421	FROM documents_unpublished
422	422	WHERE `path` = :path
423	423	';
		@@ -430,7 +430,7 @@ discard block
		block discarded – undo
430	430	if ($stmt === false) {
431	431	$errorInfo = $db->errorInfo();
432	432	$errorMsg = $errorInfo[2];
433		- throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
	433	+ throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>');
434	434	}
435	435	$stmt->bindValue(':path', $path);
436	436	$stmt->execute();
		@@ -497,7 +497,7 @@ discard block
		block discarded – undo
497	497	if ($stmt === false) {
498	498	$errorInfo = $db->errorInfo();
499	499	$errorMsg = $errorInfo[2];
500		- throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
	500	+ throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>');
501	501	}
502	502	return $stmt;
503	503	}
		@@ -527,25 +527,25 @@ discard block
		block discarded – undo
527	527	public function saveDocument($documentObject, $state = 'published')
528	528	{
529	529	if (!in_array($state, Document::$DOCUMENT_STATES)) {
530		- throw new \Exception('Unsupported document state: ' . $state);
	530	+ throw new \Exception('Unsupported document state: '.$state);
531	531	}
532	532	$db = $this->getContentDbHandle();
533	533	$stmt = $this->getDbStatement('
534		- INSERT OR REPLACE INTO documents_' . $state . ' (`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,`state`,`lastModificationDate`,`creationDate`,`lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`)
	534	+ INSERT OR REPLACE INTO documents_' . $state.' (`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,`state`,`lastModificationDate`,`creationDate`,`lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`)
535	535	VALUES(
536		- ' . $db->quote($documentObject->path) . ',
537		- ' . $db->quote($documentObject->title) . ',
538		- ' . $db->quote($documentObject->slug) . ',
539		- ' . $db->quote($documentObject->type) . ',
540		- ' . $db->quote($documentObject->documentType) . ',
541		- ' . $db->quote($documentObject->documentTypeSlug) . ',
542		- ' . $db->quote($documentObject->state) . ',
543		- ' . $db->quote($documentObject->lastModificationDate) . ',
544		- ' . $db->quote($documentObject->creationDate) . ',
545		- ' . $db->quote($documentObject->lastModifiedBy) . ',
546		- ' . $db->quote(json_encode($documentObject->fields)) . ',
547		- ' . $db->quote(json_encode($documentObject->bricks)) . ',
548		- ' . $db->quote(json_encode($documentObject->dynamicBricks)) . '
	536	+ ' . $db->quote($documentObject->path).',
	537	+ ' . $db->quote($documentObject->title).',
	538	+ ' . $db->quote($documentObject->slug).',
	539	+ ' . $db->quote($documentObject->type).',
	540	+ ' . $db->quote($documentObject->documentType).',
	541	+ ' . $db->quote($documentObject->documentTypeSlug).',
	542	+ ' . $db->quote($documentObject->state).',
	543	+ ' . $db->quote($documentObject->lastModificationDate).',
	544	+ ' . $db->quote($documentObject->creationDate).',
	545	+ ' . $db->quote($documentObject->lastModifiedBy).',
	546	+ ' . $db->quote(json_encode($documentObject->fields)).',
	547	+ ' . $db->quote(json_encode($documentObject->bricks)).',
	548	+ ' . $db->quote(json_encode($documentObject->dynamicBricks)).'
549	549	)
550	550	');
551	551	$result = $stmt->execute();
		@@ -569,16 +569,16 @@ discard block
		block discarded – undo
569	569	if ($documentToDelete->type == 'document') {
570	570	$stmt = $this->getDbStatement('
571	571	DELETE FROM documents_unpublished
572		- WHERE path = ' . $db->quote($path) . '
	572	+ WHERE path = ' . $db->quote($path).'
573	573	');
574	574	$stmt->execute();
575	575	} elseif ($documentToDelete->type == 'folder') {
576		- $folderPathWithWildcard = $path . '%';
	576	+ $folderPathWithWildcard = $path.'%';
577	577	$stmt = $this->getDbStatement('
578	578	DELETE FROM documents_unpublished
579		- WHERE (path LIKE ' . $db->quote($folderPathWithWildcard) . '
580		- AND substr(`path`, ' . (strlen($path) + 1) . ', 1) = "/")
581		- OR path = ' . $db->quote($path) . '
	579	+ WHERE (path LIKE ' . $db->quote($folderPathWithWildcard).'
	580	+ AND substr(`path`, ' . (strlen($path) + 1).', 1) = "/")
	581	+ OR path = ' . $db->quote($path).'
582	582	');
583	583	$stmt->execute();
584	584	}

jenskooij / cloudcontrol

Push — develop ( d59462...7f0625 )

Status

Category

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