jenskooij / cloudcontrol

src/search/results/SearchSuggestion.php

Indentation +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@
 
 class SearchSuggestion
 {
-	public $original;
-	public $term;
-	public $editDistance;
+    public $original;
+    public $term;
+    public $editDistance;
 }
\ No newline at end of file

src/search/SearchDbConnected.php

Indentation +51 added lines, -51 removed lines

@@ -17,61 +17,61 @@
  */
 abstract class SearchDbConnected
 {
-	/**
-	 * @var \PDO
-	 */
-	protected $searchDbHandle;
+    /**
+     * @var \PDO
+     */
+    protected $searchDbHandle;
 
-	/**
-	 * @var \CloudControl\Cms\storage\Storage
-	 */
-	protected $storage;
-	/**
-	 * @var string
-	 */
-	protected $storageDir;
+    /**
+     * @var \CloudControl\Cms\storage\Storage
+     */
+    protected $storage;
+    /**
+     * @var string
+     */
+    protected $storageDir;
 
-	/**
-	 * Indexer constructor.
-	 *
-	 * @param \CloudControl\Cms\storage\Storage $storage
-	 */
-	public function __construct(Storage $storage)
-	{
-		$this->storageDir = $storage->getStorageDir();
-		$this->storage = $storage;
-		$this->initializeDb();
-	}
+    /**
+     * Indexer constructor.
+     *
+     * @param \CloudControl\Cms\storage\Storage $storage
+     */
+    public function __construct(Storage $storage)
+    {
+        $this->storageDir = $storage->getStorageDir();
+        $this->storage = $storage;
+        $this->initializeDb();
+    }
 
-	protected function initializeDb()
-	{
-		if (!$this->isDatabaseConfigured()) {
-			$this->configureDatabase();
-		}
-	}
+    protected function initializeDb()
+    {
+        if (!$this->isDatabaseConfigured()) {
+            $this->configureDatabase();
+        }
+    }
 
-	protected function configureDatabase()
-	{
-		$db = $this->getSearchDbHandle();
-		$sqlPath = __DIR__ . DIRECTORY_SEPARATOR . '../cc/install/search.sql';
-		$searchSql = file_get_contents($sqlPath);
-		$db->exec($searchSql);
-	}
+    protected function configureDatabase()
+    {
+        $db = $this->getSearchDbHandle();
+        $sqlPath = __DIR__ . DIRECTORY_SEPARATOR . '../cc/install/search.sql';
+        $searchSql = file_get_contents($sqlPath);
+        $db->exec($searchSql);
+    }
 
-	protected function isDatabaseConfigured()
-	{
-		$db = $this->getSearchDbHandle();
-		$stmt = $db->query('SELECT name FROM sqlite_master WHERE type=\'table\' AND name=\'term_count\';');
-		$result = $stmt->fetchAll();
-		return !empty($result);
-	}
+    protected function isDatabaseConfigured()
+    {
+        $db = $this->getSearchDbHandle();
+        $stmt = $db->query('SELECT name FROM sqlite_master WHERE type=\'table\' AND name=\'term_count\';');
+        $result = $stmt->fetchAll();
+        return !empty($result);
+    }
 
-	protected function getSearchDbHandle()
-	{
-		if ($this->searchDbHandle === null) {
-			$path = $this->storageDir . DIRECTORY_SEPARATOR;
-			$this->searchDbHandle = new \PDO('sqlite:' . $path . 'search.db');
-		}
-		return $this->searchDbHandle;
-	}
+    protected function getSearchDbHandle()
+    {
+        if ($this->searchDbHandle === null) {
+            $path = $this->storageDir . DIRECTORY_SEPARATOR;
+            $this->searchDbHandle = new \PDO('sqlite:' . $path . 'search.db');
+        }
+        return $this->searchDbHandle;
+    }
 }
\ No newline at end of file

src/storage/factories/UserFactory.php

Indentation +31 added lines, -31 removed lines

