jenskooij / cloudcontrol

src/storage/Repository.php

Indentation +174 added lines, -174 removed lines

@@ -152,7 +152,7 @@ 
         $host = $this;
         array_map(function ($value) use ($host) {
             $host->saveSubset($value);
-		}, $this->fileBasedSubsets);
+        }, $this->fileBasedSubsets);
     }
 
     /**
@@ -161,18 +161,18 @@ 
      */
     public function saveSubset($subset)
     {
-		$changes = $subset . 'Changes';
-		if ($this->$changes === true) {
+        $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';
-			file_put_contents($subsetStoragePath, $json);
+            $subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json';
+            file_put_contents($subsetStoragePath, $json);
 
-			$this->$changes = false;
-		}
+            $this->$changes = false;
+        }
     }
 
     /**
@@ -229,33 +229,33 @@ 
         return $this->contentDbHandle;
     }
 
-	/**
-	 * Get all documents
-	 *
-	 * @param string $state
-	 *
-	 * @return array
-	 * @throws \Exception
-	 */
+    /**
+     * Get all documents
+     *
+     * @param string $state
+     *
+     * @return array
+     * @throws \Exception
+     */
     public function getDocuments($state = 'published')
     {
-		if (!in_array($state, Document::$DOCUMENT_STATES)) {
-			throw new \Exception('Unsupported document state: ' . $state);
-		}
+        if (!in_array($state, Document::$DOCUMENT_STATES)) {
+            throw new \Exception('Unsupported document state: ' . $state);
+        }
         return $this->getDocumentsByPath('/', $state);
     }
 
-	public function getDocumentsWithState($folderPath = '/')
-	{
-		$db = $this->getContentDbHandle();
-		$folderPathWithWildcard = $folderPath . '%';
+    public function getDocumentsWithState($folderPath = '/')
+    {
+        $db = $this->getContentDbHandle();
+        $folderPathWithWildcard = $folderPath . '%';
 
-		$ifRootIndex = 1;
-		if ($folderPath == '/') {
-			$ifRootIndex = 0;
-		}
+        $ifRootIndex = 1;
+        if ($folderPath == '/') {
+            $ifRootIndex = 0;
+        }
 
-		$sql = '
+        $sql = '
             SELECT documents_unpublished.*,
             	   IFNULL(documents_published.state,"unpublished") as state,
             	   IFNULL(documents_published.publicationDate,NULL) as publicationDate,
@@ -269,32 +269,32 @@ 
                AND documents_unpublished.path != ' . $db->quote($folderPath) . '
           ORDER BY documents_unpublished.`type` DESC, documents_unpublished.`path` ASC
         ';
-		$stmt = $this->getDbStatement($sql);
-
-
-
-		$documents = $stmt->fetchAll(\PDO::FETCH_CLASS, '\CloudControl\Cms\storage\Document');
-		foreach ($documents as $key => $document) {
-			$documents = $this->setAssetsToDocumentFolders($document, $db, $documents, $key);
-		}
-		//dump($documents);
-		return $documents;
-	}
-
-	/**
-	 * Get all documents and folders in a certain path
-	 *
-	 * @param        $folderPath
-	 * @param string $state
-	 *
-	 * @return array
-	 * @throws \Exception
-	 */
+        $stmt = $this->getDbStatement($sql);
+
+
+
+        $documents = $stmt->fetchAll(\PDO::FETCH_CLASS, '\CloudControl\Cms\storage\Document');
+        foreach ($documents as $key => $document) {
+            $documents = $this->setAssetsToDocumentFolders($document, $db, $documents, $key);
+        }
+        //dump($documents);
+        return $documents;
+    }
+
+    /**
+     * Get all documents and folders in a certain path
+     *
+     * @param        $folderPath
+     * @param string $state
+     *
+     * @return array
+     * @throws \Exception
+     */
     public function getDocumentsByPath($folderPath, $state = 'published')
     {
-    	if (!in_array($state, Document::$DOCUMENT_STATES)) {
-    		throw new \Exception('Unsupported document state: ' . $state);
-		}
+        if (!in_array($state, Document::$DOCUMENT_STATES)) {
+            throw new \Exception('Unsupported document state: ' . $state);
+        }
         $db = $this->getContentDbHandle();
         $folderPathWithWildcard = $folderPath . '%';
 
@@ -308,7 +308,7 @@ 
 
         $documents = $stmt->fetchAll(\PDO::FETCH_CLASS, '\CloudControl\Cms\storage\Document');
         foreach ($documents as $key => $document) {
-			$documents = $this->setAssetsToDocumentFolders($document, $db, $documents, $key);
+            $documents = $this->setAssetsToDocumentFolders($document, $db, $documents, $key);
         }
         return $documents;
     }
@@ -330,24 +330,24 @@ 
             return $this->getRootFolder();
         }
         if (substr($containerPath, -1) === '/'){
-			$containerPath = substr($containerPath, 0, -1);
-		}
+            $containerPath = substr($containerPath, 0, -1);
+        }
         $containerFolder = $this->getDocumentByPath($containerPath, 'unpublished');
         return $containerFolder;
     }
 
