newicon / neon

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/Theme.php

Spacing +2 added lines, -2 removed lines

@@ -66,7 +66,7 @@ 
 	 * @param array &$read - the set of read components to prevent infinite looping
 	 * @return array  the set of components
 	 */
-	private static function &getComponents($path, &$components=[], &$read=[])
+	private static function &getComponents($path, &$components = [], &$read = [])
 	{
 		$root = self::getRoot();
 		$configFile = $root.$path.'/_config.php';
@@ -91,7 +91,7 @@ 
 					}
 				}
 			} catch (\Exception $e) {
-				throw new \InvalidArgumentException("Something went wrong when trying to parse the config file $configFile. The error was ".$e->getMessage(). ". The file contained <pre>".print_r($config,true)."</pre>.");
+				throw new \InvalidArgumentException("Something went wrong when trying to parse the config file $configFile. The error was ".$e->getMessage().". The file contained <pre>".print_r($config, true)."</pre>.");
 			}
 		}
 		return $components;

Braces +6 added lines, -4 removed lines

@@ -29,8 +29,9 @@ 
 			if (is_string($root) && count($themes)) {
 				foreach ($themes as $theme) {
 					$themePath = $root.$theme;
-					if (!isset($hierarchy[$theme]))
-						$hierarchy[$theme] = [];
+					if (!isset($hierarchy[$theme])) {
+											$hierarchy[$theme] = [];
+					}
 
 					// add the default template and plugin directories
 					$hierarchy[$theme]['templates'][] = $themePath;
@@ -104,8 +105,9 @@ 
 	private static function getRoot()
 	{
 		static $root = null;
-		if ($root === null)
-			$root = Neon::getAlias('@root/themes/');
+		if ($root === null) {
+					$root = Neon::getAlias('@root/themes/');
+		}
 		return $root;
 	}
 }

neon/cms/services/cmsManager/CmsManager.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 	public function bulkStaticContentRequest($requests)
 	{
 		$requestedData = [];
-		if (count($requests)>0) {
+		if (count($requests) > 0) {
 			$query = CmsStaticContent::find()
 				->select("`key`, `page_id` as `pageId`, `content`");
 			foreach ($requests as $id => $request) {

neon/cms/controllers/DataController.php

Braces +13 added lines, -10 removed lines

@@ -39,17 +39,19 @@ 
 	{
 		// see if we have a key and if not we can do nothing
 		$key = neon()->request->post('key');
-		if (empty($key))
-			return;
+		if (empty($key)) {
+					return;
+		}
 		$content = neon()->request->postUnsafe('content');
 		$content = Html::sanitise($content, $this->inlineAllowedTags);
 		$pageId = neon()->request->post('pageId', null);
 		try {
 			$result = neon('cms')->getICmsStaticData()->editStaticContent($key, $pageId, $content);
-			if ($result === true)
-				return ['success'=>true, 'saved'=>$content];
-			else
-				return neon()->debug ? ['success'=>false, 'errors'=>$result] : ['success'=>false];
+			if ($result === true) {
+							return ['success'=>true, 'saved'=>$content];
+			} else {
+							return neon()->debug ? ['success'=>false, 'errors'=>$result] : ['success'=>false];
+			}
 		} catch (\Exception $e) {
 			return neon()->debug ? ['success'=>false, 'errors'=>$e->getMessage()] : ['success'=>false];
 		}
@@ -67,10 +69,11 @@ 
 		$pageId = neon()->request->post('pageId', null);
 		try {
 			$result = neon()->cms->getICmsStaticData()->editStaticContent($key, $pageId, $content);
-			if ($result === true)
-				return ['success'=>true, 'saved'=>$content];
-			else if (neon()->debug)
-				return neon()->debug ? ['success'=>false, 'errors'=>$result] : ['success'=>false];
+			if ($result === true) {
+							return ['success'=>true, 'saved'=>$content];
+			} else if (neon()->debug) {
+							return neon()->debug ? ['success'=>false, 'errors'=>$result] : ['success'=>false];
+			}
 		} catch (\Exception $e) {
 			return neon()->debug ? ['success'=>false, 'errors'=>$e->getMessage()] : ['success'=>false];
 		}

Spacing +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
 	 * Update a static content widget
 	 * @return void
 	 */
-	public function actionUpdateContentWidget($content=null)
+	public function actionUpdateContentWidget($content = null)
 	{
 		$key = neon()->request->post('key');
 		$content = $content ? $content : neon()->request->postUnsafe('content');
@@ -88,10 +88,10 @@ 
 		$params = neon()->request->post('params', []);
 		$renderer = new Renderer(new Page());
 		$formatParams = '';
-		foreach($params as $key => $value) {
+		foreach ($params as $key => $value) {
 			$formatParams .= $key.'="'.$value.'" ';
 		}
-		$out = $renderer->renderString('{'.$tag.' '.$formatParams .' }', false);
+		$out = $renderer->renderString('{'.$tag.' '.$formatParams.' }', false);
 		return $this->getView()->renderAjaxContent($out);
 	}
 

neon/cms/migrations/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/deprecatedMigrations/m170112_211700_change_dds_page_ids_to_uuid64.php

Indentation +10 added lines, -10 removed lines

@@ -7,12 +7,12 @@ 
 
 class m170112_211700_change_dds_page_ids_to_uuid64 extends Migration
 {
-    public function safeUp()
-    {
-    	$cms_page = CmsPage::tableName();
-    	// Step 1
+	public function safeUp()
+	{
+		$cms_page = CmsPage::tableName();
+		// Step 1
 		// ------
-    	// loop through all members in the DDS and find all members with a definition using
+		// loop through all members in the DDS and find all members with a definition using
 		// {class: neon\\cms\\form\\fields\\PageSelector}
 		// or where the definition uses a `dataMapKey` of `pages` and a `dataMapProvider` of `cms`
 		$members = neon()->db->query()->select('*')->from('dds_member')->where('definition LIKE \'{"class":"neon__cms__form__fields__PageSelector%\'')->all();
@@ -47,10 +47,10 @@ 
 			}
 		}
 		$this->dropColumn($cms_page, 'old_id');
-    }
+	}
 
-    public function safeDown()
-    {
-    	echo "There is no coming back from this!\n";
-    }
+	public function safeDown()
+	{
+		echo "There is no coming back from this!\n";
+	}
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -27,14 +27,14 @@
 		// - note the `member_ref` as the $column in the ddt table  - this column will hold the previous integer based page id
 		//   which will match the cms_page.old_id column
 		foreach ($members as $member) {
-			$class_type =  $member['class_type'];
-			$ddt_table_name =  'ddt_' . $class_type;
+			$class_type = $member['class_type'];
+			$ddt_table_name = 'ddt_'.$class_type;
 			$column = $member['member_ref'];
 
 			// Step 3
 			// ------
 			// Alter the $column in $ddt_table_name to be a uuid64 (char(22))
-			$exists = $this->db->createCommand("SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE `table_name` = '$ddt_table_name' AND `table_schema` = '". env('DB_NAME')."' AND column_name = '$column'")->queryScalar();
+			$exists = $this->db->createCommand("SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE `table_name` = '$ddt_table_name' AND `table_schema` = '".env('DB_NAME')."' AND column_name = '$column'")->queryScalar();
 			if ($exists) {
 				$this->alterColumn($ddt_table_name, $column, $this->char(22)->comment("A uuid using base 64"));
 				// Update the $column value in every row in the $ddt_table_name by matching it to the cms_page.old_id