@@ -13,37 +13,37 @@
 
 class UserFactory
 {
-	/**
-	 * Create user from POST values
-	 *
-	 * @param $postValues
-	 *
-	 * @return \stdClass
-	 * @throws \Exception
-	 */
-	public static function createUserFromPostValues($postValues)
-	{
-		if (isset($postValues['username'])) {
-			$user = new \stdClass();
-			$user->username = $postValues['username'];
-			$user->slug = StringUtil::slugify($postValues['username']);
-			$user->rights = array();
-			if (isset($postValues['rights'])) {
-				$user->rights = $postValues['rights'];
-			}
+    /**
+     * Create user from POST values
+     *
+     * @param $postValues
+     *
+     * @return \stdClass
+     * @throws \Exception
+     */
+    public static function createUserFromPostValues($postValues)
+    {
+        if (isset($postValues['username'])) {
+            $user = new \stdClass();
+            $user->username = $postValues['username'];
+            $user->slug = StringUtil::slugify($postValues['username']);
+            $user->rights = array();
+            if (isset($postValues['rights'])) {
+                $user->rights = $postValues['rights'];
+            }
 
-			if (isset($postValues['password']) && empty($postValues['password']) === false) {
-				$crypt = new Crypt();
-				$user->password = $crypt->encrypt($postValues['password'], 16);
-				$user->salt = $crypt->getLastSalt();
-			} else {
-				$user->password = $postValues['passHash'];
-				$user->salt = $postValues['salt'];
-			}
+            if (isset($postValues['password']) && empty($postValues['password']) === false) {
+                $crypt = new Crypt();
+                $user->password = $crypt->encrypt($postValues['password'], 16);
+                $user->salt = $crypt->getLastSalt();
+            } else {
+                $user->password = $postValues['passHash'];
+                $user->salt = $postValues['salt'];
+            }
 
-			return $user;
-		} else {
-			throw new \Exception('Trying to create user with invalid data.');
-		}
-	}
+            return $user;
+        } else {
+            throw new \Exception('Trying to create user with invalid data.');
+        }
+    }
 }
\ No newline at end of file

src/storage/factories/ImageFactory.php

Indentation +16 added lines, -16 removed lines

@@ -8,21 +8,21 @@
 
 class ImageFactory
 {
-	/**
-	 * @param $postValues
-	 * @param $filename
-	 * @param $fileNames
-	 *
-	 * @return \stdClass
-	 */
-	public static function createImageFromPostValues($postValues, $filename, $fileNames)
-	{
-		$imageObject = new \stdClass();
-		$imageObject->file = $filename;
-		$imageObject->type = $postValues['type'];
-		$imageObject->size = $postValues['size'];
-		$imageObject->set = $fileNames;
+    /**
+     * @param $postValues
+     * @param $filename
+     * @param $fileNames
+     *
+     * @return \stdClass
+     */
+    public static function createImageFromPostValues($postValues, $filename, $fileNames)
+    {
+        $imageObject = new \stdClass();
+        $imageObject->file = $filename;
+        $imageObject->type = $postValues['type'];
+        $imageObject->size = $postValues['size'];
+        $imageObject->set = $fileNames;
 
-		return $imageObject;
-	}
+        return $imageObject;
+    }
 }
\ No newline at end of file

src/storage/factories/ImageSetFactory.php

Indentation +22 added lines, -22 removed lines

@@ -12,28 +12,28 @@
 
 class ImageSetFactory
 {
-	/**
-	 * Ceate image set from post values
-	 *
-	 * @param $postValues
-	 *
-	 * @return \stdClass
-	 * @throws \Exception
-	 */
-	public static function createImageSetFromPostValues($postValues)
-	{
-		if (isset($postValues['title'], $postValues['width'], $postValues['height'], $postValues['method'])) {
-			$imageSetObject = new \stdClass();
+    /**
+     * Ceate image set from post values
+     *
+     * @param $postValues
+     *
+     * @return \stdClass
+     * @throws \Exception
+     */
+    public static function createImageSetFromPostValues($postValues)
+    {
+        if (isset($postValues['title'], $postValues['width'], $postValues['height'], $postValues['method'])) {
+            $imageSetObject = new \stdClass();
 
-			$imageSetObject->title = $postValues['title'];
-			$imageSetObject->slug = StringUtil::slugify($postValues['title']);
-			$imageSetObject->width = $postValues['width'];
-			$imageSetObject->height = $postValues['height'];
-			$imageSetObject->method = $postValues['method'];
+            $imageSetObject->title = $postValues['title'];
+            $imageSetObject->slug = StringUtil::slugify($postValues['title']);
+            $imageSetObject->width = $postValues['width'];
+            $imageSetObject->height = $postValues['height'];
+            $imageSetObject->method = $postValues['method'];
 
-			return $imageSetObject;
-		} else {
-			throw new \Exception('Trying to create image set with invalid data.');
-		}
-	}
+            return $imageSetObject;
+        } else {
+            throw new \Exception('Trying to create image set with invalid data.');
+        }
+    }
 }