-	/**
-	 * @param        $path
-	 * @param string $state
-	 *
-	 * @return bool|\CloudControl\Cms\storage\Document
-	 * @throws \Exception
-	 */
+    /**
+     * @param        $path
+     * @param string $state
+     *
+     * @return bool|\CloudControl\Cms\storage\Document
+     * @throws \Exception
+     */
     public function getDocumentByPath($path, $state = 'published')
     {
-		if (!in_array($state, Document::$DOCUMENT_STATES)) {
-			throw new \Exception('Unsupported document state: ' . $state);
-		}
+        if (!in_array($state, Document::$DOCUMENT_STATES)) {
+            throw new \Exception('Unsupported document state: ' . $state);
+        }
         $db = $this->getContentDbHandle();
         $document = $this->fetchDocument('
             SELECT *
@@ -361,87 +361,87 @@ 
         return $document;
     }
 
-	/**
-	 * Returns the count of all documents stored in the db
-	 *
-	 * @param string $state
-	 *
-	 * @return int
-	 * @throws \Exception
-	 */
-	public function getTotalDocumentCount($state = 'published')
-	{
-		if (!in_array($state, Document::$DOCUMENT_STATES)) {
-			throw new \Exception('Unsupported document state: ' . $state);
-		}
-		$db = $this->getContentDbHandle();
-		$stmt = $db->query('
+    /**
+     * Returns the count of all documents stored in the db
+     *
+     * @param string $state
+     *
+     * @return int
+     * @throws \Exception
+     */
+    public function getTotalDocumentCount($state = 'published')
+    {
+        if (!in_array($state, Document::$DOCUMENT_STATES)) {
+            throw new \Exception('Unsupported document state: ' . $state);
+        }
+        $db = $this->getContentDbHandle();
+        $stmt = $db->query('
 			SELECT count(*)
 			  FROM documents_' . $state . '
 			 WHERE `type` != "folder"
 		');
-		$result = $stmt->fetch(\PDO::FETCH_ASSOC);
-		if (!is_array($result )) {
-			return 0;
-		}
-		return intval(current($result));
-	}
-
-	public function getPublishedDocumentsNoFolders()
-	{
-		$db = $this->getContentDbHandle();
-		$sql = '
+        $result = $stmt->fetch(\PDO::FETCH_ASSOC);
+        if (!is_array($result )) {
+            return 0;
+        }
+        return intval(current($result));
+    }
+
+    public function getPublishedDocumentsNoFolders()
+    {
+        $db = $this->getContentDbHandle();
+        $sql = '
 			SELECT *
 			  FROM documents_published
 			 WHERE `type` != "folder"
 		';
-		$stmt = $db->query($sql);
-		$result = $stmt->fetchAll(\PDO::FETCH_CLASS, '\CloudControl\Cms\storage\Document');
-		if ($stmt === false || !$stmt->execute()) {
-			$errorInfo = $db->errorInfo();
-			$errorMsg = $errorInfo[2];
-			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
-		}
-		return $result;
-	}
-
-	private function publishOrUnpublishDocumentByPath($path, $publish = true) {
-		if ($publish) {
-			$sql = '
+        $stmt = $db->query($sql);
+        $result = $stmt->fetchAll(\PDO::FETCH_CLASS, '\CloudControl\Cms\storage\Document');
+        if ($stmt === false || !$stmt->execute()) {
+            $errorInfo = $db->errorInfo();
+            $errorMsg = $errorInfo[2];
+            throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
+        }
+        return $result;
+    }
+
+    private function publishOrUnpublishDocumentByPath($path, $publish = true) {
+        if ($publish) {
+            $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`
 				  FROM documents_unpublished
 				 WHERE `path` = :path
 			';
-		} else {
-			$sql = 'DELETE FROM documents_published
+        } else {
+            $sql = 'DELETE FROM documents_published
 					  WHERE `path` = :path';
-		}
-		$db = $this->getContentDbHandle();
-		$stmt = $db->prepare($sql);
-		if ($stmt === false) {
-			$errorInfo = $db->errorInfo();
-			$errorMsg = $errorInfo[2];
-			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
-		}
-		$stmt->bindValue(':path', $path);
-		$stmt->execute();
-	}
-
-	public function publishDocumentByPath($path)
-	{
-		$this->publishOrUnpublishDocumentByPath($path);
-	}
-
-	public function unpublishDocumentByPath($path)
-	{
-		$this->publishOrUnpublishDocumentByPath($path, false);
-	}
-
-	public function cleanPublishedDeletedDocuments()
-	{
-		$sql = '   DELETE FROM documents_published
+        }
+        $db = $this->getContentDbHandle();
+        $stmt = $db->prepare($sql);
+        if ($stmt === false) {
+            $errorInfo = $db->errorInfo();
+            $errorMsg = $errorInfo[2];
+            throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
+        }
+        $stmt->bindValue(':path', $path);
+        $stmt->execute();
+    }
+
+    public function publishDocumentByPath($path)
+    {
+        $this->publishOrUnpublishDocumentByPath($path);
+    }
+
+    public function unpublishDocumentByPath($path)
+    {
+        $this->publishOrUnpublishDocumentByPath($path, false);
+    }
+
+    public function cleanPublishedDeletedDocuments()
+    {
+        $sql = '   DELETE FROM documents_published
 						 WHERE documents_published.path IN (
 						SELECT documents_published.path
 						  FROM documents_published
@@ -449,11 +449,11 @@ 
 							ON documents_unpublished.path = documents_published.path
 						 WHERE documents_unpublished.path IS NULL
 		)';
-		$stmt = $this->getDbStatement($sql);
-		$stmt->execute();
-	}
+        $stmt = $this->getDbStatement($sql);
+        $stmt->execute();
+    }
 
-	/**
+    /**
      * Return the results of the query as array of Documents
      * @param $sql
      * @return array
@@ -507,21 +507,21 @@ 
         return $rootFolder;
     }
 
-	/**
-	 * Save the document to the database
-	 *
-	 * @param Document $documentObject
-	 * @param string   $state
-	 *
-	 * @return bool
-	 * @throws \Exception
-	 * @internal param $path
-	 */
+    /**
+     * Save the document to the database
+     *
+     * @param Document $documentObject
+     * @param string   $state
+     *
+     * @return bool
+     * @throws \Exception
+     * @internal param $path
+     */
     public function saveDocument($documentObject, $state = 'published')
     {
-		if (!in_array($state, Document::$DOCUMENT_STATES)) {
-			throw new \Exception('Unsupported document state: ' . $state);
-		}
+        if (!in_array($state, Document::$DOCUMENT_STATES)) {
+            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`)
@@ -545,15 +545,15 @@ 
         return $result;
     }
 
-	/**
-	 * Delete the document from the database
-	 * If it's a folder, also delete it's contents
-	 *
-	 * @param        $path
-	 *
-	 * @internal param string $state
-	 *
-	 */
+    /**
+     * Delete the document from the database
+     * If it's a folder, also delete it's contents
+     *
+     * @param        $path
+     *
+     * @internal param string $state
+     *
+     */
     public function deleteDocumentByPath($path)
     {
         $db = $this->getContentDbHandle();
@@ -578,24 +578,24 @@ 
         }
     }
 
-	/**
-	 * @param $document
-	 * @param $db
-	 * @param $documents
-	 * @param $key
-	 *
-	 * @return mixed
-	 */
-	private function setAssetsToDocumentFolders($document, $db, $documents, $key)
-	{
-		if ($document->type === 'folder') {
-			$document->dbHandle = $db;
-			$document->documentStorage = new DocumentStorage($this);
-			$documents[$key] = $document;
-		}
-
-		return $documents;
-	}
+    /**
+     * @param $document
+     * @param $db
+     * @param $documents
+     * @param $key
+     *
+     * @return mixed
+     */
+    private function setAssetsToDocumentFolders($document, $db, $documents, $key)
+    {
+        if ($document->type === 'folder') {
+            $document->dbHandle = $db;
+            $document->documentStorage = new DocumentStorage($this);
+            $documents[$key] = $document;
+        }
+
+        return $documents;
+    }
 
     private function initConfigIfNotExists($json, $subsetName)
     {

src/storage/Storage.php

Indentation +265 added lines, -265 removed lines

@@ -15,52 +15,52 @@ 
     use CloudControl\Cms\storage\storage\ValuelistsStorage;
 
     /**
-	 * Class JsonStorage
+     * Class JsonStorage
      * @package CloudControl\Cms\storage
-	 */
-	class Storage
-	{
-		/**
-		 * @var SitemapStorage
-		 */
-		protected $sitemap;
-		/**
-		 * @var ImagesStorage
-		 */
-		protected $images;
-		/**
-		 * @var ImageSetStorage
-		 */
-		protected $imageSet;
-		/**
-		 * @var FilesStorage
-		 */
-		protected $files;
-		/**
-		 * @var UsersStorage
-		 */
-		protected $users;
-		/**
-		 * @var DocumentTypesStorage
-		 */
-		protected $documentTypes;
-		/**
-		 * @var BricksStorage
-		 */
-		protected $bricks;
-		/**
-		 * @var ApplicationComponentsStorage
-		 */
-		protected $applicationComponents;
+     */
+    class Storage
+    {
+        /**
+         * @var SitemapStorage
+         */
+        protected $sitemap;
+        /**
+         * @var ImagesStorage
+         */
+        protected $images;
+        /**
+         * @var ImageSetStorage
+         */
+        protected $imageSet;
+        /**
+         * @var FilesStorage
+         */
+        protected $files;
+        /**
+         * @var UsersStorage
+         */
+        protected $users;
+        /**
+         * @var DocumentTypesStorage
+         */
+        protected $documentTypes;
+        /**
+         * @var BricksStorage
+         */
+        protected $bricks;
+        /**
+         * @var ApplicationComponentsStorage
+         */
+        protected $applicationComponents;
 
-		/**
-		 * @var ValuelistsStorage
-		 */
-		protected $valuelists;
-		/**
-		 * @var DocumentStorage
-		 */
-		protected $documents;
+        /**
+         * @var ValuelistsStorage
+         */
+        protected $valuelists;
+        /**
+         * @var DocumentStorage
+         */
+        protected $documents;
         /**
          * @var RedirectsStorage
          */
@@ -75,13 +75,13 @@ 
         protected $filesDir;
 
         /**
-		 * @var String
-		 */
-		private $storageDir;
-		/**
-		 * @var Repository
-		 */
-		private $repository;
+         * @var String
+         */
+        private $storageDir;
+        /**
+         * @var Repository
+         */
+        private $repository;
 
         /**
          * JsonStorage constructor.
@@ -91,245 +91,245 @@ 
          * @param $filesDir
          */
         public function __construct($storageDir, $imagesDir, $filesDir)
-		{
-			$this->storageDir = $storageDir;
+        {
+            $this->storageDir = $storageDir;
             $this->imagesDir = $imagesDir;
             $this->filesDir = $filesDir;
-			$this->config();
-		}
+            $this->config();
+        }
 
-		/**
-		 * Retrieve the data from the storagepath
-		 * so it can be interacted with
-		 *
-		 * @throws \Exception
-		 */
-		private function config()
-		{
-			$storagePath = $this->storageDir;
-			if (realpath($storagePath) === false) {
-				throw new \Exception('Storage doesnt seem to be initialized, consider running composer install to do so.');
-			} else {
-				$this->repository = new Repository($storagePath);
-			}
+        /**
+         * Retrieve the data from the storagepath
+         * so it can be interacted with
+         *
+         * @throws \Exception
+         */
+        private function config()
+        {
+            $storagePath = $this->storageDir;
+            if (realpath($storagePath) === false) {
+                throw new \Exception('Storage doesnt seem to be initialized, consider running composer install to do so.');
+            } else {
+                $this->repository = new Repository($storagePath);
+            }
 
-		}
+        }
 
-		/**
-		 * @return \CloudControl\Cms\storage\storage\UsersStorage
-		 */
-		public function getUsers()
-		{
-			if (!$this->users instanceof UsersStorage) {
-				$this->users = new UsersStorage($this->repository);
-			}
-			return $this->users;
-		}
+        /**
+         * @return \CloudControl\Cms\storage\storage\UsersStorage
+         */
+        public function getUsers()
+        {
+            if (!$this->users instanceof UsersStorage) {
+                $this->users = new UsersStorage($this->repository);
+            }
+            return $this->users;
+        }
 
-		/**
-		 * Get documents
-		 *
-		 * @return DocumentStorage
-		 */
-		public function getDocuments()
-		{
-			if (!$this->documents instanceof DocumentStorage) {
-				$this->documents = new DocumentStorage($this->repository);
-			}
-			return $this->documents;
-		}
+        /**
+         * Get documents
+         *
+         * @return DocumentStorage
+         */
+        public function getDocuments()
+        {
+            if (!$this->documents instanceof DocumentStorage) {
+                $this->documents = new DocumentStorage($this->repository);
+            }
+            return $this->documents;
+        }
 
-		/**
-		 * Add new document in given path
-		 *
-		 * @param array $postValues
-		 *
-		 * @throws \Exception
-		 */
-		public function addDocumentFolder($postValues)
-		{
-			$documentFolderObject = DocumentFolderFactory::createDocumentFolderFromPostValues($postValues);
-			if ($postValues['path'] === '/') {
-				$documentFolderObject->path = $postValues['path'] . $documentFolderObject->slug;
-			} else {
-				$documentFolderObject->path = $postValues['path'] . '/' . $documentFolderObject->slug;
-			}
-			$this->repository->saveDocument($documentFolderObject, 'published');
-			$this->repository->saveDocument($documentFolderObject, 'unpublished');
-		}
+        /**
+         * Add new document in given path
+         *
+         * @param array $postValues
+         *
+         * @throws \Exception
+         */
+        public function addDocumentFolder($postValues)
+        {
+            $documentFolderObject = DocumentFolderFactory::createDocumentFolderFromPostValues($postValues);
+            if ($postValues['path'] === '/') {
+                $documentFolderObject->path = $postValues['path'] . $documentFolderObject->slug;
+            } else {
+                $documentFolderObject->path = $postValues['path'] . '/' . $documentFolderObject->slug;
+            }
+            $this->repository->saveDocument($documentFolderObject, 'published');
+            $this->repository->saveDocument($documentFolderObject, 'unpublished');
+        }
 
-		/**
-		 * Delete a folder by its compound slug
-		 *
-		 * @param $slug
-		 *
-		 * @throws \Exception
-		 */
-		public function deleteDocumentFolderBySlug($slug)
-		{
-			$path = '/' . $slug;
-			$this->repository->deleteDocumentByPath($path, 'published');
-			$this->repository->deleteDocumentByPath($path, 'unpublished');
-			$this->repository->cleanPublishedDeletedDocuments();
-		}
+        /**
+         * Delete a folder by its compound slug
+         *
+         * @param $slug
+         *
+         * @throws \Exception
+         */
+        public function deleteDocumentFolderBySlug($slug)
+        {
+            $path = '/' . $slug;
+            $this->repository->deleteDocumentByPath($path, 'published');
+            $this->repository->deleteDocumentByPath($path, 'unpublished');
+            $this->repository->cleanPublishedDeletedDocuments();
+        }
 
-		public function publishDocumentBySlug($slug)
-		{
-			$path = '/' . $slug;
-			$this->repository->publishDocumentByPath($path);
-		}
+        public function publishDocumentBySlug($slug)
+        {
+            $path = '/' . $slug;
+            $this->repository->publishDocumentByPath($path);
+        }
 
-		public function unpublishDocumentBySlug($slug)
-		{
-			$path = '/' . $slug;
-			$this->repository->unpublishDocumentByPath($path);
-		}
+        public function unpublishDocumentBySlug($slug)
+        {
+            $path = '/' . $slug;
+            $this->repository->unpublishDocumentByPath($path);
+        }
 
-		/**
-		 * Retrieve a folder by its compound slug
-		 *
-		 * @param $slug
-		 *
-		 * @return mixed
-		 * @throws \Exception
-		 */
-		public function getDocumentFolderBySlug($slug)
-		{
-			$path = '/' . $slug;
+        /**
+         * Retrieve a folder by its compound slug
+         *
+         * @param $slug
+         *
+         * @return mixed
+         * @throws \Exception
+         */
+        public function getDocumentFolderBySlug($slug)
+        {
+            $path = '/' . $slug;
 
-			return $this->repository->getDocumentByPath($path);
-		}
+            return $this->repository->getDocumentByPath($path);
+        }
 
-		/**
-		 * Save changes to folder
-		 *
-		 * @param $postValues
-		 *
-		 * @throws \Exception
-		 */
-		public function saveDocumentFolder($postValues)
-		{
-			$this->addDocumentFolder($postValues);
-		}
+        /**
+         * Save changes to folder
+         *
+         * @param $postValues
+         *
+         * @throws \Exception
+         */
+        public function saveDocumentFolder($postValues)
+        {
+            $this->addDocumentFolder($postValues);
+        }
 
-		/**
-		 * @return SitemapStorage
-		 */
-		public function getSitemap()
-		{
-			if (!$this->sitemap instanceof SitemapStorage) {
-				$this->sitemap = new SitemapStorage($this->repository);
-			}
-			return $this->sitemap;
-		}
+        /**
+         * @return SitemapStorage
+         */
+        public function getSitemap()
+        {
+            if (!$this->sitemap instanceof SitemapStorage) {
+                $this->sitemap = new SitemapStorage($this->repository);
+            }
+            return $this->sitemap;
+        }
 
-		/**
-		 * Get all images
-		 *
-		 * @return ImagesStorage
-		 */
-		public function getImages()
-		{
-			if (!$this->images instanceof ImagesStorage) {
+        /**
+         * Get all images
+         *
+         * @return ImagesStorage
+         */
+        public function getImages()
+        {
+            if (!$this->images instanceof ImagesStorage) {
 
                 $this->images = new ImagesStorage($this->repository, $this->imagesDir);
-			}
-			return $this->images;
-		}
+            }
+            return $this->images;
+        }
 
-		/**
-		 * Get all files
-		 *
-		 * @return FilesStorage
-		 */
-		public function getFiles()
-		{
-			if (!$this->files instanceof FilesStorage) {
-				$this->files = new FilesStorage($this->repository, $this->filesDir);
-			}
-			return $this->files;
-		}
+        /**
+         * Get all files
+         *
+         * @return FilesStorage
+         */
+        public function getFiles()
+        {
+            if (!$this->files instanceof FilesStorage) {
+                $this->files = new FilesStorage($this->repository, $this->filesDir);
+            }
+            return $this->files;
+        }
 
-		/**
-		 * @return string
-		 */
-		public function getStorageDir()
-		{
-			return $this->storageDir;
-		}
+        /**
+         * @return string
+         */
+        public function getStorageDir()
+        {
+            return $this->storageDir;
+        }
 
-		/**
-		 * @return \PDO
-		 */
-		public function getContentDbHandle()
-		{
-			return $this->repository->getContentDbHandle();
-		}
+        /**
+         * @return \PDO
+         */
+        public function getContentDbHandle()
+        {
+            return $this->repository->getContentDbHandle();
+        }
 
-		/**
-		 * @return DocumentTypesStorage
-		 */
-		public function getDocumentTypes()
-		{
-			if (!$this->documentTypes instanceof DocumentTypesStorage) {
-				$this->documentTypes = new DocumentTypesStorage($this->repository);
-			}
-			return $this->documentTypes;
-		}
+        /**
+         * @return DocumentTypesStorage
+         */
+        public function getDocumentTypes()
+        {
+            if (!$this->documentTypes instanceof DocumentTypesStorage) {
+                $this->documentTypes = new DocumentTypesStorage($this->repository);
+            }
+            return $this->documentTypes;
+        }
 
-		/**
-		 * @return BricksStorage
-		 */
-		public function getBricks()
-		{
-			if (!$this->bricks instanceof BricksStorage) {
-				$this->bricks = new BricksStorage($this->repository);
-			}
-			return $this->bricks;
-		}
+        /**
+         * @return BricksStorage
+         */
+        public function getBricks()
+        {
+            if (!$this->bricks instanceof BricksStorage) {
+                $this->bricks = new BricksStorage($this->repository);
+            }
+            return $this->bricks;
+        }
 
-		/**
-		 * Get the image set
-		 *
-		 * @return ImageSetStorage
-		 */
-		public function getImageSet()
-		{
-			if (!$this->imageSet instanceof ImageSetStorage) {
-				$this->imageSet = new ImageSetStorage($this->repository);
-			}
-			return $this->imageSet;
-		}
+        /**
+         * Get the image set
+         *
+         * @return ImageSetStorage
+         */
+        public function getImageSet()
+        {
+            if (!$this->imageSet instanceof ImageSetStorage) {
+                $this->imageSet = new ImageSetStorage($this->repository);
+            }
+            return $this->imageSet;
+        }
 
-		/**
-		 * @return ApplicationComponentsStorage
-		 */
-		public function getApplicationComponents()
-		{
-			if (!$this->applicationComponents instanceof ApplicationComponentsStorage) {
-				$this->applicationComponents = new ApplicationComponentsStorage($this->repository);
-			}
-			return $this->applicationComponents;
-		}
+        /**
+         * @return ApplicationComponentsStorage
+         */
+        public function getApplicationComponents()
+        {
+            if (!$this->applicationComponents instanceof ApplicationComponentsStorage) {
+                $this->applicationComponents = new ApplicationComponentsStorage($this->repository);
+            }
+            return $this->applicationComponents;
+        }
 
-		/**
-		 * @return \CloudControl\Cms\storage\Repository
-		 */
-		public function getRepository()
-		{
-			return $this->repository;
-		}
+        /**
+         * @return \CloudControl\Cms\storage\Repository
+         */
+        public function getRepository()
+        {
+            return $this->repository;
+        }
 
-		/**
-		 * @return \CloudControl\Cms\storage\storage\ValuelistsStorage
-		 */
-		public function getValuelists()
-		{
-			if (!$this->valuelists instanceof ValuelistsStorage) {
-				$this->valuelists = new ValuelistsStorage($this->repository);
-			}
-			return $this->valuelists;
-		}
+        /**
+         * @return \CloudControl\Cms\storage\storage\ValuelistsStorage
+         */
+        public function getValuelists()
+        {
+            if (!$this->valuelists instanceof ValuelistsStorage) {
+                $this->valuelists = new ValuelistsStorage($this->repository);
+            }
+            return $this->valuelists;
+        }
 
         /**
          * @return \CloudControl\Cms\storage\storage\RedirectsStorage
@@ -342,5 +342,5 @@ 
             return $this->redirects;
         }
 
-	}
+    }
 }
\ No newline at end of file

src/storage/Document.php

Indentation +15 added lines, -15 removed lines

@@ -75,13 +75,13 @@ 
         $this->$name = $value;
     }
 
-	/**
-	 * @param string $orderBy
-	 * @param string $order
-	 *
-	 * @return array
-	 * @throws \Exception
-	 */
+    /**
+     * @param string $orderBy
+     * @param string $order
+     *
+     * @return array
+     * @throws \Exception
+     */
     public function getContent($orderBy = 'title', $order = 'ASC')
     {
         if (empty($this->content)) {
@@ -89,16 +89,16 @@ 
             $this->content = $docs;
         }
 
-    	return $this->content;
+        return $this->content;
     }
 
-	/**
-	 * @return string
-	 */
-	public function __toString()
-	{
-		return 'Document:' . $this->title;
-	}
+    /**
+     * @return string
+     */
+    public function __toString()
+    {
+        return 'Document:' . $this->title;
+    }
 
 
 }
\ No newline at end of file

src/storage/storage/DocumentTypesStorage.php

Indentation +100 added lines, -100 removed lines

@@ -10,115 +10,115 @@
 
 class DocumentTypesStorage extends AbstractStorage
 {
-	/**
-	 * @var BricksStorage
-	 */
-	protected $bricks;
+    /**
+     * @var BricksStorage
+     */
+    protected $bricks;
 
-	/**
-	 * @return array
-	 */
-	public function getDocumentTypes()
-	{
-		return $this->repository->documentTypes;
-	}
+    /**
+     * @return array
+     */
+    public function getDocumentTypes()
+    {
+        return $this->repository->documentTypes;
+    }
 
-	/**
-	 * Add a document type from post values
-	 *
-	 * @param $postValues
-	 *
-	 * @throws \Exception
-	 */
-	public function addDocumentType($postValues)
-	{
-		$documentTypeObject = DocumentTypeFactory::createDocumentTypeFromPostValues($postValues);
+    /**
+     * Add a document type from post values
+     *
+     * @param $postValues
+     *
+     * @throws \Exception
+     */
+    public function addDocumentType($postValues)
+    {
+        $documentTypeObject = DocumentTypeFactory::createDocumentTypeFromPostValues($postValues);
 
-		$documentTypes = $this->repository->documentTypes;
-		$documentTypes[] = $documentTypeObject;
-		$this->repository->documentTypes = $documentTypes;
+        $documentTypes = $this->repository->documentTypes;
+        $documentTypes[] = $documentTypeObject;
+        $this->repository->documentTypes = $documentTypes;
 
-		$this->save();
-	}
+        $this->save();
+    }
 
-	/**
-	 * Delete document type
-	 *
-	 * @param $slug
-	 *
-	 * @throws \Exception
-	 */
-	public function deleteDocumentTypeBySlug($slug)
-	{
-		$documentTypes = $this->repository->documentTypes;
-		foreach ($documentTypes as $key => $documentTypeObject) {
-			if ($documentTypeObject->slug == $slug) {
-				unset($documentTypes[$key]);
-			}
-		}
-		$documentTypes = array_values($documentTypes);
-		$this->repository->documentTypes = $documentTypes;
-		$this->save();
-	}
+    /**
+     * Delete document type
+     *
+     * @param $slug
+     *
+     * @throws \Exception
+     */
+    public function deleteDocumentTypeBySlug($slug)
+    {
+        $documentTypes = $this->repository->documentTypes;
+        foreach ($documentTypes as $key => $documentTypeObject) {
+            if ($documentTypeObject->slug == $slug) {
+                unset($documentTypes[$key]);
+            }
+        }
+        $documentTypes = array_values($documentTypes);
+        $this->repository->documentTypes = $documentTypes;
+        $this->save();
+    }
 
-	/**
-	 * Get document type by its slug
-	 *
-	 * @param      $slug
-	 * @param bool $getBricks
-	 *
-	 * @return mixed
-	 */
-	public function getDocumentTypeBySlug($slug, $getBricks = false)
-	{
-		$documentTypes = $this->repository->documentTypes;
-		foreach ($documentTypes as $documentType) {
-			if ($documentType->slug == $slug) {
-				if ($getBricks === true) {
-					foreach ($documentType->bricks as $key => $brick) {
-						$brickStructure = $this->getBricks()->getBrickBySlug($brick->brickSlug);
-						$documentType->bricks[$key]->structure = $brickStructure;
-					}
-					foreach ($documentType->dynamicBricks as $key => $brickSlug) {
-						$brickStructure = $this->getBricks()->getBrickBySlug($brickSlug);
-						$documentType->dynamicBricks[$key] = $brickStructure;
-					}
-				}
+    /**
+     * Get document type by its slug
+     *
+     * @param      $slug
+     * @param bool $getBricks
+     *
+     * @return mixed
+     */
+    public function getDocumentTypeBySlug($slug, $getBricks = false)
+    {
+        $documentTypes = $this->repository->documentTypes;
+        foreach ($documentTypes as $documentType) {
+            if ($documentType->slug == $slug) {
+                if ($getBricks === true) {
+                    foreach ($documentType->bricks as $key => $brick) {
+                        $brickStructure = $this->getBricks()->getBrickBySlug($brick->brickSlug);
+                        $documentType->bricks[$key]->structure = $brickStructure;
+                    }
+                    foreach ($documentType->dynamicBricks as $key => $brickSlug) {
+                        $brickStructure = $this->getBricks()->getBrickBySlug($brickSlug);
+                        $documentType->dynamicBricks[$key] = $brickStructure;
+                    }
+                }
 
-				return $documentType;
-			}
-		}
+                return $documentType;
+            }
+        }
 
-		return null;
-	}
+        return null;
+    }
 
-	/**
-	 * Save changes to a document type
-	 *
-	 * @param $slug
-	 * @param $postValues
-	 *
-	 * @throws \Exception
-	 */
-	public function saveDocumentType($slug, $postValues)
-	{
-		$documentTypeObject = DocumentTypeFactory::createDocumentTypeFromPostValues($postValues);
+    /**
+     * Save changes to a document type
+     *
+     * @param $slug
+     * @param $postValues
+     *
+     * @throws \Exception
+     */
+    public function saveDocumentType($slug, $postValues)
+    {
+        $documentTypeObject = DocumentTypeFactory::createDocumentTypeFromPostValues($postValues);
 
-		$documentTypes = $this->repository->documentTypes;
-		foreach ($documentTypes as $key => $documentType) {
-			if ($documentType->slug == $slug) {
-				$documentTypes[$key] = $documentTypeObject;
-			}
-		}
-		$this->repository->documentTypes = $documentTypes;
-		$this->save();
-	}
+        $documentTypes = $this->repository->documentTypes;
+        foreach ($documentTypes as $key => $documentType) {
+            if ($documentType->slug == $slug) {
+                $documentTypes[$key] = $documentTypeObject;
+            }
+        }
+        $this->repository->documentTypes = $documentTypes;
+        $this->save();
+    }
 
-	private function getBricks()
-	{
-		if (!$this->bricks instanceof BricksStorage) {
-			$this->bricks = new BricksStorage($this->repository);
-		}
-		return $this->bricks;
-	}
+    private function getBricks()
+    {
+        if (!$this->bricks instanceof BricksStorage) {
+            $this->bricks = new BricksStorage($this->repository);
+        }
+        return $this->bricks;
+    }
 }
\ No newline at end of file

src/storage/storage/BricksStorage.php

Indentation +78 added lines, -78 removed lines

@@ -10,91 +10,91 @@
 
 class BricksStorage extends AbstractStorage
 {
-	/**
-	 * @return array
-	 */
-	public function getBricks()
-	{
-		return $this->repository->bricks;
-	}
+    /**
+     * @return array
+     */
+    public function getBricks()
+    {
+        return $this->repository->bricks;
+    }
 
-	/**
-	 * Add a brick
-	 *
-	 * @param $postValues
-	 *
-	 * @throws \Exception
-	 */
-	public function addBrick($postValues)
-	{
-		$brickObject = BrickFactory::createBrickFromPostValues($postValues);
+    /**
+     * Add a brick
+     *
+     * @param $postValues
+     *
+     * @throws \Exception
+     */
+    public function addBrick($postValues)
+    {
+        $brickObject = BrickFactory::createBrickFromPostValues($postValues);
 
-		$bricks = $this->repository->bricks;
-		$bricks[] = $brickObject;
-		$this->repository->bricks = $bricks;
+        $bricks = $this->repository->bricks;
+        $bricks[] = $brickObject;
+        $this->repository->bricks = $bricks;
 
-		$this->save();
-	}
+        $this->save();
+    }
 
-	/**
-	 * Get a brick by its slug
-	 *
-	 * @param $slug
-	 *
-	 * @return \stdClass
-	 */
-	public function getBrickBySlug($slug)
-	{
-		$bricks = $this->repository->bricks;
-		foreach ($bricks as $brick) {
-			if ($brick->slug == $slug) {
-				return $brick;
-			}
-		}
+    /**
+     * Get a brick by its slug
+     *
+     * @param $slug
+     *
+     * @return \stdClass
+     */
+    public function getBrickBySlug($slug)
+    {
+        $bricks = $this->repository->bricks;
+        foreach ($bricks as $brick) {
+            if ($brick->slug == $slug) {
+                return $brick;
+            }
+        }
 
-		return null;
-	}
+        return null;
+    }
 
-	/**
-	 * Save changes to a brick
-	 *
-	 * @param $slug
-	 * @param $postValues
-	 *
-	 * @throws \Exception
-	 */
-	public function saveBrick($slug, $postValues)
-	{
-		$brickObject = BrickFactory::createBrickFromPostValues($postValues);
+    /**
+     * Save changes to a brick
+     *
+     * @param $slug
+     * @param $postValues
+     *
+     * @throws \Exception
+     */
+    public function saveBrick($slug, $postValues)
+    {
+        $brickObject = BrickFactory::createBrickFromPostValues($postValues);
 
-		$bricks = $this->repository->bricks;
-		foreach ($bricks as $key => $brick) {
-			if ($brick->slug == $slug) {
-				$bricks[$key] = $brickObject;
-			}
-		}
-		$this->repository->bricks = $bricks;
-		$this->save();
-	}
+        $bricks = $this->repository->bricks;
+        foreach ($bricks as $key => $brick) {
+            if ($brick->slug == $slug) {
+                $bricks[$key] = $brickObject;
+            }
+        }
+        $this->repository->bricks = $bricks;
+        $this->save();
+    }
 
-	/**
-	 * Delete a brick by its slug
-	 *
-	 * @param $slug
-	 *
-	 * @throws \Exception
-	 */
-	public function deleteBrickBySlug($slug)
-	{
-		$bricks = $this->repository->bricks;
-		foreach ($bricks as $key => $brickObject) {
-			if ($brickObject->slug == $slug) {
-				unset($bricks[$key]);
-			}
-		}
+    /**
+     * Delete a brick by its slug
+     *
+     * @param $slug
+     *
+     * @throws \Exception
+     */
+    public function deleteBrickBySlug($slug)
+    {
+        $bricks = $this->repository->bricks;
+        foreach ($bricks as $key => $brickObject) {
+            if ($brickObject->slug == $slug) {
+                unset($bricks[$key]);
+            }
+        }
 
-		$bricks = array_values($bricks);
-		$this->repository->bricks = $bricks;
-		$this->save();
-	}
+        $bricks = array_values($bricks);
+        $this->repository->bricks = $bricks;
+        $this->save();
+    }
 }
\ No newline at end of file

src/storage/storage/DocumentStorage.php

Indentation +118 added lines, -118 removed lines

@@ -10,123 +10,123 @@
 
 class DocumentStorage extends AbstractStorage
 {
-	/**
-	 * Get documents
-	 *
-	 * @param string $state
-	 *
-	 * @return array
-	 * @throws \Exception
-	 */
-	public function getDocuments($state = 'published')
-	{
-		if (!in_array($state, Document::$DOCUMENT_STATES)) {
-			throw new \Exception('Unsupported document state: ' . $state);
-		}
-		return $this->repository->getDocuments($state);
-	}
-
-	public function getDocumentsWithState($folderPath = '/')
-	{
-		return $this->repository->getDocumentsWithState($folderPath);
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getTotalDocumentCount()
-	{
-		return $this->repository->getTotalDocumentCount();
-	}
-
-	/**
-	 * @param string $slug
-	 *
-	 * @param string $state
-	 *
-	 * @return mixed
-	 * @throws \Exception
-	 */
-	public function getDocumentBySlug($slug, $state = 'published')
-	{
-		if (!in_array($state, Document::$DOCUMENT_STATES)) {
-			throw new \Exception('Unsupported document state: ' . $state);
-		}
-		$path = '/' . $slug;
-
-		return $this->repository->getDocumentByPath($path, $state);
-	}
-
-	/**
-	 * @param $postValues
-	 * @param $state
-	 *
-	 * @throws \Exception
-	 */
-	public function saveDocument($postValues, $state = 'unpublished')
-	{
-		if (!in_array($state, Document::$DOCUMENT_STATES)) {
-			throw new \Exception('Unsupported document state: ' . $state);
-		}
-		$oldPath = '/' . $postValues['path'];
-
-		$container = $this->getDocumentContainerByPath($oldPath);
-		$documentObject = DocumentFactory::createDocumentFromPostValues($postValues, new DocumentTypesStorage($this->repository));
-		if ($container->path === '/') {
-			$newPath = $container->path . $documentObject->slug;
-		} else {
-			$newPath = $container->path . '/' . $documentObject->slug;
-		}
-		$documentObject->path = $newPath;
-		$this->repository->saveDocument($documentObject, $state);
-	}
-
-	/**
-	 * @param        $postValues
-	 * @param string $state
-	 */
-	public function addDocument($postValues, $state = 'unpublished')
-	{
-		$documentObject = DocumentFactory::createDocumentFromPostValues($postValues, new DocumentTypesStorage($this->repository));
-		if ($postValues['path'] === '/') {
-			$documentObject->path = $postValues['path'] . $documentObject->slug;
-		} else {
-			$documentObject->path = $postValues['path'] . '/' . $documentObject->slug;
-		}
-
-		$this->repository->saveDocument($documentObject, $state);
-	}
-
-	/**
-	 * @param $slug
-	 */
-	public function deleteDocumentBySlug($slug)
-	{
-		$path = '/' . $slug;
-		$this->repository->deleteDocumentByPath($path);
-	}
-
-	/**
-	 * Returns the folder containing the document
-	 *
-	 * @param $path
-	 *
-	 * @return bool|\CloudControl\Cms\storage\Document
-	 * @throws \Exception
-	 */
-	private function getDocumentContainerByPath($path)
-	{
-		return $this->repository->getDocumentContainerByPath($path);
-	}
-
-	public function getPublishedDocumentsNoFolders()
-	{
-		return $this->repository->getPublishedDocumentsNoFolders();
-	}
-
-	public function cleanPublishedDeletedDocuments()
-	{
-		$this->repository->cleanPublishedDeletedDocuments();
-	}
+    /**
+     * Get documents
+     *
+     * @param string $state
+     *
+     * @return array
+     * @throws \Exception
+     */
+    public function getDocuments($state = 'published')
+    {
+        if (!in_array($state, Document::$DOCUMENT_STATES)) {
+            throw new \Exception('Unsupported document state: ' . $state);
+        }
+        return $this->repository->getDocuments($state);
+    }
+
+    public function getDocumentsWithState($folderPath = '/')
+    {
+        return $this->repository->getDocumentsWithState($folderPath);
+    }
+
+    /**
+     * @return int
+     */
+    public function getTotalDocumentCount()
+    {
+        return $this->repository->getTotalDocumentCount();
+    }
+
+    /**
+     * @param string $slug
+     *
+     * @param string $state
+     *
+     * @return mixed
+     * @throws \Exception
+     */
+    public function getDocumentBySlug($slug, $state = 'published')
+    {
+        if (!in_array($state, Document::$DOCUMENT_STATES)) {
+            throw new \Exception('Unsupported document state: ' . $state);
+        }
+        $path = '/' . $slug;
+
+        return $this->repository->getDocumentByPath($path, $state);
+    }
+
+    /**
+     * @param $postValues
+     * @param $state
+     *
+     * @throws \Exception
+     */
+    public function saveDocument($postValues, $state = 'unpublished')
+    {
+        if (!in_array($state, Document::$DOCUMENT_STATES)) {
+            throw new \Exception('Unsupported document state: ' . $state);
+        }
+        $oldPath = '/' . $postValues['path'];
+
+        $container = $this->getDocumentContainerByPath($oldPath);
+        $documentObject = DocumentFactory::createDocumentFromPostValues($postValues, new DocumentTypesStorage($this->repository));
+        if ($container->path === '/') {
+            $newPath = $container->path . $documentObject->slug;
+        } else {
+            $newPath = $container->path . '/' . $documentObject->slug;
+        }
+        $documentObject->path = $newPath;
+        $this->repository->saveDocument($documentObject, $state);
+    }
+
+    /**
+     * @param        $postValues
+     * @param string $state
+     */
+    public function addDocument($postValues, $state = 'unpublished')
+    {
+        $documentObject = DocumentFactory::createDocumentFromPostValues($postValues, new DocumentTypesStorage($this->repository));
+        if ($postValues['path'] === '/') {
+            $documentObject->path = $postValues['path'] . $documentObject->slug;
+        } else {
+            $documentObject->path = $postValues['path'] . '/' . $documentObject->slug;
+        }
+
+        $this->repository->saveDocument($documentObject, $state);
+    }
+
+    /**
+     * @param $slug
+     */
+    public function deleteDocumentBySlug($slug)
+    {
+        $path = '/' . $slug;
+        $this->repository->deleteDocumentByPath($path);
+    }
+
+    /**
+     * Returns the folder containing the document
+     *
+     * @param $path
+     *
+     * @return bool|\CloudControl\Cms\storage\Document
+     * @throws \Exception
+     */
+    private function getDocumentContainerByPath($path)
+    {
+        return $this->repository->getDocumentContainerByPath($path);
+    }
+
+    public function getPublishedDocumentsNoFolders()
+    {
+        return $this->repository->getPublishedDocumentsNoFolders();
+    }
+
+    public function cleanPublishedDeletedDocuments()
+    {
+        $this->repository->cleanPublishedDeletedDocuments();
+    }
 
 }
\ No newline at end of file

src/storage/storage/AbstractStorage.php

Indentation +53 added lines, -53 removed lines

@@ -11,63 +11,63 @@
 
 abstract class AbstractStorage
 {
-	/**
-	 * @var Repository
-	 */
-	protected $repository;
+    /**
+     * @var Repository
+     */
+    protected $repository;
 
-	public function __construct($repository)
-	{
-		$this->repository = $repository;
-	}
+    public function __construct($repository)
+    {
+        $this->repository = $repository;
+    }
 
-	/**
-	 * Converts filename to lowercase, remove non-ascii chars
-	 * And adds "-copy" if the file already exists
-	 *
-	 * @param $filename
-	 * @param $path
-	 *
-	 * @return string
-	 */
-	protected function validateFilename($filename, $path)
-	{
-		$fileParts = explode('.', $filename);
-		if (count($fileParts) > 1) {
-			$extension = end($fileParts);
-			array_pop($fileParts);
-			$fileNameWithoutExtension = implode('-', $fileParts);
-			$fileNameWithoutExtension = StringUtil::slugify($fileNameWithoutExtension);
-			$filename = $fileNameWithoutExtension . '.' . $extension;
-		} else {
-			$filename = StringUtil::slugify($filename);
-		}
+    /**
+     * Converts filename to lowercase, remove non-ascii chars
+     * And adds "-copy" if the file already exists
+     *
+     * @param $filename
+     * @param $path
+     *
+     * @return string
+     */
+    protected function validateFilename($filename, $path)
+    {
+        $fileParts = explode('.', $filename);
+        if (count($fileParts) > 1) {
+            $extension = end($fileParts);
+            array_pop($fileParts);
+            $fileNameWithoutExtension = implode('-', $fileParts);
+            $fileNameWithoutExtension = StringUtil::slugify($fileNameWithoutExtension);
+            $filename = $fileNameWithoutExtension . '.' . $extension;
+        } else {
+            $filename = StringUtil::slugify($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;
-			} else {
-				$filename .= '-copy';
-			}
+        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;
+            } else {
+                $filename .= '-copy';
+            }
 
-			return $this->validateFilename($filename, $path);
-		}
+            return $this->validateFilename($filename, $path);
+        }
 
-		return $filename;
-	}
+        return $filename;
+    }
 
-	/**
-	 * Save changes made to the repository
-	 *
-	 * @throws \Exception
-	 */
-	protected function save()
-	{
-		$this->repository->save();
-	}
+    /**
+     * Save changes made to the repository
+     *
+     * @throws \Exception
+     */
+    protected function save()
+    {
+        $this->repository->save();
+    }
 }
\ No newline at end of file

src/storage/storage/ApplicationComponentsStorage.php

Indentation +64 added lines, -64 removed lines

@@ -10,75 +10,75 @@
 
 class ApplicationComponentsStorage extends AbstractStorage
 {
-	/**
-	 * @return array
-	 */
-	public function getApplicationComponents()
-	{
-		return $this->repository->applicationComponents;
-	}
+    /**
+     * @return array
+     */
+    public function getApplicationComponents()
+    {
+        return $this->repository->applicationComponents;
+    }
 
-	/**
-	 * @param $postValues
-	 */
-	public function addApplicationComponent($postValues)
-	{
-		$applicationComponent = ApplicationComponentFactory::createApplicationComponentFromPostValues($postValues);
-		$applicationComponents = $this->repository->applicationComponents;
-		$applicationComponents[] = $applicationComponent;
-		$this->repository->applicationComponents = $applicationComponents;
+    /**
+     * @param $postValues
+     */
+    public function addApplicationComponent($postValues)
+    {
+        $applicationComponent = ApplicationComponentFactory::createApplicationComponentFromPostValues($postValues);
+        $applicationComponents = $this->repository->applicationComponents;
+        $applicationComponents[] = $applicationComponent;
+        $this->repository->applicationComponents = $applicationComponents;
 
-		$this->save();
-	}
+        $this->save();
+    }
 
-	/**
-	 * @param $slug
-	 *
-	 * @return mixed|null
-	 */
-	public function getApplicationComponentBySlug($slug)
-	{
-		$applicationComponents = $this->getApplicationComponents();
-		foreach ($applicationComponents as $applicationComponent) {
-			if ($applicationComponent->slug == $slug) {
-				return $applicationComponent;
-			}
-		}
+    /**
+     * @param $slug
+     *
+     * @return mixed|null
+     */
+    public function getApplicationComponentBySlug($slug)
+    {
+        $applicationComponents = $this->getApplicationComponents();
+        foreach ($applicationComponents as $applicationComponent) {
+            if ($applicationComponent->slug == $slug) {
+                return $applicationComponent;
+            }
+        }
 
-		return null;
-	}
+        return null;
+    }
 
-	/**
-	 * @param $slug
-	 * @param $postValues
-	 */
-	public function saveApplicationComponent($slug, $postValues)
-	{
-		$newApplicationComponent = ApplicationComponentFactory::createApplicationComponentFromPostValues($postValues);
+    /**
+     * @param $slug
+     * @param $postValues
+     */
+    public function saveApplicationComponent($slug, $postValues)
+    {
+        $newApplicationComponent = ApplicationComponentFactory::createApplicationComponentFromPostValues($postValues);
 
-		$applicationComponents = $this->getApplicationComponents();
-		foreach ($applicationComponents as $key => $applicationComponent) {
-			if ($applicationComponent->slug == $slug) {
-				$applicationComponents[$key] = $newApplicationComponent;
-			}
-		}
-		$this->repository->applicationComponents = $applicationComponents;
-		$this->save();
-	}
+        $applicationComponents = $this->getApplicationComponents();
+        foreach ($applicationComponents as $key => $applicationComponent) {
+            if ($applicationComponent->slug == $slug) {
+                $applicationComponents[$key] = $newApplicationComponent;
+            }
+        }
+        $this->repository->applicationComponents = $applicationComponents;
+        $this->save();
+    }
 
-	/**
-	 * @param $slug
-	 */
-	public function deleteApplicationComponentBySlug($slug)
-	{
-		$applicationComponents = $this->getApplicationComponents();
-		foreach ($applicationComponents as $key => $applicationComponent) {
-			if ($applicationComponent->slug == $slug) {
-				unset($applicationComponents[$key]);
-			}
-		}
-		$applicationComponents = array_values($applicationComponents);
-		$this->repository->applicationComponents = $applicationComponents;
-		$this->save();
-	}
+    /**
+     * @param $slug
+     */
+    public function deleteApplicationComponentBySlug($slug)
+    {
+        $applicationComponents = $this->getApplicationComponents();
+        foreach ($applicationComponents as $key => $applicationComponent) {
+            if ($applicationComponent->slug == $slug) {
+                unset($applicationComponents[$key]);
+            }
+        }
+        $applicationComponents = array_values($applicationComponents);
+        $this->repository->applicationComponents = $applicationComponents;
+        $this->save();
+    }
 }
\ No newline at end of file

src/storage/storage/SitemapStorage.php

Indentation +100 added lines, -100 removed lines

@@ -12,111 +12,111 @@
 
 class SitemapStorage extends AbstractStorage
 {
-	/**
-	 * @return array
-	 */
-	public function getSitemap()
-	{
-		return $this->repository->sitemap;
-	}
+    /**
+     * @return array
+     */
+    public function getSitemap()
+    {
+        return $this->repository->sitemap;
+    }
 
-	/**
-	 * Add a sitemap item
-	 *
-	 * @param $postValues
-	 *
-	 * @throws \Exception
-	 */
-	public function addSitemapItem($postValues)
-	{
-		$sitemapObject = SitemapItemFactory::createSitemapItemFromPostValues($postValues);
-		$sitemap = $this->repository->sitemap;
-		$sitemap[] = $sitemapObject;
-		$this->repository->sitemap = $sitemap;
-		$this->save();
-	}
+    /**
+     * Add a sitemap item
+     *
+     * @param $postValues
+     *
+     * @throws \Exception
+     */
+    public function addSitemapItem($postValues)
+    {
+        $sitemapObject = SitemapItemFactory::createSitemapItemFromPostValues($postValues);
+        $sitemap = $this->repository->sitemap;
+        $sitemap[] = $sitemapObject;
+        $this->repository->sitemap = $sitemap;
+        $this->save();
+    }
 
-	/**
-	 * Save changes to a sitemap item
-	 *
-	 * @param $slug
-	 * @param $postValues
-	 *
-	 * @throws \Exception
-	 */
-	public function saveSitemapItem($slug, $postValues)
-	{
-		$sitemapObject = SitemapItemFactory::createSitemapItemFromPostValues($postValues);
+    /**
+     * Save changes to a sitemap item
+     *
+     * @param $slug
+     * @param $postValues
+     *
+     * @throws \Exception
+     */
+    public function saveSitemapItem($slug, $postValues)
+    {
+        $sitemapObject = SitemapItemFactory::createSitemapItemFromPostValues($postValues);
 
-		$sitemap = $this->repository->sitemap;
-		foreach ($sitemap as $key => $sitemapItem) {
-			if ($sitemapItem->slug == $slug) {
-				$sitemap[$key] = $sitemapObject;
-			}
-		}
-		$this->repository->sitemap = $sitemap;
-		$this->save();
-	}
+        $sitemap = $this->repository->sitemap;
+        foreach ($sitemap as $key => $sitemapItem) {
+            if ($sitemapItem->slug == $slug) {
+                $sitemap[$key] = $sitemapObject;
+            }
+        }
+        $this->repository->sitemap = $sitemap;
+        $this->save();
+    }
 
-	/**
-	 * Delete a sitemap item by its slug
-	 *
-	 * @param $slug
-	 *
-	 * @throws \Exception
-	 */
-	public function deleteSitemapItemBySlug($slug)
-	{
-		$sitemap = $this->repository->sitemap;
-		foreach ($sitemap as $key => $sitemapItem) {
-			if ($sitemapItem->slug == $slug) {
-				unset($sitemap[$key]);
-			}
-		}
-		$sitemap = array_values($sitemap);
-		$this->repository->sitemap = $sitemap;
-		$this->save();
-	}
+    /**
+     * Delete a sitemap item by its slug
+     *
+     * @param $slug
+     *
+     * @throws \Exception
+     */
+    public function deleteSitemapItemBySlug($slug)
+    {
+        $sitemap = $this->repository->sitemap;
+        foreach ($sitemap as $key => $sitemapItem) {
+            if ($sitemapItem->slug == $slug) {
+                unset($sitemap[$key]);
+            }
+        }
+        $sitemap = array_values($sitemap);
+        $this->repository->sitemap = $sitemap;
+        $this->save();
+    }
 
-	/**
-	 * Save changes to a sitemap item
-	 *
-	 * @param $postValues
-	 *
-	 * @throws \Exception
-	 */
-	public function saveSitemap($postValues)
-	{
-		if (isset($postValues['sitemapitem']) && is_array($postValues['sitemapitem'])) {
-			$sitemap = array();
-			foreach ($postValues['sitemapitem'] as $sitemapItem) {
-				$sitemapItemObject = json_decode($sitemapItem);
-				if (isset($sitemapItemObject->object)) {
-					unset($sitemapItemObject->object);
-				}
-				$sitemap[] = $sitemapItemObject;
-			}
-			$this->repository->sitemap = $sitemap;
-			$this->save();
-		}
-	}
+    /**
+     * Save changes to a sitemap item
+     *
+     * @param $postValues
+     *
+     * @throws \Exception
+     */
+    public function saveSitemap($postValues)
+    {
+        if (isset($postValues['sitemapitem']) && is_array($postValues['sitemapitem'])) {
+            $sitemap = array();
+            foreach ($postValues['sitemapitem'] as $sitemapItem) {
+                $sitemapItemObject = json_decode($sitemapItem);
+                if (isset($sitemapItemObject->object)) {
+                    unset($sitemapItemObject->object);
+                }
+                $sitemap[] = $sitemapItemObject;
+            }
+            $this->repository->sitemap = $sitemap;
+            $this->save();
+        }
+    }
 
-	/**
-	 * Get a sitemap item by its slug
-	 *
-	 * @param $slug
-	 *
-	 * @return mixed
-	 */
-	public function getSitemapItemBySlug($slug)
-	{
-		$sitemap = $this->repository->sitemap;
-		foreach ($sitemap as $sitemapItem) {
-			if ($sitemapItem->slug == $slug) {
-				return $sitemapItem;
-			}
-		}
+    /**
+     * Get a sitemap item by its slug
+     *
+     * @param $slug
+     *
+     * @return mixed
+     */
+    public function getSitemapItemBySlug($slug)
+    {
+        $sitemap = $this->repository->sitemap;
+        foreach ($sitemap as $sitemapItem) {
+            if ($sitemapItem->slug == $slug) {
+                return $sitemapItem;
+            }
+        }
 
-		return null;
-	}
+        return null;
+    }
 }
\ No newline at end of file