newicon / neon

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

neon/cms/migrations/deprecatedMigrations/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/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';

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

Indentation +6 added lines, -6 removed lines

@@ -5,20 +5,20 @@
 class m161130_180814_cms_additional_page_fields extends Migration
 {
 
-    public function safeUp()
-    {
+	public function safeUp()
+	{
 		$this->addColumn('cms_page', 'keywords', "VARCHAR(1000) NULL COMMENT 'Keywords for this page'");
 		$this->addColumn('cms_page', 'description', "VARCHAR(1000) NULL COMMENT 'Description of this page'");
 		$this->addColumn('cms_page', 'languages', "VARCHAR(1000) NULL COMMENT 'Supported languages on this page'");
 		$this->addColumn('cms_page', 'page_params', "VARCHAR(10000) NULL COMMENT 'Additional parameters for this page which are interpreted directly within the templates'");
-    }
+	}
 
-    public function safeDown()
-    {
+	public function safeDown()
+	{
 		$this->dropColumn('cms_page', 'keywords');
 		$this->dropColumn('cms_page', 'description');
 		$this->dropColumn('cms_page', 'languages');
 		$this->dropColumn('cms_page', 'page_params');
-    }
+	}
 
 }

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

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 		$connection = \Yii::$app->getDb();
 
 		// create the various tables for dds
-		$sql=<<<EOQ
+		$sql = <<<EOQ
 -- --------------------------------------------------------
 
 --

neon/cms/App.php

Spacing +7 added lines, -7 removed lines

@@ -201,7 +201,7 @@ 
 	 */
 	public function getThemeAlias()
 	{
-		return '@root/themes/' . $this->getThemeName();
+		return '@root/themes/'.$this->getThemeName();
 	}
 
 	/**
@@ -244,7 +244,7 @@ 
 	 * @inheritdoc
 	 * @unsupported - $filters is not currently supported
 	 */