\ No newline at end of file

src/storage/factories/ApplicationComponentFactory.php

Indentation +24 added lines, -24 removed lines

@@ -12,29 +12,29 @@
 
 class ApplicationComponentFactory
 {
-	/**
-	 * @param $postValues
-	 *
-	 * @return \stdClass
-	 * @throws \Exception
-	 */
-	public static function createApplicationComponentFromPostValues($postValues)
-	{
-		if (isset($postValues['title'], $postValues['component'])) {
-			$applicationComponent = new \stdClass();
-			$applicationComponent->title = $postValues['title'];
-			$applicationComponent->slug = StringUtil::slugify($postValues['title']);
-			$applicationComponent->component = $postValues['component'];
-			$applicationComponent->parameters = new \stdClass();
-			if (isset($postValues['parameterNames'], $postValues['parameterValues'])) {
-				foreach ($postValues['parameterNames'] as $key => $value) {
-					$applicationComponent->parameters->$value = $postValues['parameterValues'][$key];
-				}
-			}
+    /**
+     * @param $postValues
+     *
+     * @return \stdClass
+     * @throws \Exception
+     */
+    public static function createApplicationComponentFromPostValues($postValues)
+    {
+        if (isset($postValues['title'], $postValues['component'])) {
+            $applicationComponent = new \stdClass();
+            $applicationComponent->title = $postValues['title'];
+            $applicationComponent->slug = StringUtil::slugify($postValues['title']);
+            $applicationComponent->component = $postValues['component'];
+            $applicationComponent->parameters = new \stdClass();
+            if (isset($postValues['parameterNames'], $postValues['parameterValues'])) {
+                foreach ($postValues['parameterNames'] as $key => $value) {
+                    $applicationComponent->parameters->$value = $postValues['parameterValues'][$key];
+                }
+            }
 
-			return $applicationComponent;
-		} else {
-			throw new \Exception('Trying to create application component with invalid data.');
-		}
-	}
+            return $applicationComponent;
+        } else {
+            throw new \Exception('Trying to create application component with invalid data.');
+        }
+    }
 }
\ No newline at end of file

src/storage/factories/DocumentTypeFactory.php

Indentation +47 added lines, -47 removed lines

