newicon / neon

neon/firefly/migrations/m170830_121945_firefly_change_local_drive_to_media.php

Indentation +9 added lines, -9 removed lines

@@ -4,17 +4,17 @@
 
 class m170830_121945_firefly_change_local_drive_to_media extends Migration
 {
-    public function safeUp()
-    {
-        $this->execute('UPDATE firefly_file_manager SET drive = "media" WHERE drive = "local"');
-    }
+	public function safeUp()
+	{
+		$this->execute('UPDATE firefly_file_manager SET drive = "media" WHERE drive = "local"');
+	}
 
-    public function safeDown()
-    {
-        $this->execute('UPDATE firefly_file_manager SET drive = "local" WHERE drive = "media"');
-    }
+	public function safeDown()
+	{
+		$this->execute('UPDATE firefly_file_manager SET drive = "local" WHERE drive = "media"');
+	}
 
-    /*
+	/*
     // Use up()/down() to run migration code without a transaction.
     public function up()
     {

neon/firefly/migrations/m161123_191412_firefly_files_table.php

Indentation +6 added lines, -6 removed lines

@@ -5,8 +5,8 @@ 
 
 class m161123_191412_firefly_files_table extends Migration
 {
-    public function safeUp()
-    {
+	public function safeUp()
+	{
 		$this->createTable(DbFile::tableName(), [
 			// limit the path size on the db file storage driver.
 			// otherwise the key gets too big.
@@ -35,11 +35,11 @@ 
 			'created_at' => $this->datetime()->comment('When the file was first created'),
 			'PRIMARY KEY (`path`(150))'
 		]);
-    }
+	}
 
-    public function safeDown()
-    {
+	public function safeDown()
+	{
 		$this->dropTable(DbFile::tableName());
-    }
+	}
 
 }

neon/firefly/migrations/m170312_165920_firefly_firefly_fix_uuid_collation.php

Indentation +6 added lines, -6 removed lines

@@ -4,15 +4,15 @@
 
 class m170312_165920_firefly_firefly_fix_uuid_collation extends Migration
 {
-    public function safeUp()
-    {
+	public function safeUp()
+	{
 		$query = "ALTER TABLE `firefly_file_manager` CHANGE `uuid` `uuid` CHAR(22) CHARACTER SET latin1 COLLATE latin1_general_cs NOT NULL COMMENT 'The unique identifier for this file'";
 		$this->execute($query);
-    }
+	}
 
-    public function safeDown()
-    {
+	public function safeDown()
+	{
 		$query = "ALTER TABLE `firefly_file_manager` CHANGE `uuid` `uuid` CHAR(22) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL COMMENT 'The unique identifier for this file'";
 		$this->execute($query);
-    }
+	}
 }

neon/firefly/migrations/m161126_123100_firefly_file_manager.php

Indentation +6 added lines, -6 removed lines

@@ -6,8 +6,8 @@ 
 class m161126_123100_firefly_file_manager extends Migration
 {
 
-    public function safeUp()
-    {
+	public function safeUp()
+	{
 		$this->createTable(FileManager::tableName(), [
 
 			'uuid' => $this->char(36)->notNull()->comment('The uuid for this file'),
@@ -35,11 +35,11 @@ 
 			'PRIMARY KEY (uuid)'
 
 		]);
-    }
+	}
 
-    public function safeDown()
-    {
+	public function safeDown()
+	{
 		$this->dropTable(FileManager::tableName());
-    }
+	}
 
 }

neon/firefly/migrations/m161130_132459_firefly_uuid_change_to_22_chars.php

Indentation +6 added lines, -6 removed lines

@@ -4,13 +4,13 @@
 
 class m161130_132459_firefly_uuid_change_to_22_chars extends Migration
 {
-    public function safeUp()
-    {
+	public function safeUp()
+	{
 		$this->alterColumn('firefly_file_manager', 'uuid', "CHAR(22) NOT NULL COMMENT 'The unique identifier for this file'");
-    }
+	}
 
-    public function safeDown()
-    {
+	public function safeDown()
+	{
 		$this->alterColumn('firefly_file_manager', 'uuid', "CHAR(36) NOT NULL COMMENT 'The uuid for this file'");
-    }
+	}
 }

neon/firefly/migrations/m190204_134239_firefly_interface_change_db_fix.php

Spacing +4 added lines, -4 removed lines

@@ -33,7 +33,7 @@ 
 	private function convertFireflyGetsToFiles($search, $replace)
 	{
 		$potentiallyAffected = $this->db->createCommand("SELECT `class_type`, `member_ref` FROM `dds_member` WHERE `data_type_ref`='textlong'")->queryAll();
-		if (count($potentiallyAffected)==0)
+		if (count($potentiallyAffected) == 0)
 			return;
 		$classes = [];
 		foreach ($potentiallyAffected as $pa)
@@ -70,21 +70,21 @@ 
 
 		$dds = neon('dds')->IDdsObjectManagement;
 		foreach ($wysiwygFields as $classType => $fields) {
-			$start=0;
+			$start = 0;
 			do {
 				$found = $dds->listObjects($classType, $total, true, true, $start, 100);
 				$start += count($found);
 				foreach ($found as $objectData) {
 					$changes = [];
 					foreach ($fields as $field) {
-						if (!empty($objectData[$field]) && strpos($objectData[$field],$search)!==false)
+						if (!empty($objectData[$field]) && strpos($objectData[$field], $search) !== false)
 							$changes[$field] = str_replace($search, $replace, $objectData[$field]);
 					}
 					if (count($changes)) {
 						$dds->editObject($objectData['_uuid'], $changes);
 					}
 				}
-			} while (count($found)>0);
+			} while (count($found) > 0);
 		}
 
 		return true;

Braces +15 added lines, -10 removed lines

@@ -33,22 +33,26 @@ 
 	private function convertFireflyGetsToFiles($search, $replace)
 	{
 		$potentiallyAffected = $this->db->createCommand("SELECT `class_type`, `member_ref` FROM `dds_member` WHERE `data_type_ref`='textlong'")->queryAll();
-		if (count($potentiallyAffected)==0)
-			return;
+		if (count($potentiallyAffected)==0) {
+					return;
+		}
 		$classes = [];
-		foreach ($potentiallyAffected as $pa)
-			$classes[$pa['class_type']][] = $pa['member_ref'];
+		foreach ($potentiallyAffected as $pa) {
+					$classes[$pa['class_type']][] = $pa['member_ref'];
+		}
 		$phoebeClasses = array_keys($classes);
 		$phoebe = neon('phoebe')->getIPhoebeType('daedalus');
 
 		$phoebeDefinition = [];
-		foreach ($phoebeClasses as $pc)
-			$phoebeDefinition[$pc] = $phoebe->getClass($pc, null, false);
+		foreach ($phoebeClasses as $pc) {
+					$phoebeDefinition[$pc] = $phoebe->getClass($pc, null, false);
+		}
 
 		$potentiallyAffectedLookup = [];
 		foreach ($potentiallyAffected as $pa) {
-			if (empty($potentiallyAffectedLookup[$pa['class_type']]))
-				$potentiallyAffectedLookup[$pa['class_type']] = [];
+			if (empty($potentiallyAffectedLookup[$pa['class_type']])) {
+							$potentiallyAffectedLookup[$pa['class_type']] = [];
+			}
 			$potentiallyAffectedLookup[$pa['class_type']][] = $pa['member_ref'];
 		}
 
@@ -77,8 +81,9 @@ 
 				foreach ($found as $objectData) {
 					$changes = [];
 					foreach ($fields as $field) {
-						if (!empty($objectData[$field]) && strpos($objectData[$field],$search)!==false)
-							$changes[$field] = str_replace($search, $replace, $objectData[$field]);
+						if (!empty($objectData[$field]) && strpos($objectData[$field],$search)!==false) {
+													$changes[$field] = str_replace($search, $replace, $objectData[$field]);
+						}
 					}
 					if (count($changes)) {
 						$dds->editObject($objectData['_uuid'], $changes);

neon/firefly/App.php

Spacing +5 added lines, -5 removed lines

@@ -203,7 +203,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function getImage($uuid, $params=[])
+	public function getImage($uuid, $params = [])
 	{
 		return $this->fileManager->getImage($uuid, $params);
 	}
@@ -300,7 +300,7 @@ 
 	 * @param  string  $name
 	 * @return \neon\firefly\services\driveManager\interfaces\IFileSystem
 	 */
-	public function drive($name=null)
+	public function drive($name = null)
 	{
 		return $this->driveManager->drive($name);
 	}
@@ -308,7 +308,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function sendFile($uuid, $download=false)
+	public function sendFile($uuid, $download = false)
 	{
 		return $this->fileManager->sendFile($uuid, $download);
 	}
@@ -364,7 +364,7 @@ 
 	 * @param boolean $throwExceptions - whether to throw exceptions on validation failure
 	 * @return boolean
 	 */
-	public function isFileObjectValid($file, $throwExceptions=true)
+	public function isFileObjectValid($file, $throwExceptions = true)
 	{
 		if ($file instanceof IFile)
 			return true;
@@ -374,7 +374,7 @@ 
 			&& method_exists($file, 'getRealPath')
 			&& method_exists($file, 'getFilename');
 		// the $file param must be an object with getRealPath and getFilename functions
-		if (! $objectIsValid && $throwExceptions) {
+		if (!$objectIsValid && $throwExceptions) {
 			throw new \InvalidArgumentException('$file param must be an object with a getRealPath and getFilename method');
 		}
 		return $objectIsValid;

Braces +3 added lines, -2 removed lines

@@ -366,8 +366,9 @@
 	 */
 	public function isFileObjectValid($file, $throwExceptions=true)
 	{
-		if ($file instanceof IFile)
-			return true;
+		if ($file instanceof IFile) {
+					return true;
+		}
 		// not all objects have the privilege of implementing the IFile interface like \SplFileObject
 		// Firefly only cares about these two functions 'getRealPath' and 'getFilename'
 		$objectIsValid = is_object($file)

neon/cms/components/Renderer.php

Spacing +5 added lines, -5 removed lines

@@ -58,8 +58,8 @@ 
 		$this->registerDefaultPluginHandler([$this, 'pluginHandler']);
 		// We have to set cachable to false otherwise it only caches the id output not the full rendering
 		$this->registerPlugin(Smarty::PLUGIN_FUNCTION, 'widget', ['\neon\cms\components\Widget', 'factory'], false);
-		$this->registerPlugin(Smarty::PLUGIN_BLOCK, 'drop_zone', [$this, 'layout'] , false);
-		$this->registerPlugin(Smarty::PLUGIN_FUNCTION, 'layout', [$this, 'layout'] , false);
+		$this->registerPlugin(Smarty::PLUGIN_BLOCK, 'drop_zone', [$this, 'layout'], false);
+		$this->registerPlugin(Smarty::PLUGIN_FUNCTION, 'layout', [$this, 'layout'], false);
 
 		$this->registerPlugin(Smarty::PLUGIN_FUNCTION, 'asset', [$this, 'asset']);
 		$this->registerPlugin(Smarty::PLUGIN_FUNCTION, 'dds', ['\neon\cms\components\Daedalus', 'dds'], false);
@@ -230,7 +230,7 @@ 
 	 * @throws \InvalidArgumentException if no page object is currently set and no id was specified
 	 * @return string  the page URL
 	 */
-	public function page_url($params, $smarty=null)
+	public function page_url($params, $smarty = null)
 	{
 		$id = Arr::get($params, 'id', Arr::get($params, 'nice', false));
 		if ($id === '#') return '#';
@@ -265,7 +265,7 @@ 
 	{
 		$pages = Arr::getRequired($params, 'id');
 		$allPages = is_array($pages) ? $pages : [$pages];
-		$urls = []; foreach ($allPages as $page) $urls[] =  $this->page_url(['id' => $page]);
+		$urls = []; foreach ($allPages as $page) $urls[] = $this->page_url(['id' => $page]);
 		return Url::isUrl($urls);
 	}
 
@@ -280,7 +280,7 @@ 
 			//
 
 
-			return 'hello  -- ' . $content . '---';
+			return 'hello  -- '.$content.'---';
 
 		}
 	}

Braces +21 added lines, -12 removed lines

@@ -34,12 +34,14 @@ 
 		// set up the theme directories
 		foreach ($themeHierarchy as $theme) {
 			if (isset($theme['templates'])) {
-				foreach ($theme['templates'] as $tplDir)
-					$this->addTemplateDir($tplDir);
+				foreach ($theme['templates'] as $tplDir) {
+									$this->addTemplateDir($tplDir);
+				}
 			}
 			if (isset($theme['plugins'])) {
-				foreach ($theme['plugins'] as $pluginDir)
-					$this->addPluginsDir($pluginDir);
+				foreach ($theme['plugins'] as $pluginDir) {
+									$this->addPluginsDir($pluginDir);
+				}
 			}
 		}
 
@@ -153,8 +155,9 @@ 
 		$this->assign('site', $this->_page->getSiteData());
 
 		// an expensive-ish call so reduce need for it in repeated renders
-		if (!isset($templates[$template]))
-			$templates[$template] = $this->createTemplate($template);
+		if (!isset($templates[$template])) {
+					$templates[$template] = $this->createTemplate($template);
+		}
 		$tpl = $templates[$template];
 
 		// reset any parameters for the new render
@@ -233,7 +236,9 @@ 
 	public function page_url($params, $smarty=null)
 	{
 		$id = Arr::get($params, 'id', Arr::get($params, 'nice', false));
-		if ($id === '#') return '#';
+		if ($id === '#') {
+			return '#';
+		}
 		if ($id) {
 			$url = $this->getPage()->getUrlOfPageByNiceId($id);
 		} else if (!$id && $this->getPage()->hasPage()) {
@@ -241,11 +246,13 @@ 
 		} else {
 			throw new \InvalidArgumentException('There is no current page - and no id or nice parameter was specified');
 		}
-		if (!empty($params['prefix']))
-			$url = $params['prefix'].$url;
+		if (!empty($params['prefix'])) {
+					$url = $params['prefix'].$url;
+		}
 
-		if (isset($params['full']))
-			return url_base()."$url";
+		if (isset($params['full'])) {
+					return url_base()."$url";
+		}
 		return $url;
 	}
 
@@ -265,7 +272,9 @@ 
 	{
 		$pages = Arr::getRequired($params, 'id');
 		$allPages = is_array($pages) ? $pages : [$pages];
-		$urls = []; foreach ($allPages as $page) $urls[] =  $this->page_url(['id' => $page]);
+		$urls = []; foreach ($allPages as $page) {
+			$urls[] =  $this->page_url(['id' => $page]);
+		}
 		return Url::isUrl($urls);
 	}
 

neon/cms/components/CmsUrlRule.php

Spacing +3 added lines, -3 removed lines

@@ -128,7 +128,7 @@ 
 	protected function loadUrl($id, $field)
 	{
 		$url = CmsUrl::find()->select("cms_url.*, cms_page.id as page_id")
-			->innerJoin('cms_page','`cms_page`.`nice_id`=`cms_url`.`nice_id`')
+			->innerJoin('cms_page', '`cms_page`.`nice_id`=`cms_url`.`nice_id`')
 			->where([$field => $id])->asArray()->one();
 		if ($url)
 			$this->storeUrl($url);
@@ -141,12 +141,12 @@ 
 	 * added using @see loadUrlByPageId
 	 * @param integer $limit  max number to load in
 	 */
-	protected function loadUrls($limit=500)
+	protected function loadUrls($limit = 500)
 	{
 		if ($this->_allUrlsByPageId === null) {
 			$urls = CmsUrl::find()
 				->select("cms_url.*, cms_page.id as page_id")
-				->innerJoin('cms_page','`cms_page`.`nice_id`=`cms_url`.`nice_id`')
+				->innerJoin('cms_page', '`cms_page`.`nice_id`=`cms_url`.`nice_id`')
 				->asArray()->limit($limit)->all();
 			$this->_allUrlsByPageId = [];
 			foreach ($urls as $u) {

Braces +12 added lines, -8 removed lines

@@ -24,8 +24,9 @@ 
 	{
 		$pathInfo = $this->getCanonicalPathFromRequest($request);
 		$found = neon('cms')->page->setByUrl($pathInfo);
-		if ($found)
-			$pageData = neon('cms')->page->getPageData();
+		if ($found) {
+					$pageData = neon('cms')->page->getPageData();
+		}
 		return $found ? [$this->cmsRoute, ['nice_id' => $pageData['nice_id']]] : false;
 	}
 
@@ -101,8 +102,9 @@ 
 	protected function loadUrlByPageId($id)
 	{
 		$this->loadUrls();
-		if (isset($this->_allUrlsByPageId[$id]))
-			return $this->_allUrlsByPageId[$id];
+		if (isset($this->_allUrlsByPageId[$id])) {
+					return $this->_allUrlsByPageId[$id];
+		}
 		return $this->loadUrl($id, 'cms_page.id');
 	}
 
@@ -114,8 +116,9 @@ 
 	protected function loadUrlByNiceId($id)
 	{
 		$this->loadUrls();
-		if (isset($this->_allUrlsByNiceId[$id]))
-			return $this->_allUrlsByNiceId[$id];
+		if (isset($this->_allUrlsByNiceId[$id])) {
+					return $this->_allUrlsByNiceId[$id];
+		}
 		return $this->loadUrl($id, 'cms_url.nice_id');
 	}
 
@@ -130,8 +133,9 @@ 
 		$url = CmsUrl::find()->select("cms_url.*, cms_page.id as page_id")
 			->innerJoin('cms_page','`cms_page`.`nice_id`=`cms_url`.`nice_id`')
 			->where([$field => $id])->asArray()->one();
-		if ($url)
-			$this->storeUrl($url);
+		if ($url) {
+					$this->storeUrl($url);
+		}
 		return $url;
 	}