-	public function getDataMap($key, $query='',  $filters=[], $fields=[], $start = 0, $limit = 100)
+	public function getDataMap($key, $query = '', $filters = [], $fields = [], $start = 0, $limit = 100)
 	{
 		if ($key === 'pages') {
 			return $this->getPagesMap($query, $filters, $fields, $start, $limit);
@@ -297,9 +297,9 @@ 
 	 */
 	public function formatPageMapResults($pages, $fields)
 	{
-		return collect($pages)->mapWithKeys(function ($item, $key) use($fields) {
+		return collect($pages)->mapWithKeys(function($item, $key) use($fields) {
 			if (empty($fields))
-				return [$item['id'] => $item['nice_id'] . ': ' . $item['title']];
+				return [$item['id'] => $item['nice_id'].': '.$item['title']];
 			return [$item['id'] => $item];
 		})->all();
 	}
@@ -327,7 +327,7 @@ 
 	 * @param array $fields
 	 * @return array - @see $this->formatPageMapResults();
 	 */
-	public function getPagesMap($query=null, $filters=[], $fields=[], $start=0, $limit=100)
+	public function getPagesMap($query = null, $filters = [], $fields = [], $start = 0, $limit = 100)
 	{
 		$pages = CmsPage::find()
 			->select(array_merge(['id', 'nice_id', 'title'], $fields))
@@ -361,10 +361,10 @@ 
 	 */
 	private function checkThemeName($name)
 	{
-		if ( preg_match('/[^A-Za-z0-9_-]/', $name, $matches) ) {
+		if (preg_match('/[^A-Za-z0-9_-]/', $name, $matches)) {
 			throw new \InvalidArgumentException("Error trying to set the theme name to '$name'"
 				."\n"."The theme name must consist of only 'a-z', '0-9', '_' and '-' characters."
-				."\n".'The following character is not allowed in theme names: ' . \yii\helpers\VarDumper::dumpAsString($matches[0]) );
+				."\n".'The following character is not allowed in theme names: '.\yii\helpers\VarDumper::dumpAsString($matches[0]));
 		}
 	}
 

Braces +12 added lines, -8 removed lines

@@ -146,11 +146,13 @@ 
 	public function getThemeHierarchy()
 	{
 		// if we have a theme hierarchy use that
-		if (count($this->_themeHierarchy))
-			return $this->_themeHierarchy;
+		if (count($this->_themeHierarchy)) {
+					return $this->_themeHierarchy;
+		}
 		// otherwise drop back to the themeName
-		if (!empty($this->_themeName))
-			return [$this->_themeName];
+		if (!empty($this->_themeName)) {
+					return [$this->_themeName];
+		}
 		// otherwise return nothing
 		return [];
 	}
@@ -261,8 +263,9 @@ 
 	 */
 	public function getMapResults($requestKey)
 	{
-		if (!isset($this->_mapRequestKey[$requestKey]))
-			throw new \InvalidArgumentException('The provided request key "'.$requestKey.'" does not exist');
+		if (!isset($this->_mapRequestKey[$requestKey])) {
+					throw new \InvalidArgumentException('The provided request key "'.$requestKey.'" does not exist');
+		}
 		list($key, $ids, $fields) = $this->_mapRequestKey[$requestKey];
 		if ($key === 'pages') {
 			$pages = CmsPage::find()->select(array_merge(['id', 'nice_id', 'title'], $fields))
@@ -298,8 +301,9 @@ 
 	public function formatPageMapResults($pages, $fields)
 	{
 		return collect($pages)->mapWithKeys(function ($item, $key) use($fields) {
-			if (empty($fields))
-				return [$item['id'] => $item['nice_id'] . ': ' . $item['title']];
+			if (empty($fields)) {
+							return [$item['id'] => $item['nice_id'] . ': ' . $item['title']];
+			}
 			return [$item['id'] => $item];
 		})->all();
 	}

neon/phoebe/interfaces/IPhoebeType.php

Spacing +5 added lines, -5 removed lines

@@ -33,7 +33,7 @@ 
 	 * @return array of
 	 *   ['class_type'] => [ 'class_type', 'module', 'label', 'description', ['deleted'] ]
 	 */
-	public function listClasses(&$paginator=[], $filters=[], $orderBy=[], $includeDeleted=false);
+	public function listClasses(&$paginator = [], $filters = [], $orderBy = [], $includeDeleted = false);
 
 	/**
 	 * Create an IPhoebeClass interface for a new class reference.
@@ -46,7 +46,7 @@ 
 	 * @throw  \RuntimeException  if the classRef already exists or something
 	 *   else went wrong during creation
 	 */
-	public function addClass(&$classType, $module='');
+	public function addClass(&$classType, $module = '');
 
 	/**
 	 * Get hold of an IPhoebeClass interface for a particular class reference.
@@ -59,7 +59,7 @@ 
 	 * @return null | \neon\phoebe\interfaces\IPhoebeClass
 	 *   returns null if the classType or version doesn't exist
 	 */
-	public function getClass($classType, $version=null, $classOverrideCriteria=[]);
+	public function getClass($classType, $version = null, $classOverrideCriteria = []);
 
 	/**
 	 * Get hold of a set of IPhoebeClasses for a set of classType. The latest version
@@ -99,7 +99,7 @@ 
 	 *   will return all rows that have been soft deleted.
 	 * @return array  an array of objects of this class
 	 */
-	public function listObjects($classType, &$paginator=[], $filters=[], $orderBy=[], $additionalFields=[]);
+	public function listObjects($classType, &$paginator = [], $filters = [], $orderBy = [], $additionalFields = []);
 
 	/**
 	 * Create and save a new IPhoebeObject of a particular class type
@@ -111,7 +111,7 @@ 
 	 * @return \neon\phoebe\interfaces\IPhoebeObject
 	 * @throw \RuntimeException if anything went wrong during the addition
 	 */
-	public function addObject($classType, $classOverrideCriteria=[]);
+	public function addObject($classType, $classOverrideCriteria = []);
 
 	/**
 	 * Get hold of a phoebe object interface for managing an instance