@@ -12,58 +12,58 @@
 
 class DocumentTypeFactory extends AbstractBricksFactory
 {
-	public static function createDocumentTypeFromPostValues($postValues)
-	{
-		if (isset($postValues['title'])) {
-			$documentTypeObject = self::createInitialDocoumentTypeObject($postValues);
-			if (isset($postValues['fieldTitles'], $postValues['fieldTypes'], $postValues['fieldRequired'], $postValues['fieldMultiple'])) {
-				foreach ($postValues['fieldTitles'] as $key => $value) {
-					$fieldObject = self::createFieldObject($postValues, $value, $key);
+    public static function createDocumentTypeFromPostValues($postValues)
+    {
+        if (isset($postValues['title'])) {
+            $documentTypeObject = self::createInitialDocoumentTypeObject($postValues);
+            if (isset($postValues['fieldTitles'], $postValues['fieldTypes'], $postValues['fieldRequired'], $postValues['fieldMultiple'])) {
+                foreach ($postValues['fieldTitles'] as $key => $value) {
+                    $fieldObject = self::createFieldObject($postValues, $value, $key);
 
-					$documentTypeObject->fields[] = $fieldObject;
-				}
-			}
-			if (isset($postValues['brickTitles'], $postValues['brickBricks'])) {
-				foreach ($postValues['brickTitles'] as $key => $value) {
-					$brickObject = self::createBrickObject($postValues, $value, $key);
+                    $documentTypeObject->fields[] = $fieldObject;
+                }
+            }
+            if (isset($postValues['brickTitles'], $postValues['brickBricks'])) {
+                foreach ($postValues['brickTitles'] as $key => $value) {
+                    $brickObject = self::createBrickObject($postValues, $value, $key);
 
-					$documentTypeObject->bricks[] = $brickObject;
-				}
-			}
+                    $documentTypeObject->bricks[] = $brickObject;
+                }
+            }
 
-			return $documentTypeObject;
-		} else {
-			throw new \Exception('Trying to create document type with invalid data.');
-		}
-	}
+            return $documentTypeObject;
+        } else {
+            throw new \Exception('Trying to create document type with invalid data.');
+        }
+    }
 
-	/**
-	 * @param $postValues
-	 * @param $title
-	 * @param $slug
-	 *
-	 * @return \stdClass
-	 */
-	private static function createBrickObject($postValues, $title, $slug)
-	{
-		$brickObject = new \stdClass();
-		$brickObject->title = $title;
-		$brickObject->slug = StringUtil::slugify($title);
-		$brickObject->brickSlug = $postValues['brickBricks'][$slug];
-		$brickObject->multiple = ($postValues['brickMultiples'][$slug] === 'true');
+    /**
+     * @param $postValues
+     * @param $title
+     * @param $slug
+     *
+     * @return \stdClass
+     */
+    private static function createBrickObject($postValues, $title, $slug)
+    {
+        $brickObject = new \stdClass();
+        $brickObject->title = $title;
+        $brickObject->slug = StringUtil::slugify($title);
+        $brickObject->brickSlug = $postValues['brickBricks'][$slug];
+        $brickObject->multiple = ($postValues['brickMultiples'][$slug] === 'true');
 
-		return $brickObject;
-	}
+        return $brickObject;
+    }
 
-	private static function createInitialDocoumentTypeObject($postValues)
-	{
-		$documentTypeObject = new \stdClass();
-		$documentTypeObject->title = $postValues['title'];
-		$documentTypeObject->slug = StringUtil::slugify($postValues['title']);
-		$documentTypeObject->fields = array();
-		$documentTypeObject->bricks = array();
-		$documentTypeObject->dynamicBricks = isset($postValues['dynamicBricks']) ? $postValues['dynamicBricks'] : array();
+    private static function createInitialDocoumentTypeObject($postValues)
+    {
+        $documentTypeObject = new \stdClass();
+        $documentTypeObject->title = $postValues['title'];
+        $documentTypeObject->slug = StringUtil::slugify($postValues['title']);
+        $documentTypeObject->fields = array();
+        $documentTypeObject->bricks = array();
+        $documentTypeObject->dynamicBricks = isset($postValues['dynamicBricks']) ? $postValues['dynamicBricks'] : array();
 
-		return $documentTypeObject;
-	}
+        return $documentTypeObject;
+    }
 }
\ No newline at end of file

src/storage/factories/DocumentFactory.php

Indentation +170 added lines, -170 removed lines

