newicon / neon

neon/firefly/services/MediaManager.php

Spacing +11 added lines, -11 removed lines

@@ -76,7 +76,7 @@ 
 		$bits = explode('/', $path);
 		$bitsCurrent = [];
 		$parts = [];
-		foreach($bits as $i => $bit) {
+		foreach ($bits as $i => $bit) {
 			$bitsCurrent[] = $bit;
 			if ($i == 0) continue;
 			$parts[] = implode('/', $bitsCurrent);
@@ -118,7 +118,7 @@ 
 	 * @param array $filters - array of additional search filters passed to Query where clause
 	 * @return array|\yii\db\ActiveRecord[]
 	 */
-	private function _listQuery($directory = '', $withDeleted=false, $filters=[])
+	private function _listQuery($directory = '', $withDeleted = false, $filters = [])
 	{
 		$directory = $this->getRealPath($directory);
 		$item = Media::findDirectoryByPath($directory, $withDeleted);
@@ -142,7 +142,7 @@ 
 
 		return collect($items)->map(function($item) use ($filesIndex) {
 			$file = $filesIndex->get($item['id']);
-			$item['concatName'] = $item['path'] .'/'. ($file ? $file['name'] : '');
+			$item['concatName'] = $item['path'].'/'.($file ? $file['name'] : '');
 			$item['file'] = $file;
 			$item['path'] = Media::formatPath($item['path']);
 			return $item;
@@ -152,7 +152,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function listContents($directory = '', $withDeleted=false)
+	public function listContents($directory = '', $withDeleted = false)
 	{
 		return $this->_listQuery($directory, $withDeleted);
 	}
@@ -173,7 +173,7 @@ 
 		$items = $query->all();
 
 
-		foreach($items as $key => $item) {
+		foreach ($items as $key => $item) {
 			$items[$key]['path'] = Media::formatPath($item['path']);
 		}
 		return $items;
@@ -182,7 +182,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function addFile($id, $path='/')
+	public function addFile($id, $path = '/')
 	{
 		// Find the file
 		$fileMeta = neon()->firefly->getMeta($id);
@@ -255,7 +255,7 @@ 
 
 
 		// make sure it does not already exist
-		if (! empty(Media::findDirectoryByPath($newPath))) {
+		if (!empty(Media::findDirectoryByPath($newPath))) {
 			throw new DirectoryExistsException("The directory '$newPath' already exists");
 		}
 		$node->path = $newPath;
@@ -288,7 +288,7 @@ 
 	 */
 	public function setRootPath($path)
 	{
-		$this->_rootPath = rtrim($path, '/') . '/';
+		$this->_rootPath = rtrim($path, '/').'/';
 	}
 
 	/**
@@ -353,7 +353,7 @@ 
 			->where(['deleted' => 1])
 			->all();
 		$destroyed = [];
-		foreach($items as $item) {
+		foreach ($items as $item) {
 			$destroyed[$item->id] = $item->destroy();
 		}
 		return $destroyed;
@@ -378,7 +378,7 @@ 
 		$items = Media::findAll(['id' => $items]);
 		// update each item
 		$success = [];
-		foreach($items as $item) {
+		foreach ($items as $item) {
 			$success[$item->id] = $item->moveInto($into);
 		}
 		return $success;
@@ -394,7 +394,7 @@ 
 	 */
 	public function getRealPath($path)
 	{
-		$path = $this->getRootPath() . ltrim($path, '/');
+		$path = $this->getRootPath().ltrim($path, '/');
 		return strlen($path) === 1 ? '/' : rtrim($path, '/');
 	}
 }

Braces +44 added lines, -26 removed lines

@@ -48,8 +48,9 @@ 
 		}, $paths);
 
 		if (empty($created)) {
-			if ($directory == '')
-				throw new DirectoryExistsException("The root directory already exists");
+			if ($directory == '') {
+							throw new DirectoryExistsException("The root directory already exists");
+			}
 			throw new DirectoryExistsException("The directory '$directory' already exists");
 		}
 		return $created;
@@ -78,7 +79,9 @@ 
 		$parts = [];
 		foreach($bits as $i => $bit) {
 			$bitsCurrent[] = $bit;
-			if ($i == 0) continue;
+			if ($i == 0) {
+				continue;
+			}
 			$parts[] = implode('/', $bitsCurrent);
 		}
 		return $parts;
@@ -91,14 +94,17 @@ 
 	 */
 	public function validateAbsoluteDirectoryPath($directory)
 	{
-		if (!is_string($directory))
-			throw new InvalidDirectoryException("Invalid directory parameter '$directory'. The directory must be absolute string path and start with '/'.");
+		if (!is_string($directory)) {
+					throw new InvalidDirectoryException("Invalid directory parameter '$directory'. The directory must be absolute string path and start with '/'.");
+		}
 		// must be absolute and start with /
-		if ($directory[0] !== '/')
-			throw new InvalidDirectoryException("Invalid directory parameter '$directory'. The directory must be absolute path and start with '/'.");
+		if ($directory[0] !== '/') {
+					throw new InvalidDirectoryException("Invalid directory parameter '$directory'. The directory must be absolute path and start with '/'.");
+		}
 		// prevent folders with no names being created
-		if (strpos($directory, '//') !== false)
-			throw new InvalidDirectoryException("Invalid directory parameter '$directory'. You can not have empty path sections containing '//' each directory needs a name.");
+		if (strpos($directory, '//') !== false) {
+					throw new InvalidDirectoryException("Invalid directory parameter '$directory'. You can not have empty path sections containing '//' each directory needs a name.");
+		}
 	}
 
 	/**
@@ -123,7 +129,9 @@ 
 		$directory = $this->getRealPath($directory);
 		$item = Media::findDirectoryByPath($directory, $withDeleted);
 
-		if (empty($item)) return [];
+		if (empty($item)) {
+			return [];
+		}
 
 		$m = Media::tableName();
 		$f = FileManager::tableName();
@@ -132,8 +140,9 @@ 
 			->orderBy("type ASC, $m.path, $f.name ASC")
 			->leftJoin(FileManager::tableName(), "id = $f.uuid")
 			->asArray();
-		if (!empty($filters))
-			$query->where($filters);
+		if (!empty($filters)) {
+					$query->where($filters);
+		}
 		$items = $query->all();
 
 		$ids = collect($items)->pluck('id');
@@ -218,10 +227,11 @@ 
 			throw new BadRequestHttpException('A name cannot contain a "/" character');
 		}
 
-		if ($node->isDir())
-			$this->_updateDirectoryName($node, $name);
-		else
-			$this->_updateFileName($node, $name);
+		if ($node->isDir()) {
+					$this->_updateDirectoryName($node, $name);
+		} else {
+					$this->_updateFileName($node, $name);
+		}
 		return true;
 	}
 
@@ -297,7 +307,9 @@ 
 	public function getDirectoryMeta($path)
 	{
 		$dir = Media::findDirectoryByPath($path);
-		if ($dir === null) return [];
+		if ($dir === null) {
+			return [];
+		}
 		return $dir->toArray();
 	}
 
@@ -307,7 +319,9 @@ 
 	public function getMeta($id)
 	{
 		$item = Media::find()->where(['id' => $id])->asArray()->one();
-		if ($item === null) return [];
+		if ($item === null) {
+			return [];
+		}
 		if ($item['type'] === 'file') {
 			$item['file'] = neon()->firefly->fileManager->getMeta($id);
 		}
@@ -320,8 +334,9 @@ 
 	public function delete($id)
 	{
 		$item = Media::findOne($id);
-		if ($item === null)
-			throw new NotFoundHttpException("No item with id '$id' could be found'");
+		if ($item === null) {
+					throw new NotFoundHttpException("No item with id '$id' could be found'");
+		}
 		$result = $item->delete();
 		if ($result === false) {
 			return $item->getErrors();
@@ -335,8 +350,9 @@ 
 	public function destroy($id)
 	{
 		$item = Media::findWithDeleted()->where(['id' => $id])->one();
-		if ($item === null)
-			throw new NotFoundHttpException("No item with id '$id' could be found'");
+		if ($item === null) {
+					throw new NotFoundHttpException("No item with id '$id' could be found'");
+		}
 		return $item->destroy();
 	}
 
@@ -368,11 +384,13 @@ 
 		$into = Media::findOne($intoId);
 
 		// throw error if it doesn't exist
-		if ($into === null)
-			throw new NotFoundHttpException("No item with id '$intoId' could be found'");
+		if ($into === null) {
+					throw new NotFoundHttpException("No item with id '$intoId' could be found'");
+		}
 		// throw error if its not a directory
-		if (!$into->isDir())
-			throw new BadRequestHttpException("This is not a directory - you can only move items into directories");
+		if (!$into->isDir()) {
+					throw new BadRequestHttpException("This is not a directory - you can only move items into directories");
+		}
 
 		// find all items to move
 		$items = Media::findAll(['id' => $items]);

neon/cms/services/cmsEditor/Parser.php

Spacing +8 added lines, -8 removed lines

@@ -81,14 +81,14 @@ 
 	 * @since 3.8.0
 	 *
 	 */
-	function __construct($name, $attrs, $innerBlocks, $innerHTML, $innerContent, $uuid=null)
+	function __construct($name, $attrs, $innerBlocks, $innerHTML, $innerContent, $uuid = null)
 	{
 		$this->cmp = $name;
 		$this->props = $attrs;
 		//$this->innerBlocks = $innerBlocks;
 		//$this->innerHTML = $innerHTML;
 		//$this->innerContent = $innerContent;
-		if (isset($attrs['uuid']) ) {
+		if (isset($attrs['uuid'])) {
 			$uuid = $attrs['uuid'];
 		}
 		$this->uuid = $uuid ? $uuid : Hash::uuid64();
@@ -300,7 +300,7 @@ 
 				if (0 === $stack_depth) {
 					if (isset($leading_html_start)) {
 						$uuid = Hash::uuid64();
-						$this->output[$uuid] = (array)self::freeform(
+						$this->output[$uuid] = (array) self::freeform(
 							substr(
 								$this->document,
 								$leading_html_start,
@@ -308,7 +308,7 @@ 
 							), $uuid
 						);
 					}
-					$cmp = (array)new Cmp($block_name, $attrs, array(), '', array(), $uuid);
+					$cmp = (array) new Cmp($block_name, $attrs, array(), '', array(), $uuid);
 					$this->output[$cmp->uuid] = $cmp;
 					$this->offset = $start_offset + $token_length;
 					return true;
@@ -423,7 +423,7 @@ 
 		$is_void = isset($matches['void']) && -1 !== $matches['void'][1];
 		$namespace = $matches['namespace'];
 		$namespace = (isset($namespace) && -1 !== $namespace[1]) ? $namespace[0] : ''; // 'core/';
-		$name = $namespace . $matches['name'][0];
+		$name = $namespace.$matches['name'][0];
 		$has_attrs = isset($matches['attrs']) && -1 !== $matches['attrs'][1];
 		/*
 		 * Fun fact! It's not trivial in PHP to create "an empty associative array" since all arrays
@@ -477,7 +477,7 @@ 
 			return;
 		}
 		$uuid = Hash::uuid64();
-		$this->output[$uuid] = (array)self::freeform(substr($this->document, $this->offset, $length), $uuid);
+		$this->output[$uuid] = (array) self::freeform(substr($this->document, $this->offset, $length), $uuid);
 	}
 
 	/**
@@ -526,7 +526,7 @@ 
 		}
 		if (isset($stack_top->leading_html_start)) {
 			$uuid = Hash::uuid64();
-			$this->output[$uuid] = (array)self::freeform(
+			$this->output[$uuid] = (array) self::freeform(
 				substr(
 					$this->document,
 					$stack_top->leading_html_start,
@@ -534,6 +534,6 @@ 
 				), $uuid
 			);
 		}
-		$this->output[$stack_top->block->uuid] = (array)$stack_top->block;
+		$this->output[$stack_top->block->uuid] = (array) $stack_top->block;
 	}
 }
\ No newline at end of file

neon/cms/services/CmpManager.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 
 class CmpManager extends \yii\base\Component
 {
-	public function getComponents(){
+	public function getComponents() {
 
 	}
 }
\ No newline at end of file

neon/cms/components/Renderer.php

Spacing +4 added lines, -4 removed lines

@@ -33,7 +33,7 @@ 
 	 * @param array $themeHierarchy
 	 * @throws \SmartyException
 	 */
-	public function __construct($page=null, array $themeHierarchy=[])
+	public function __construct($page = null, array $themeHierarchy = [])
 	{
 		parent::__construct();
 		// $this->smarty->escape_html = true;
@@ -73,8 +73,8 @@ 
 
 		// We have to set cachable to false otherwise it only caches the id output not the full rendering
 		$this->smarty->registerPlugin(Smarty::PLUGIN_FUNCTION, 'widget', ['\neon\cms\components\Widget', 'factory'], false);
-		$this->smarty->registerPlugin(Smarty::PLUGIN_BLOCK, 'editor', ['\neon\cms\components\Editor', 'editor'] , false);
-		$this->smarty->registerPlugin(Smarty::PLUGIN_BLOCK, 'drop_zone', ['\neon\cms\components\Editor', 'editor'] , false);
+		$this->smarty->registerPlugin(Smarty::PLUGIN_BLOCK, 'editor', ['\neon\cms\components\Editor', 'editor'], false);
+		$this->smarty->registerPlugin(Smarty::PLUGIN_BLOCK, 'drop_zone', ['\neon\cms\components\Editor', 'editor'], false);
 
 		$this->smarty->registerPlugin(Smarty::PLUGIN_FUNCTION, 'dds', ['\neon\cms\components\Daedalus', 'dds'], false);
 		$this->smarty->registerPlugin(Smarty::PLUGIN_FUNCTION, 'dds_choice', ['\neon\cms\components\Daedalus', 'dds_choice'], false);
@@ -206,7 +206,7 @@ 
 	 * @return string
 	 * @throws \SmartyException
 	 */
-	public function renderString($string, $saveCompile=true)
+	public function renderString($string, $saveCompile = true)
 	{
 		$smartyCmd = $saveCompile ? 'string' : 'eval';
 		return $this->smarty->fetch("$smartyCmd:$string");

Braces +12 added lines, -7 removed lines

@@ -48,12 +48,14 @@ 
 		// set up the theme directories
 		foreach ($themeHierarchy as $theme) {
 			if (isset($theme['templates'])) {
-				foreach ($theme['templates'] as $tplDir)
-					$this->smarty->addTemplateDir($tplDir);
+				foreach ($theme['templates'] as $tplDir) {
+									$this->smarty->addTemplateDir($tplDir);
+				}
 			}
 			if (isset($theme['plugins'])) {
-				foreach ($theme['plugins'] as $pluginDir)
-					$this->smarty->addPluginsDir($pluginDir);
+				foreach ($theme['plugins'] as $pluginDir) {
+									$this->smarty->addPluginsDir($pluginDir);
+				}
 			}
 		}
 
@@ -158,7 +160,9 @@ 
 
 	public static function component($params, $content, $tagName, $template, $repeat)
 	{
-		if ($repeat) return;
+		if ($repeat) {
+			return;
+		}
 		$params['content'] = $content;
 		$params['slot'] = $content;
 		$params['type'] = $tagName;
@@ -187,8 +191,9 @@ 
 		$this->smarty->assign('site', $this->_page->getSiteData());
 
 		// an expensive-ish call so reduce need for it in repeated renders
-		if (!isset($templates[$template]))
-			$templates[$template] = $this->smarty->createTemplate($template);
+		if (!isset($templates[$template])) {
+					$templates[$template] = $this->smarty->createTemplate($template);
+		}
 		$tpl = $templates[$template];
 
 		// reset any parameters for the new render

neon/cms/migrations/m140506_102106_cms_init.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 			'layout' => 'string COMMENT "the name of the layout template to load for this page"',
 			'template' => 'string COMMENT "the name of the template file"'
 		]);
-		$this->createTable(CmsUrl::tableName(),[
+		$this->createTable(CmsUrl::tableName(), [
 			'id' => 'pk',
 			'url' => 'string',
 			'page_id' => 'int',

neon/cms/migrations/deprecatedMigrations/m170106_131700_cms_page.php

Spacing +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
 		$this->run('Generating Page UUIDs and nice_ids', function() {
 			// the soft delete column has not been added yet - so lets turn off this behaviour!
 			CmsPage::$softDelete = false;
-			foreach(CmsPage::find()->each(100) as $page) {
+			foreach (CmsPage::find()->each(100) as $page) {
 				$page->id = CmsPage::uuid64();
 				$page->nice_id = "page_{$page->old_id}";
 				$page->save();
@@ -92,7 +92,7 @@ 
 			"UPDATE $cms_url INNER JOIN $cms_page ON $cms_page.nice_id = $cms_url.page_id SET `page_id` = $cms_page.old_id"
 		);
 		$this->execute("UPDATE $cms_page SET `id` = `old_id`");
-		$this->alterColumn($cms_page, 'id', $this->integer(11) . ' NOT NULL AUTO_INCREMENT');
+		$this->alterColumn($cms_page, 'id', $this->integer(11).' NOT NULL AUTO_INCREMENT');
 		$this->dropColumn($cms_page, 'old_id');
 		$this->dropColumn($cms_page, 'nice_id');
 		$this->alterColumn($cms_url, 'page_id', $this->integer(11)->comment('cms_page foreign key'));

neon/cms/migrations/m170107_201653_cms_create_cms_static_content_table_again.php

Indentation +6 added lines, -6 removed lines

@@ -4,8 +4,8 @@ 
 
 class m170107_201653_cms_create_cms_static_content_table_again extends Migration
 {
-    public function safeUp()
-    {
+	public function safeUp()
+	{
 		$cms_static = 'cms_static_content';
 
 		// recreate the table with the new structure
@@ -46,10 +46,10 @@ 
 //				}
 //			}
 //		} while ($count < $total);
-    }
+	}
 
-    public function safeDown()
-    {
+	public function safeDown()
+	{
 		$this->dropTable('cms_static_content');
-    }
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 
 		// recreate the table with the new structure
 		$this->execute("DROP TABLE IF EXISTS $cms_static");
-		$sql =<<<EOQ
+		$sql = <<<EOQ
 CREATE TABLE IF NOT EXISTS `cms_static_content` (
   `key` varchar(100) NOT NULL COMMENT 'a key to access the content' COLLATE utf8mb4_unicode_ci,
   `page_id` INT UNSIGNED NULL COMMENT 'if provided, restrict content to the associated page',

neon/cms/migrations/m170112_201653_cms_static_content_page_ids_to_uuid64.php

Indentation +8 added lines, -8 removed lines

@@ -7,23 +7,23 @@
 
 class m170112_201653_cms_static_content_page_ids_to_uuid64 extends Migration
 {
-    public function safeUp()
-    {
-    	$cms_static_content = CmsStaticContent::tableName();
+	public function safeUp()
+	{
+		$cms_static_content = CmsStaticContent::tableName();
 		$cms_page = CmsPage::tableName();
 
 		// use a nice id
-    	$this->alterColumn($cms_static_content, 'page_id', $this->char(22)->null()->comment('A uuid using base 64'));
+		$this->alterColumn($cms_static_content, 'page_id', $this->char(22)->null()->comment('A uuid using base 64'));
 		// update with nice_id's
 		$this->execute("UPDATE $cms_static_content JOIN $cms_page ON $cms_page.old_id = $cms_static_content.page_id SET $cms_static_content.page_id = $cms_page.id");
-    }
+	}
 
-    public function safeDown()
-    {
+	public function safeDown()
+	{
 		$cms_static_content = CmsStaticContent::tableName();
 		$cms_page = CmsPage::tableName();
 
 		$this->execute("UPDATE $cms_static_content JOIN $cms_page ON $cms_page.id = $cms_static_content.page_id SET $cms_static_content.page_id = $cms_page.old_id");
 		$this->alterColumn($cms_static_content, 'page_id', $this->integer(11)->null());
-    }
+	}
 }
\ No newline at end of file

neon/cms/migrations/m170121_150942_cms_delete_ddt_cms_static.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 		// created by an earlier cms migration so always appears if the
 		// migration creation order is not adhered to.
 		$connection = neon()->db;
-$sql =<<<EOQ
+$sql = <<<EOQ
 SET foreign_key_checks = 0;
 DROP TABLE IF EXISTS `ddt_cms_static_content`;
 DELETE FROM `dds_member` WHERE `class_type`='cms_static_content';