@@ -13,174 +13,174 @@
 
 class DocumentFactory
 {
-	/**
-	 * @param array                $postValues
-	 * @param DocumentTypesStorage $documentTypesStorage
-	 *
-	 * @return \CloudControl\Cms\storage\Document
-	 */
-	public static function createDocumentFromPostValues($postValues, DocumentTypesStorage $documentTypesStorage)
-	{
-		$postValues = utf8Convert($postValues);
-		$documentType = $documentTypesStorage->getDocumentTypeBySlug($postValues['documentType']);
-
-		$staticBricks = $documentType->bricks;
-
-		$documentObj = self::createInitialDocumentObject($postValues, $documentType);
-
-		$documentObj->fields = isset($postValues['fields']) ? $postValues['fields'] : array();
-		$documentObj->bricks = array();
-
-		$documentObj = self::createBrickArrayForDocument($postValues, $documentObj, $staticBricks);
-		$documentObj = self::createDynamicBrickArrayForDocument($postValues, $documentObj);
-
-		return $documentObj;
-	}
-
-	/**
-	 * @param array $postValues
-	 * @param \stdClass $documentType
-	 *
-	 * @return Document
-	 */
-	private static function createInitialDocumentObject($postValues, $documentType)
-	{
-		$documentObj = new Document();
-		$documentObj->title = $postValues['title'];
-		$documentObj->slug = StringUtil::slugify($postValues['title']);
-		$documentObj->type = 'document';
-		$documentObj->documentType = $documentType->title;
-		$documentObj->documentTypeSlug = $documentType->slug;
-		$documentObj->state = isset($postValues['state']) ? 'published' : 'unpublished';
-		$documentObj->lastModificationDate = time();
-		$documentObj->creationDate = isset($postValues['creationDate']) ? intval($postValues['creationDate']) : time();
-		$documentObj->lastModifiedBy = $_SESSION['cloudcontrol']->username;
-
-		return $documentObj;
-	}
-
-	/**
-	 * @param array $postValues
-	 * @param Document $documentObj
-	 * @param array $staticBricks
-	 *
-	 * @return Document
-	 */
-	private static function createBrickArrayForDocument($postValues, $documentObj, $staticBricks)
-	{
-		if (isset($postValues['bricks'])) {
-			foreach ($postValues['bricks'] as $brickSlug => $brick) {
-				// Find the current bricktype and check if its multiple
-				list($staticBrick, $multiple) = self::getStaticBrickAndSetMultiple($staticBricks, $brickSlug);
-
-				if ($multiple) {
-					$documentObj = self::addMultipleBricks($documentObj, $brick, $staticBrick, $brickSlug);
-				} else {
-					$documentObj = self::addSingleBrick($documentObj, $brick, $brickSlug);
-				}
-			}
-		}
-		return $documentObj;
-	}
-
-	/**
-	 * @param array $postValues
-	 * @param Document $documentObj
-	 *
-	 * @return Document
-	 */
-	private static function createDynamicBrickArrayForDocument($postValues, $documentObj)
-	{
-		$documentObj->dynamicBricks = array();
-		if (isset($postValues['dynamicBricks'])) {
-			foreach ($postValues['dynamicBricks'] as $brickTypeSlug => $brick) {
-				foreach ($brick as $brickContent) {
-					$brickObj = new \stdClass();
-					$brickObj->type = $brickTypeSlug;
-					$brickObj->fields = $brickContent;
-					$dynamicBricks = $documentObj->dynamicBricks;
-					$dynamicBricks[] = $brickObj;
-					$documentObj->dynamicBricks = $dynamicBricks;
-				}
-			}
-		}
-		return $documentObj;
-	}
-
-	/**
-	 * @param $staticBricks
-	 * @param $brickSlug
-	 *
-	 * @return array
-	 */
-	private static function getStaticBrickAndSetMultiple($staticBricks, $brickSlug)
-	{
-		$staticBrick = null;
-		$multiple = false;
-		foreach ($staticBricks as $staticBrick) {
-			if ($staticBrick->slug === $brickSlug) {
-				$multiple = $staticBrick->multiple;
-				break;
-			}
-		}
-
-		return array($staticBrick, $multiple);
-	}
-
-	/**
-	 * @param $staticBrick
-	 * @param $brickInstance
-	 *
-	 * @return \stdClass
-	 */
-	private static function createBrick($staticBrick, $brickInstance)
-	{
-		$brickObj = new \stdClass();
-		$brickObj->fields = new \stdClass();
-		$brickObj->type = $staticBrick->brickSlug;
-
-		foreach ($brickInstance['fields'] as $fieldName => $fieldValues) {
-			$brickObj->fields->$fieldName = $fieldValues;
-		}
-
-		return $brickObj;
-	}
-
-	/**
-	 * @param $documentObj
-	 * @param $brick
-	 * @param $staticBrick
-	 * @param $brickSlug
-	 *
-	 * @return mixed
-	 */
-	private static function addMultipleBricks($documentObj, $brick, $staticBrick, $brickSlug)
-	{
-		$brickArray = array();
-		foreach ($brick as $brickInstance) {
-			$brickObj = self::createBrick($staticBrick, $brickInstance);
-			$brickArray[] = $brickObj;
-		}
-
-		$bricks = $documentObj->bricks;
-		$bricks[$brickSlug] = $brickArray;
-		$documentObj->bricks = $bricks;
-
-		return $documentObj;
-	}
-
-	/**
-	 * @param $documentObj
-	 * @param $brick
-	 * @param $brickSlug
-	 *
-	 * @return mixed
-	 */
-	private static function addSingleBrick($documentObj, $brick, $brickSlug)
-	{
-		$bricks = $documentObj->bricks;
-		$bricks[$brickSlug] = $brick;
-		$documentObj->bricks = $bricks;
-		return $documentObj;
-	}
+    /**
+     * @param array                $postValues
+     * @param DocumentTypesStorage $documentTypesStorage
+     *
+     * @return \CloudControl\Cms\storage\Document
+     */
+    public static function createDocumentFromPostValues($postValues, DocumentTypesStorage $documentTypesStorage)
+    {
+        $postValues = utf8Convert($postValues);
+        $documentType = $documentTypesStorage->getDocumentTypeBySlug($postValues['documentType']);
+
+        $staticBricks = $documentType->bricks;
+
+        $documentObj = self::createInitialDocumentObject($postValues, $documentType);
+
+        $documentObj->fields = isset($postValues['fields']) ? $postValues['fields'] : array();
+        $documentObj->bricks = array();
+
+        $documentObj = self::createBrickArrayForDocument($postValues, $documentObj, $staticBricks);
+        $documentObj = self::createDynamicBrickArrayForDocument($postValues, $documentObj);
+
+        return $documentObj;
+    }
+
+    /**
+     * @param array $postValues
+     * @param \stdClass $documentType
+     *
+     * @return Document
+     */
+    private static function createInitialDocumentObject($postValues, $documentType)
+    {
+        $documentObj = new Document();
+        $documentObj->title = $postValues['title'];
+        $documentObj->slug = StringUtil::slugify($postValues['title']);
+        $documentObj->type = 'document';
+        $documentObj->documentType = $documentType->title;
+        $documentObj->documentTypeSlug = $documentType->slug;
+        $documentObj->state = isset($postValues['state']) ? 'published' : 'unpublished';
+        $documentObj->lastModificationDate = time();
+        $documentObj->creationDate = isset($postValues['creationDate']) ? intval($postValues['creationDate']) : time();
+        $documentObj->lastModifiedBy = $_SESSION['cloudcontrol']->username;
+
+        return $documentObj;
+    }
+
+    /**
+     * @param array $postValues
+     * @param Document $documentObj
+     * @param array $staticBricks
+     *
+     * @return Document
+     */
+    private static function createBrickArrayForDocument($postValues, $documentObj, $staticBricks)
+    {
+        if (isset($postValues['bricks'])) {
+            foreach ($postValues['bricks'] as $brickSlug => $brick) {
+                // Find the current bricktype and check if its multiple
+                list($staticBrick, $multiple) = self::getStaticBrickAndSetMultiple($staticBricks, $brickSlug);
+
+                if ($multiple) {
+                    $documentObj = self::addMultipleBricks($documentObj, $brick, $staticBrick, $brickSlug);
+                } else {
+                    $documentObj = self::addSingleBrick($documentObj, $brick, $brickSlug);
+                }
+            }
+        }
+        return $documentObj;
+    }
+
+    /**
+     * @param array $postValues
+     * @param Document $documentObj
+     *
+     * @return Document
+     */
+    private static function createDynamicBrickArrayForDocument($postValues, $documentObj)
+    {
+        $documentObj->dynamicBricks = array();
+        if (isset($postValues['dynamicBricks'])) {
+            foreach ($postValues['dynamicBricks'] as $brickTypeSlug => $brick) {
+                foreach ($brick as $brickContent) {
+                    $brickObj = new \stdClass();
+                    $brickObj->type = $brickTypeSlug;
+                    $brickObj->fields = $brickContent;
+                    $dynamicBricks = $documentObj->dynamicBricks;
+                    $dynamicBricks[] = $brickObj;
+                    $documentObj->dynamicBricks = $dynamicBricks;
+                }
+            }
+        }
+        return $documentObj;
+    }
+
+    /**
+     * @param $staticBricks
+     * @param $brickSlug
+     *
+     * @return array
+     */
+    private static function getStaticBrickAndSetMultiple($staticBricks, $brickSlug)
+    {
+        $staticBrick = null;
+        $multiple = false;
+        foreach ($staticBricks as $staticBrick) {
+            if ($staticBrick->slug === $brickSlug) {
+                $multiple = $staticBrick->multiple;
+                break;
+            }
+        }
+
+        return array($staticBrick, $multiple);
+    }
+
+    /**
+     * @param $staticBrick
+     * @param $brickInstance
+     *
+     * @return \stdClass
+     */
+    private static function createBrick($staticBrick, $brickInstance)
+    {
+        $brickObj = new \stdClass();
+        $brickObj->fields = new \stdClass();
+        $brickObj->type = $staticBrick->brickSlug;
+
+        foreach ($brickInstance['fields'] as $fieldName => $fieldValues) {
+            $brickObj->fields->$fieldName = $fieldValues;
+        }
+
+        return $brickObj;
+    }
+
+    /**
+     * @param $documentObj
+     * @param $brick
+     * @param $staticBrick
+     * @param $brickSlug
+     *
+     * @return mixed
+     */
+    private static function addMultipleBricks($documentObj, $brick, $staticBrick, $brickSlug)
+    {
+        $brickArray = array();
+        foreach ($brick as $brickInstance) {
+            $brickObj = self::createBrick($staticBrick, $brickInstance);
+            $brickArray[] = $brickObj;
+        }
+
+        $bricks = $documentObj->bricks;
+        $bricks[$brickSlug] = $brickArray;
+        $documentObj->bricks = $bricks;
+
+        return $documentObj;
+    }
+
+    /**
+     * @param $documentObj
+     * @param $brick
+     * @param $brickSlug
+     *
+     * @return mixed
+     */
+    private static function addSingleBrick($documentObj, $brick, $brickSlug)
+    {
+        $bricks = $documentObj->bricks;
+        $bricks[$brickSlug] = $brick;
+        $documentObj->bricks = $bricks;
+        return $documentObj;
+    }
 }
\ No newline at end of file

src/storage/factories/SitemapItemFactory.php

Indentation +29 added lines, -29 removed lines

@@ -12,34 +12,34 @@
 
 class SitemapItemFactory
 {
-	/**
-	 * Create a sitemap item from post values
-	 *
-	 * @param $postValues
-	 *
-	 * @return \stdClass
-	 * @throws \Exception
-	 */
-	public static function createSitemapItemFromPostValues($postValues)
-	{
-		if (isset($postValues['title'], $postValues['url'], $postValues['component'], $postValues['template'])) {
-			$sitemapObject = new \stdClass();
-			$sitemapObject->title = $postValues['title'];
-			$sitemapObject->slug = StringUtil::slugify($postValues['title']);
-			$sitemapObject->url = $postValues['url'];
-			$sitemapObject->component = $postValues['component'];
-			$sitemapObject->template = $postValues['template'];
-			$sitemapObject->regex = isset($postValues['regex']);
-			$sitemapObject->parameters = new \stdClass();
-			if (isset($postValues['parameterNames'], $postValues['parameterValues'])) {
-				foreach ($postValues['parameterNames'] as $key => $value) {
-					$sitemapObject->parameters->$value = $postValues['parameterValues'][$key];
-				}
-			}
+    /**
+     * Create a sitemap item from post values
+     *
+     * @param $postValues
+     *
+     * @return \stdClass
+     * @throws \Exception
+     */
+    public static function createSitemapItemFromPostValues($postValues)
+    {
+        if (isset($postValues['title'], $postValues['url'], $postValues['component'], $postValues['template'])) {
+            $sitemapObject = new \stdClass();
+            $sitemapObject->title = $postValues['title'];
+            $sitemapObject->slug = StringUtil::slugify($postValues['title']);
+            $sitemapObject->url = $postValues['url'];
+            $sitemapObject->component = $postValues['component'];
+            $sitemapObject->template = $postValues['template'];
+            $sitemapObject->regex = isset($postValues['regex']);
+            $sitemapObject->parameters = new \stdClass();
+            if (isset($postValues['parameterNames'], $postValues['parameterValues'])) {
+                foreach ($postValues['parameterNames'] as $key => $value) {
+                    $sitemapObject->parameters->$value = $postValues['parameterValues'][$key];
+                }
+            }
 
-			return $sitemapObject;
-		} else {
-			throw new \Exception('Trying to create sitemap item with invalid data.');
-		}
-	}
+            return $sitemapObject;
+        } else {
+            throw new \Exception('Trying to create sitemap item with invalid data.');
+        }
+    }
 }
\ No newline at end of file