phpsa / datastore

src/Models/DatastoreComments.php

Indentation +30 added lines, -30 removed lines

@@ -9,35 +9,35 @@
 class DatastoreComments extends Model
 {
 
-    use SoftDeletes;
-
-    protected $dates = ['deleted_at'];
-
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var array
-     */
-    protected $fillable = ['user_id', 'datastore_id', 'parent_id', 'body'];
-
-    /**
-     * The belongs to Relationship
-     *
-     * @var array
-     */
-    public function user()
-    {
-        return $this->belongsTo(User::class);
-    }
-
-    /**
-     * The has Many Relationship
-     *
-     * @var array
-     */
-    public function replies()
-    {
-        return $this->hasMany(DatastoreComments::class, 'parent_id');
-    }
+	use SoftDeletes;
+
+	protected $dates = ['deleted_at'];
+
+	/**
+	 * The attributes that are mass assignable.
+	 *
+	 * @var array
+	 */
+	protected $fillable = ['user_id', 'datastore_id', 'parent_id', 'body'];
+
+	/**
+	 * The belongs to Relationship
+	 *
+	 * @var array
+	 */
+	public function user()
+	{
+		return $this->belongsTo(User::class);
+	}
+
+	/**
+	 * The has Many Relationship
+	 *
+	 * @var array
+	 */
+	public function replies()
+	{
+		return $this->hasMany(DatastoreComments::class, 'parent_id');
+	}
 
 }
\ No newline at end of file

src/Datastore.php

Spacing +70 added lines, -70 removed lines

@@ -15,14 +15,14 @@ 
 use ReflectionClass;
 use ReflectionProperty;
 
-class Datastore{
+class Datastore {
 
-	protected $__asset				 = false;
-	protected $__asset_properties	 = false;
-	protected $__value_equals		 = false;
-	protected $__status_equals		 = false;
-	protected $__start_date			 = null;
-	protected $__end_date			 = null;
+	protected $__asset = false;
+	protected $__asset_properties = false;
+	protected $__value_equals = false;
+	protected $__status_equals = false;
+	protected $__start_date = null;
+	protected $__end_date = null;
 
 	/**
 	 *
@@ -55,17 +55,17 @@ 
 		{
 			$this->__model = DatastoreModel::findOrFail($id);
 
-			if(!$this->__model){
+			if (!$this->__model) {
 				//could not load <div class="">thr</div>
 				throw new DatastoreException("Record not found");
 			}
 
 			foreach ($this->__model->toArray() as $k => $v)
 			{
-				if($k === 'options' || $k === 'meta'){
+				if ($k === 'options' || $k === 'meta') {
 					$v = json_decode($v, true);
 				}
-				if(in_array($k, ['created_at','updated_at','date_start','date_end'])){
+				if (in_array($k, ['created_at', 'updated_at', 'date_start', 'date_end'])) {
 					$v = Carbon::parse($v);
 				}
 				$this->{$k} = $v;
@@ -80,7 +80,7 @@ 
 					$this->ownDatastore[] = self::getAssetById($ds->id);
 				}
 			}
-		}else{
+		}else {
 			$this->__model = new DatastoreModel();
 		}
 	}
@@ -92,23 +92,23 @@ 
 	 *
 	 * @return void
 	 */
-	public static function getAssetById($id){
+	public static function getAssetById($id) {
 		$datastore = new self($id);
 		$datastore->setAssetType($datastore->type);
 		return $datastore;
 	}
 
-	public static function find($id){
-		if(!is_array($id)){
-			if(is_object($id)){
+	public static function find($id) {
+		if (!is_array($id)) {
+			if (is_object($id)) {
 				return self::getAssetById($id->id);
 			}
 			return self::getAssetById($id);
 		}
 
-		if(is_array($id)){
+		if (is_array($id)) {
 			$assets = [];
-			foreach($id as $i){
+			foreach ($id as $i) {
 				$assets[] = self::getAssetById($i);
 			}
 			return $assets;
@@ -129,8 +129,8 @@ 
 	}
 
 
-	public function ownDatastore(){
-		return ($this->ownDatastore)?$this->ownDatastore: array();
+	public function ownDatastore() {
+		return ($this->ownDatastore) ? $this->ownDatastore : array();
 	}
 
 	/**
@@ -191,9 +191,9 @@ 
 
 			if (!isset($this->__asset_properties[$p]))
 			{
-				$this->__asset_properties[$p]['temp']					 = self::getAsset($this->__asset->properties[$p]['type']);
+				$this->__asset_properties[$p]['temp'] = self::getAsset($this->__asset->properties[$p]['type']);
 				$this->__asset_properties[$p]['temp']->name				 = (isset($this->__asset->properties[$p]['name'])) ? $this->__asset->properties[$p]['name'] : null;
-				$this->__asset_properties[$p]['temp']->key				 = $p;
+				$this->__asset_properties[$p]['temp']->key = $p;
 				$this->__asset_properties[$p]['temp']->private			 = (isset($this->__asset->properties[$p]['private'])) ? $this->__asset->properties[$p]['private'] : false; // accessibility
 				$this->__asset_properties[$p]['temp']->value			 = (isset($this->__asset->properties[$p]['value'])) ? $this->__asset->properties[$p]['value'] : null; // the actual value of the property
 				$this->__asset_properties[$p]['temp']->options			 = (isset($this->__asset->properties[$p]['options'])) ? $this->__asset->properties[$p]['options'] : null; // additional options specific to the property
@@ -202,8 +202,8 @@ 
 				$this->__asset_properties[$p]['temp']->help				 = (isset($this->__asset->properties[$p]['help'])) ? $this->__asset->properties[$p]['help'] : null; // additional options specific to the property
 				$this->__asset_properties[$p]['temp']->required			 = (isset($this->__asset->properties[$p]['required'])) ? $this->__asset->properties[$p]['required'] : true; // is the property required
 				$this->__asset_properties[$p]['temp']->limit			 = (isset($this->__asset->properties[$p]['limit'])) ? $this->__asset->properties[$p]['limit'] : null; // additional options specific to the property
-				$this->__asset_properties[$p]['temp']->warning			 = (isset($this->__asset->properties[$p]['warning'])) ? $this->__asset->properties[$p]['warning'] : null; // additional options specific to the property
-				$this->__asset_properties[$p]['temp']->max_instances	 = (isset($this->__asset->properties[$p]['max_instances'])) ? $this->__asset->properties[$p]['max_instances'] : 0; // there can be only one
+				$this->__asset_properties[$p]['temp']->warning = (isset($this->__asset->properties[$p]['warning'])) ? $this->__asset->properties[$p]['warning'] : null; // additional options specific to the property
+				$this->__asset_properties[$p]['temp']->max_instances = (isset($this->__asset->properties[$p]['max_instances'])) ? $this->__asset->properties[$p]['max_instances'] : 0; // there can be only one
 			}
 		}
 
@@ -222,7 +222,7 @@ 
 					$this->__asset_properties[$each->key]	 = array('temp' => $each);
 					@$this->ownDatastore[$idx]->required		 = (isset($this->__asset->properties[$each->key]['required'])) ? $this->__asset->properties[$each->key]['required'] : true;
 					@$this->ownDatastore[$idx]->limit		 = (isset($this->__asset->properties[$each->key]['limit'])) ? $this->__asset->properties[$each->key]['limit'] : null;
-					@$this->ownDatastore[$idx]->warning		 = (isset($this->__asset->properties[$each->key]['warning'])) ? $this->__asset->properties[$each->key]['warning'] : null;
+					@$this->ownDatastore[$idx]->warning = (isset($this->__asset->properties[$each->key]['warning'])) ? $this->__asset->properties[$each->key]['warning'] : null;
 					@$this->ownDatastore[$idx]->help			 = (isset($this->__asset->properties[$each->key]['help'])) ? $this->__asset->properties[$each->key]['help'] : null;
 					@$this->ownDatastore[$idx]->max_instances = (isset($this->__asset->properties[$each->key]['max_instances'])) ? $this->__asset->properties[$each->key]['max_instances'] : 0;
 					@$this->ownDatastore[$idx]->options = (isset($this->__asset->properties[$each->key]['options'])) ? $this->__asset->properties[$each->key]['options'] : null;
@@ -237,19 +237,19 @@ 
 			{
 
 				// we need to create a temporary new bean to store new data
-				$this->__asset_properties[$prop]['temp']				 = self::getAsset($this->__asset->properties[$prop]['type']);
-				$this->__asset_properties[$prop]['temp']->name			 = (isset($this->__asset->properties[$prop]['name'])) ? $this->__asset->properties[$prop]['name'] : null;
-				$this->__asset_properties[$prop]['temp']->key			 = $prop;
+				$this->__asset_properties[$prop]['temp'] = self::getAsset($this->__asset->properties[$prop]['type']);
+				$this->__asset_properties[$prop]['temp']->name = (isset($this->__asset->properties[$prop]['name'])) ? $this->__asset->properties[$prop]['name'] : null;
+				$this->__asset_properties[$prop]['temp']->key = $prop;
 				$this->__asset_properties[$prop]['temp']->private		 = (isset($this->__asset->properties[$prop]['private'])) ? $this->__asset->properties[$prop]['private'] : false; // accessibility
-				$this->__asset_properties[$prop]['temp']->value			 = (isset($this->__asset->properties[$prop]['value'])) ? $this->__asset->properties[$prop]['value'] : null; // the actual value of the property
+				$this->__asset_properties[$prop]['temp']->value = (isset($this->__asset->properties[$prop]['value'])) ? $this->__asset->properties[$prop]['value'] : null; // the actual value of the property
 				$this->__asset_properties[$prop]['temp']->options		 = (isset($this->__asset->properties[$prop]['options'])) ? $this->__asset->properties[$prop]['options'] : null; // additional options specific to the property
 				$this->__asset_properties[$prop]['temp']->callback		 = (isset($this->__asset->properties[$prop]['callback'])) ? $this->__asset->properties[$prop]['callback'] : null; // additional options specific to the property
 				$this->__asset_properties[$prop]['temp']->meta			 = (isset($this->__asset->properties[$prop]['meta'])) ? $this->__asset->properties[$prop]['meta'] : null; // additional options specific to the property
 				$this->__asset_properties[$prop]['temp']->help			 = (isset($this->__asset->properties[$prop]['help'])) ? $this->__asset->properties[$prop]['help'] : null; // additional options specific to the property
 				$this->__asset_properties[$prop]['temp']->required		 = (isset($this->__asset->properties[$prop]['required'])) ? $this->__asset->properties[$prop]['required'] : true; // is the property required
-				$this->__asset_properties[$prop]['temp']->limit			 = (isset($this->__asset->properties[$prop]['limit'])) ? $this->__asset->properties[$prop]['limit'] : null; // additional options specific to the property
-				$this->__asset_properties[$prop]['temp']->warning		 = (isset($this->__asset->properties[$prop]['warning'])) ? $this->__asset->properties[$prop]['warning'] : null; // additional options specific to the property
-				$this->__asset_properties[$prop]['temp']->max_instances	 = (isset($this->__asset->properties[$prop]['max_instances'])) ? $this->__asset->properties[$prop]['max_instances'] : null; // there can be only one
+				$this->__asset_properties[$prop]['temp']->limit = (isset($this->__asset->properties[$prop]['limit'])) ? $this->__asset->properties[$prop]['limit'] : null; // additional options specific to the property
+				$this->__asset_properties[$prop]['temp']->warning = (isset($this->__asset->properties[$prop]['warning'])) ? $this->__asset->properties[$prop]['warning'] : null; // additional options specific to the property
+				$this->__asset_properties[$prop]['temp']->max_instances = (isset($this->__asset->properties[$prop]['max_instances'])) ? $this->__asset->properties[$prop]['max_instances'] : null; // there can be only one
 
 			}
 		}
@@ -264,7 +264,7 @@ 
 	 */
 	public static function getKey($string)
 	{
-		$new	 = Helpers::splitByCaps($string);
+		$new = Helpers::splitByCaps($string);
 		$explode = explode(' ', $new);
 
 		if (isset($explode[0]) && $explode[0] == 'Ams')
@@ -319,8 +319,8 @@ 
 				break;
 
 			case 2:
-				$prop	 = func_get_arg(0);
-				$val	 = func_get_arg(1);
+				$prop = func_get_arg(0);
+				$val = func_get_arg(1);
 				if (isset($this->__asset_properties[$prop]))
 				{
 					// check whether this is new or existing
@@ -396,7 +396,7 @@ 
 				break;
 
 			default:
-				$val		 = func_get_arg(0);
+				$val = func_get_arg(0);
 				$this->value = $val;
 		}
 	}
@@ -422,7 +422,7 @@ 
 
 		foreach ($props as $prop)
 		{
-			if (!in_array($prop->name, array('status_equals', 'properties','help','value_equals')))
+			if (!in_array($prop->name, array('status_equals', 'properties', 'help', 'value_equals')))
 			{
 				$record->{$prop->name} = isset($asset->{$prop->name}) ? $asset->{$prop->name} : NULL;
 			}
@@ -430,15 +430,15 @@ 
 
 		if ($asset->__status_equals)
 		{
-			$record->status = isset($record->{$asset->__status_equals})? $record->{$asset->__status_equals} : $this->prop($this->__status_equals);
+			$record->status = isset($record->{$asset->__status_equals}) ? $record->{$asset->__status_equals} : $this->prop($this->__status_equals);
 		}
 		if ($asset->__start_date)
 		{
-			$record->start_date = isset($record->{$asset->__start_date})? $record->{$asset->__start_date} : $this->prop($this->__start_date);
+			$record->start_date = isset($record->{$asset->__start_date}) ? $record->{$asset->__start_date} : $this->prop($this->__start_date);
 		}
 		if ($asset->__end_date)
 		{
-			$record->end_date = isset($record->{$asset->__end_date})? $record->{$asset->__end_date} : $this->prop($this->__end_date);
+			$record->end_date = isset($record->{$asset->__end_date}) ? $record->{$asset->__end_date} : $this->prop($this->__end_date);
 		}
 
 		$record->options = json_encode($record->options);
@@ -494,8 +494,8 @@ 
 	public function getMarkup($template = false)
 	{
 
-		$vars				 = $this->export();
-		$vars['_unique_id']	 = uniqid();
+		$vars = $this->export();
+		$vars['_unique_id'] = uniqid();
 
 		// we also want to know what asset this property belongs to
 		$output = Helpers::callStatic($this->type, 'render', array($vars, $template));
@@ -528,7 +528,7 @@ 
 		if ($this->__status_equals)
 		{
 
-			$data['status'] = isset($data[$this->__status_equals])? $data[$this->__status_equals] : $this->prop($this->__status_equals);
+			$data['status'] = isset($data[$this->__status_equals]) ? $data[$this->__status_equals] : $this->prop($this->__status_equals);
 		}
 		if ($this->__start_date)
 		{
@@ -589,9 +589,9 @@ 
 		}
 	}
 
-	public function getFieldValues(){
+	public function getFieldValues() {
 		$data = [];
-		foreach(array_keys($this->__asset->properties) as $key){
+		foreach (array_keys($this->__asset->properties) as $key) {
 			$data[$key] = $this->prop($key);
 		}
 		return $data;
@@ -655,7 +655,7 @@ 
 		return $output;
 	}
 
-	public function propGetValue($prop){
+	public function propGetValue($prop) {
 		dd($prop);
 	}
 
@@ -683,8 +683,8 @@ 
 		{
 			if (isset($this->__asset_properties[$prop]['temp']))
 			{
-				$xvars				 = $this->__asset_properties[$prop]['temp']->export();
-				$xvars['unique_id']	 = $unique_id;
+				$xvars = $this->__asset_properties[$prop]['temp']->export();
+				$xvars['unique_id'] = $unique_id;
 
 				$output .= Helpers::callStatic($this->__asset_properties[$prop]['temp']->type, 'form', array($xvars, $this->type));
 			}
@@ -692,8 +692,8 @@ 
 			{
 				if (isset($this->__asset_properties[$prop]))
 				{
-					$xvars				 = $this->ownDatastore[$this->__asset_properties[$prop]]->export();
-					$xvars['unique_id']	 = $unique_id;
+					$xvars = $this->ownDatastore[$this->__asset_properties[$prop]]->export();
+					$xvars['unique_id'] = $unique_id;
 
 					$output .= Helpers::callStatic($this->ownDatastore[$this->__asset_properties[$prop]]->type, 'form', array($xvars, $this->type));
 				}
@@ -709,8 +709,8 @@ 
 		return $output;
 	}
 
-	public function hasMetadataForm(){
-		if ($this->namespace == 'asset' && !$this->is_child){
+	public function hasMetadataForm() {
+		if ($this->namespace == 'asset' && !$this->is_child) {
 			return ($this->meta_description !== 'off' || $this->meta_keywords !== 'off');
 		}
 		return false;
@@ -757,8 +757,8 @@ 
 		return $output;
 	}
 
-	public function hasDeveloperForm(){
-		if ($this->namespace == 'asset' && !$this->is_child){
+	public function hasDeveloperForm() {
+		if ($this->namespace == 'asset' && !$this->is_child) {
 			return ($this->page_js !== 'off' || $this->page_css !== 'off');
 		}
 		return false;
@@ -786,7 +786,7 @@ 
 				$output .= Helpers::callStatic(ASSET::METATEXT, 'form', array($data, 'metatext'));
 			}
 
-			if ($this->page_js !== 'off' )
+			if ($this->page_js !== 'off')
 			{
 				$data = array(
 					'name'		 => 'Custom JS',
@@ -817,11 +817,11 @@ 
 		$messages = array();
 		foreach ($this->__asset->properties as $key => $property)
 		{
-			if($property['type'] !== \Phpsa\Datastore\Ams\AutoCallBackAdderAsset::class && (empty($property['required']) || $property['required'] === true) )
+			if ($property['type'] !== \Phpsa\Datastore\Ams\AutoCallBackAdderAsset::class && (empty($property['required']) || $property['required'] === true))
 			{
 				$rules = empty($property['validation_rules']) ? 'required' : $property['validation_rules'];
-				if(!empty($property['validation_messages'])){
-					if(is_string($property['validation_messages'])){
+				if (!empty($property['validation_messages'])) {
+					if (is_string($property['validation_messages'])) {
 						$messages[$key . '.required'] = $property['validation_messages'];
 					}
 				}
@@ -834,7 +834,7 @@ 
 		{
 			$validator = Validator::make($request, $config, $messages);
 
-			if($validator->fails()){
+			if ($validator->fails()) {
 				throw new ValidationException($validator);
 			}
 		}
@@ -945,7 +945,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function statusOptions(){
+	public function statusOptions() {
 		return ($this->__status_equals) ? $this->__asset_properties[$this->__status_equals]['temp']->options : false;
 	}
 
@@ -954,7 +954,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function getStatusValue(){
+	public function getStatusValue() {
 		$options = $this->statusOptions();
 		return ($options && Helpers::isAssocArray($options) && isset($options[$this->status])) ? $options[$this->status] : $this->status;
 	}
@@ -986,10 +986,10 @@ 
 	 *
 	 * @return bool
 	 */
-	public function statusIsActive(){
-		if($this->__status_equals){
+	public function statusIsActive() {
+		if ($this->__status_equals) {
 
-			if(!isset($this->__asset->properties[$this->__status_equals]['published'])){
+			if (!isset($this->__asset->properties[$this->__status_equals]['published'])) {
 				throw new DatastoreException("Statused assests need a published option in the asset definition");
 			}
 
@@ -1029,10 +1029,10 @@ 
 	 * @deprecated ???
 	 * @return void
 	 */
-	public static function getAssetByTypeValue($type,$value)
+	public static function getAssetByTypeValue($type, $value)
 	{
-		$asset = DatastoreModel::where('type' , $type)->where('value', $value)->where('namespace', 'asset')->orderBy('modified', 'desc')->first();
-		if($asset){
+		$asset = DatastoreModel::where('type', $type)->where('value', $value)->where('namespace', 'asset')->orderBy('modified', 'desc')->first();
+		if ($asset) {
 			return self::getAsset($asset->type, $asset->id);
 		}
 		return false;
@@ -1043,7 +1043,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function urlPath(){
+	public function urlPath() {
 		return Helpers::getPath($this->type);
 	}
 
@@ -1056,7 +1056,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function getViewName($prefix = 'frontend.ams'){
+	public function getViewName($prefix = 'frontend.ams') {
 		return $this->__asset::getFilename($prefix);
 	}
 
@@ -1067,11 +1067,11 @@ 
 	 *
 	 * @return void
 	 */
-	public function __get($name){
+	public function __get($name) {
 		return $this->propExists($name) ? $this->prop($name) : $this->__model->{$name};
 	}
 
-	public function getTitleField(){
+	public function getTitleField() {
 		return $this->__value_equals;
 	}
 

Braces +24 added lines, -47 removed lines

@@ -80,7 +80,7 @@ 
 					$this->ownDatastore[] = self::getAssetById($ds->id);
 				}
 			}
-		}else{
+		} else{
 			$this->__model = new DatastoreModel();
 		}
 	}
@@ -150,20 +150,16 @@ 
 				if ($k == 'value_equals')
 				{
 					$this->__value_equals = $v;
-				}
-				else if ($k == 'status_equals')
+				} else if ($k == 'status_equals')
 				{
 					$this->__status_equals = $v;
-				}
-				else if ($k == 'start_date')
+				} else if ($k == 'start_date')
 				{
 					$this->__start_date = $v;
-				}
-				else if ($k == 'end_date')
+				} else if ($k == 'end_date')
 				{
 					$this->__end_date = $v;
-				}
-				else
+				} else
 				{
 					$this->$k = (isset($this->$k)) ? $this->$k : $v;
 				}
@@ -229,8 +225,7 @@ 
 				}
 			}
 			//echo '<pre>$this->ownDatastore: '; print_r($this->ownDatastore); echo '</pre>'; die();
-		}
-		else
+		} else
 		{
 			// nope - net to create some datastore beans to represent our properties
 			foreach ($this->__asset->properties as $prop => $data)
@@ -306,13 +301,11 @@ 
 					if (isset($this->__asset_properties[$prop]['temp']))
 					{
 						return $this->__asset_properties[$prop]['temp']->value;
-					}
-					else
+					} else
 					{
 						return $this->ownDatastore[$this->__asset_properties[$prop]]->value;
 					}
-				}
-				else
+				} else
 				{
 					return false;
 				}
@@ -332,44 +325,36 @@ 
 						if ($this->__value_equals && $this->__value_equals == $prop)
 						{
 							$this->val(Helpers::callStatic($this->type, 'valueEquals', array($val)));
-						}
-						else if ($this->__status_equals && $this->__status_equals == $prop)
+						} else if ($this->__status_equals && $this->__status_equals == $prop)
 						{
 							$this->status($val);
-						}
-						else if ($this->__start_date && $this->__start_date == $prop)
+						} else if ($this->__start_date && $this->__start_date == $prop)
 						{
 							$this->start_date($val);
-						}
-						else if ($this->__end_date && $this->__end_date == $prop)
+						} else if ($this->__end_date && $this->__end_date == $prop)
 						{
 							$this->end_date($val);
 						}
-					}
-					else
+					} else
 					{
 						$this->ownDatastore[$this->__asset_properties[$prop]]->value = $val;
 						// if value equals is set, set it too
 						if ($this->__value_equals && $this->__value_equals == $prop)
 						{
 							$this->val(Helpers::callStatic($this->type, 'valueEquals', array($val)));
-						}
-						else if ($this->__status_equals && $this->__status_equals == $prop)
+						} else if ($this->__status_equals && $this->__status_equals == $prop)
 						{
 							$this->status($val);
-						}
-						else if ($this->__start_date && $this->__start_date == $prop)
+						} else if ($this->__start_date && $this->__start_date == $prop)
 						{
 							$this->start_date($val);
-						}
-						else if ($this->__end_date && $this->__end_date == $prop)
+						} else if ($this->__end_date && $this->__end_date == $prop)
 						{
 							$this->end_date($val);
 						}
 					}
 					return $this;
-				}
-				else
+				} else
 				{
 					throw new DatastoreException('The property "' . $prop . '" is not defined for the "' . $this->type . '" asset');
 				}
@@ -476,8 +461,7 @@ 
 		if (isset($this->__asset_properties[$prop]['temp']))
 		{
 			return $this->__asset_properties[$prop]['temp']->getMarkup($template);
-		}
-		else
+		} else
 		{
 			if (isset($this->__asset_properties[$prop]))
 			{
@@ -555,8 +539,7 @@ 
 		if (isset($this->__asset_properties[$prop]['temp']))
 		{
 			echo $this->__asset_properties[$prop]['temp']->getForm($template, $prop);
-		}
-		else
+		} else
 		{
 			if (isset($this->__asset_properties[$prop]))
 			{
@@ -578,8 +561,7 @@ 
 		if (isset($this->__asset_properties[$prop]['temp']))
 		{
 			return $this->__asset_properties[$prop]['temp']->getForm($template, $_prop);
-		}
-		else
+		} else
 		{
 			if (isset($this->__asset_properties[$prop]))
 			{
@@ -614,8 +596,7 @@ 
 			{
 				$output .= $this->returnForm($prop, false, $_prop);
 			}
-		}
-		else
+		} else
 		{
 			return $this->propGetForm($template, $_prop);
 		}
@@ -640,8 +621,7 @@ 
 		if (isset($_prop['unique_id']))
 		{
 			$vars['_unique_id'] = $_prop['unique_id'];
-		}
-		else
+		} else
 		{
 			$vars['_unique_id'] = md5(uniqid(rand(), true)); //UUID ??
 		}
@@ -672,8 +652,7 @@ 
 		if ($uid)
 		{
 			$unique_id = md5($uid);
-		}
-		else
+		} else
 		{
 			$unique_id = md5(uniqid(rand(), true));
 		}
@@ -687,8 +666,7 @@ 
 				$xvars['unique_id']	 = $unique_id;
 
 				$output .= Helpers::callStatic($this->__asset_properties[$prop]['temp']->type, 'form', array($xvars, $this->type));
-			}
-			else
+			} else
 			{
 				if (isset($this->__asset_properties[$prop]))
 				{
@@ -919,8 +897,7 @@ 
 								if (isset($this->__asset_properties[$pr]['temp']))
 								{
 									$this->__asset_properties[$pr]['temp']->meta = $pv;
-								}
-								else
+								} else
 								{
 									$this->ownDatastore[$this->__asset_properties[$pr]]->meta = $pv;
 								}

src/Asset.php

Indentation +4 added lines, -4 removed lines

@@ -150,10 +150,10 @@
 	public $meta_description = null;
 
 	 /**
-	 * set to 'off' to turn it off
-	 *
-	 * @var [type]
-	 */
+	  * set to 'off' to turn it off
+	  *
+	  * @var [type]
+	  */
 	public $meta_keywords    = null;
 
 	/**

Spacing +39 added lines, -39 removed lines

@@ -29,7 +29,7 @@ 
  *
  * @author Craig Smith <vxdhost@gmail.com>
  */
-class Asset{
+class Asset {
 
 	/**
 	 * Constants for the different asset types!
@@ -39,7 +39,7 @@ 
 
 
 	const AUTOCALLBACKADDER  = AutoCallBackAdderAsset::class; // ajax powered autocomplete backed on a callback
-	const AUTOCALLBACK       = AutoCallBackAsset::class;      // ajax powered autocomplete backed on a callback
+	const AUTOCALLBACK       = AutoCallBackAsset::class; // ajax powered autocomplete backed on a callback
 	const AUTOCOMPLETE       = AutoCompleteAsset::class;
 	const BOOL               = BooleanAsset::class;
 	const DATEPICKER         = DatepickerAsset::class;
@@ -49,7 +49,7 @@ 
 	const HTML               = HtmlAsset::class;
 	const IDENTITY           = IdentityAsset::class;
 	const IMG                = ImageAsset::class;
-	const METATEXT			 = MetatextAsset::class;
+	const METATEXT = MetatextAsset::class;
 	const STRING             = StringAsset::class;
 	const SUBHEADING         = SubHeadingAsset::class;
 	const TEXT               = TextAsset::class;
@@ -62,70 +62,70 @@ 
 	 *
 	 * @var string
 	 */
-	public $help             = null;
+	public $help = null;
 
 	/**
 	 * Sets the required rule for a property
 	 *
 	 * @var bool
 	 */
-	public $required         = true;
+	public $required = true;
 
 	/**
 	 * which property is the actual value name for your asset - target one of the properties
 	 *
 	 * @var string
 	 */
-	public $value_equals     = null;
+	public $value_equals = null;
 
 	/**
 	 * Assets namespace, most often extended as an asset, however may be a property if adding a new input type.
 	 *
 	 * @var string
 	 */
-	public $namespace        = self::ASSET;
+	public $namespace = self::ASSET;
 
 	/**
 	 * Generally left alone unless overrideing to be a property then should have the instance class
 	 *
 	 * @var string
 	 */
-	public $type             = 'asset';
+	public $type = 'asset';
 
 	/**
 	 * Properties for thie asset - used to define the property assets to use to build up the asset
 	 *
 	 * @var array
 	 */
-	public $properties       = array();
+	public $properties = array();
 
 	/**
 	 * Public name - This is used to identify
 	 *
 	 * @var [type]
 	 */
-	public $name             = null;
+	public $name = null;
 
 	/**
 	 *  just a shortname to use instead of the full $name above
 	 *
 	 * @var string
 	 */
-	public $shortname        = null;
+	public $shortname = null;
 
 	/**
 	 * the max number of instances, 0 means unlimited - normally used for presets like the robots.txt
 	 *
 	 * @var int
 	 */
-	public $max_instances    = 0;
+	public $max_instances = 0;
 
 	/**
 	 * IE if private is true, we do not show the page link block... and idsable the meta
 	 * but if private is false, we show the page link and let meta decide for itself:
 	 * @var bool
 	 */
-	public $private          = false;
+	public $private = false;
 
 	/**
 	 * @deprecated Initial -
@@ -133,14 +133,14 @@ 
 	 *
 	 * @var [type]
 	 */
-	public $embedded         = null;
+	public $embedded = null;
 
 	/**
 	 * @deprecated version
 	 * * @TODO - Remove from here and from teh database object
 	 * @var [type]
 	 */
-	public $theme            = null;
+	public $theme = null;
 
 	/**
 	 * set to 'off' to turn it off
@@ -154,14 +154,14 @@ 
 	 *
 	 * @var [type]
 	 */
-	public $meta_keywords    = null;
+	public $meta_keywords = null;
 
 	/**
 	 * set to 'off' to turn it off
 	 *
 	 * @var [type]
 	 */
-	public $page_css         = null;
+	public $page_css = null;
 
 	/**
 	 * set to 'off' to turn it off
@@ -171,12 +171,12 @@ 
 	public $page_js          = null;
 
 
-	public $options          = false;						// Options for the element -- should actually be removed from the database table most likely
-	public $status_equals    = null;                        // does the asset has a status linked to a prop
-	public $start_date       = null;                        // does the asset has a start date linked to a prop
-	public $end_date         = null;                        // does the asset has an end date linked to a prop
-	public $comment_equals   = null;                        // does the asset allow comments (linked to a specific property - similar to status_equals)
-	public $warning          = null;                        // field for warnings - deprected in favour of validation_messages
+	public $options          = false; // Options for the element -- should actually be removed from the database table most likely
+	public $status_equals    = null; // does the asset has a status linked to a prop
+	public $start_date       = null; // does the asset has a start date linked to a prop
+	public $end_date         = null; // does the asset has an end date linked to a prop
+	public $comment_equals   = null; // does the asset allow comments (linked to a specific property - similar to status_equals)
+	public $warning          = null; // field for warnings - deprected in favour of validation_messages
 	//public $published		= null;							//published status
 	//public $validation_messages = null					//validation messages
 
@@ -184,7 +184,7 @@ 
 	public $module           = null;
 	public $value            = null;
 	public $status           = null;
-	public $meta             = false;                       // ancillary meta info/data - similar to options
+	public $meta             = false; // ancillary meta info/data - similar to options
 	public $callback         = null;
 
 	/**
@@ -192,36 +192,36 @@ 
 	 *
 	 * @var [type]
 	 */
-	public $children         = null;
+	public $children = null;
 
 	/**
 	 * Is this a child only asset? if marked as true does not auto display on menu options and can only be linked in as a child property to an asset.
 	 *
 	 * @var bool
 	 */
-	public $is_child         = false;
+	public $is_child = false;
 
 	/**
 	 * Asset that can be a child, ie an article belonging to a category
 	 *
 	 * @var [type]
 	 */
-	public $accept           = null;
+	public $accept = null;
 
 	/**
 	 * assets that can be children, a value means it is limited to that many children, -1 means unlimited
 	 * @TodO update this to better display with a selct / multiSelect null / 0 / -1 or any falsy is unlimited, else it is limited to that number...
 	 * @var [type]
 	 */
-	public $accept_limit     = null;
+	public $accept_limit = null;
 
 
 	/**
 	 * generate the route for this asset
 	 * Overwrite this in your own assets to generate your own route
 	 */
-	public static function route(DatastorePages $record, $route = null){
-		if(null === $route){
+	public static function route(DatastorePages $record, $route = null) {
+		if (null === $route) {
 			$route = 'frontend.ams.page.slug';
 		}
 		$page = $record->page;
@@ -252,8 +252,8 @@ 
 	 *
 	 * @return array
 	 */
-	public static function getDefaultProperties(){
-		$obj	 = new ReflectionClass(get_called_class());
+	public static function getDefaultProperties() {
+		$obj = new ReflectionClass(get_called_class());
 		return $obj->getDefaultProperties();
 	}
 
@@ -267,7 +267,7 @@ 
 	public static function getValueLabel()
 	{
 		$props = self::getDefaultProperties();
-		if(empty($props['value_equals']) || empty($props['properties'][$props['value_equals']]['name'])){
+		if (empty($props['value_equals']) || empty($props['properties'][$props['value_equals']]['name'])) {
 			throw new DatastoreException("value_equals is a required parameter");
 		}
 
@@ -316,7 +316,7 @@ 
 		$parts = explode('\\', $path);
 
 		$split = array_search('Ams', $parts);
-		$ns = array_slice($parts, 0, $split);  // first part
+		$ns = array_slice($parts, 0, $split); // first part
 		$path = array_slice($parts, $split); // second part
 
 		$ns = implode("", $ns);
@@ -347,7 +347,7 @@ 
 		{
 			$args['unique_id'] = uniqid();
 		}
-		$data['data']			 = $args;
+		$data['data'] = $args;
 		$data['asset_classname'] = $injectedform;
 		return View::make($template, $data)->render();
 	}
@@ -363,9 +363,9 @@ 
 	public static function render($args = [], $params = false)
 	{
 
-		if(is_string($params)){
+		if (is_string($params)) {
 			$template = $params;
-		} else {
+		}else {
 			$template = is_array($params) && !empty($params['view']) ? $params['view'] : self::getFilename();
 		}
 
@@ -405,8 +405,8 @@ 
 	 * @return void
 	 * @author Craig Smith <craig.smith@customd.com>
 	 */
-	public static function getPath($className = null){
-		if(null === $className) {
+	public static function getPath($className = null) {
+		if (null === $className) {
 			$className = get_called_class();
 		}
 		return Helpers::getPath($className);

Braces +1 added lines, -2 removed lines

@@ -293,8 +293,7 @@
 				$out = $props[$lookup];
 				unset($obj, $props);
 				return $out;
-			}
-			else
+			} else
 			{
 				unset($obj, $props);
 				return false;

src/Database/Seeds/DatastoreRolesSeeder.php

Indentation +12 added lines, -12 removed lines

@@ -12,23 +12,23 @@
 class DatastoreRolesSeeder extends Seeder
 {
 
-    /**
-     * Run the database seed.
-     */
-    public function run()
-    {
+	/**
+	 * Run the database seed.
+	 */
+	public function run()
+	{
 
-        // Create Roles
-        $cms = Role::create(['name' => 'cms']);
+		// Create Roles
+		$cms = Role::create(['name' => 'cms']);
 
-        // Create Permissions
-        $permissions = ['manage datastore'];
+		// Create Permissions
+		$permissions = ['manage datastore'];
 
-        foreach ($permissions as $permission) {
-            Permission::create(['name' => $permission]);
+		foreach ($permissions as $permission) {
+			Permission::create(['name' => $permission]);
 		}
 
 		$cms->givePermissionTo('manage datastore');
 
-    }
+	}
 }

src/Database/migrations/2019_05_06_151831_create_datastore_datastore_table.php

Indentation +25 added lines, -25 removed lines

@@ -10,41 +10,41 @@
  */
 class CreateDatastoreDatastoreTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('datastore_datastore', function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->unsignedBigInteger('datastore_id')->nullable();
-            $table->unsignedBigInteger('datastore2_id')->nullable();
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('datastore_datastore', function (Blueprint $table) {
+			$table->bigIncrements('id');
+			$table->unsignedBigInteger('datastore_id')->nullable();
+			$table->unsignedBigInteger('datastore2_id')->nullable();
 
 			$table->unique(['datastore2_id', 'datastore_id']);
-            $table->index('datastore_id');
-            $table->index('datastore2_id');
+			$table->index('datastore_id');
+			$table->index('datastore2_id');
 
 
-            $table->foreign('datastore_id')->references('id')->on('datastore')->onDelete('CASCADE')->onUpdate('RESTRICT');
+			$table->foreign('datastore_id')->references('id')->on('datastore')->onDelete('CASCADE')->onUpdate('RESTRICT');
 			$table->foreign('datastore2_id')->references('id')->on('datastore')->onDelete('CASCADE')->onUpdate('RESTRICT');
 
 
 
-        });
+		});
 
 
 
-    }
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('datastore_datastore');
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::dropIfExists('datastore_datastore');
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
      */
     public function up()
     {
-        Schema::create('datastore_datastore', function (Blueprint $table) {
+        Schema::create('datastore_datastore', function(Blueprint $table) {
             $table->bigIncrements('id');
             $table->unsignedBigInteger('datastore_id')->nullable();
             $table->unsignedBigInteger('datastore2_id')->nullable();

src/Database/migrations/2019_05_06_151819_create_datastore_table.php

Indentation +51 added lines, -51 removed lines

@@ -10,68 +10,68 @@
  */
 class CreateDatastoreTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('datastore', function (Blueprint $table) {
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('datastore', function (Blueprint $table) {
 			$table->bigIncrements('id');
-            $table->string('type', 255)->nullable();
-            $table->string('namespace', 255)->nullable();
-            $table->string('module', 255);
-            $table->string('name', 255)->nullable();
-            $table->string('key', 255)->nullable();
-            $table->unsignedTinyInteger('private')->nullable()->default(0);
-            $table->longText('value')->nullable();
-            $table->string('options', 255)->nullable();
-            $table->string('meta', 255)->nullable();
-            $table->string('accept', 255)->nullable()->comment('comma separated list of assets it accepts as related');
-            $table->string('accept_limit', 255)->nullable();
-            $table->unsignedBigInteger('datastore_id')->nullable();
-            $table->string('shortname', 255)->nullable();
-            $table->string('children', 255)->nullable();
-            $table->unsignedTinyInteger('is_child')->nullable();
-            $table->string('status', 255)->nullable();
-            $table->string('embedded', 255)->nullable();
-            $table->string('theme', 50)->nullable();
-            $table->text('meta_description')->nullable();
-            $table->text('meta_keywords')->nullable();
-            $table->text('page_css')->nullable();
-            $table->text('page_js')->nullable();
-            $table->string('limit', 20)->nullable();
-            $table->string('warning', 20)->nullable();
-            $table->string('callback', 255)->nullable();
-            $table->unsignedTinyInteger('required')->nullable();
-            $table->string('comment_equals', 255)->nullable();
-            $table->integer('max_instances')->nullable()->default(0);
-            $table->date('start_date')->nullable();
-            $table->date('end_date')->nullable();
+			$table->string('type', 255)->nullable();
+			$table->string('namespace', 255)->nullable();
+			$table->string('module', 255);
+			$table->string('name', 255)->nullable();
+			$table->string('key', 255)->nullable();
+			$table->unsignedTinyInteger('private')->nullable()->default(0);
+			$table->longText('value')->nullable();
+			$table->string('options', 255)->nullable();
+			$table->string('meta', 255)->nullable();
+			$table->string('accept', 255)->nullable()->comment('comma separated list of assets it accepts as related');
+			$table->string('accept_limit', 255)->nullable();
+			$table->unsignedBigInteger('datastore_id')->nullable();
+			$table->string('shortname', 255)->nullable();
+			$table->string('children', 255)->nullable();
+			$table->unsignedTinyInteger('is_child')->nullable();
+			$table->string('status', 255)->nullable();
+			$table->string('embedded', 255)->nullable();
+			$table->string('theme', 50)->nullable();
+			$table->text('meta_description')->nullable();
+			$table->text('meta_keywords')->nullable();
+			$table->text('page_css')->nullable();
+			$table->text('page_js')->nullable();
+			$table->string('limit', 20)->nullable();
+			$table->string('warning', 20)->nullable();
+			$table->string('callback', 255)->nullable();
+			$table->unsignedTinyInteger('required')->nullable();
+			$table->string('comment_equals', 255)->nullable();
+			$table->integer('max_instances')->nullable()->default(0);
+			$table->date('start_date')->nullable();
+			$table->date('end_date')->nullable();
 			$table->string('lang', 255)->nullable();
 			$table->timestamps();
 
 
 
 
-            $table->index('datastore_id', 'index_foreignkey_datastore');
+			$table->index('datastore_id', 'index_foreignkey_datastore');
 
-            $table->foreign('datastore_id', 'datastore_ibfk_1')->references('id')->on('datastore')->onDelete('CASCADE')->onUpdate('RESTRICT');
+			$table->foreign('datastore_id', 'datastore_ibfk_1')->references('id')->on('datastore')->onDelete('CASCADE')->onUpdate('RESTRICT');
 
-        });
+		});
 
 
 
-    }
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('datastore');
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::dropIfExists('datastore');
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
      */
     public function up()
     {
-        Schema::create('datastore', function (Blueprint $table) {
+        Schema::create('datastore', function(Blueprint $table) {
 			$table->bigIncrements('id');
             $table->string('type', 255)->nullable();
             $table->string('namespace', 255)->nullable();

src/Database/migrations/2019_05_06_151845_create_datastore_comments_table.php

Indentation +25 added lines, -25 removed lines

@@ -10,34 +10,34 @@
  */
 class CreateDatastoreCommentsTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('datastore_comments', function (Blueprint $table) {
-            $table->bigIncrements('id');
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('datastore_comments', function (Blueprint $table) {
+			$table->bigIncrements('id');
 			$table->bigInteger('user_id')->unsigned();
-            $table->bigInteger('datastore_id')->unsigned();
-            $table->bigInteger('parent_id')->unsigned()->nullable();
-            $table->text('body');
-            $table->timestamps();
-            $table->softDeletes();
-        });
+			$table->bigInteger('datastore_id')->unsigned();
+			$table->bigInteger('parent_id')->unsigned()->nullable();
+			$table->text('body');
+			$table->timestamps();
+			$table->softDeletes();
+		});
 
 
 
-    }
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('datastore_comments');
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::dropIfExists('datastore_comments');
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
      */
     public function up()
     {
-        Schema::create('datastore_comments', function (Blueprint $table) {
+        Schema::create('datastore_comments', function(Blueprint $table) {
             $table->bigIncrements('id');
 			$table->bigInteger('user_id')->unsigned();
             $table->bigInteger('datastore_id')->unsigned();

src/Database/migrations/2019_05_06_151845_create_datastore_pages_table.php

Indentation +27 added lines, -27 removed lines

@@ -10,37 +10,37 @@
  */
 class CreateDatastorePagesTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('datastore_pages', function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->string('title', 255)->nullable();
-            $table->string('slug', 255)->nullable();
-            $table->unsignedBigInteger('asset')->nullable()->default(0);
-
-
-
-            $table->foreign('asset', 'datastore_asset_foreign_key')->references('id')->on('datastore')->onDelete('RESTRICT
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('datastore_pages', function (Blueprint $table) {
+			$table->bigIncrements('id');
+			$table->string('title', 255)->nullable();
+			$table->string('slug', 255)->nullable();
+			$table->unsignedBigInteger('asset')->nullable()->default(0);
+
+
+
+			$table->foreign('asset', 'datastore_asset_foreign_key')->references('id')->on('datastore')->onDelete('RESTRICT
 ')->onUpdate('RESTRICT');
 
-        });
+		});
 
 
 
-    }
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('datastore_pages');
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::dropIfExists('datastore_pages');
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
      */
     public function up()
     {
-        Schema::create('datastore_pages', function (Blueprint $table) {
+        Schema::create('datastore_pages', function(Blueprint $table) {
             $table->bigIncrements('id');
             $table->string('title', 255)->nullable();
             $table->string('slug', 255)->nullable();

src/Repositories/DatastoreDatastoreRepository.php

Indentation +6 added lines, -6 removed lines

@@ -10,12 +10,12 @@
  */
 class DatastoreDatastoreRepository extends BaseRepository
 {
-    /**
-     * @return string
-     */
-    public function model()
-    {
-        return DatastoreDatastore::class;
+	/**
+	 * @return string
+	 */
+	public function model()
+	{
+		return DatastoreDatastore::class;
 	}
 
 	public function paginateAccepted($datastore_id, $status = NULL, $limit = 25, $pageName = 'page', $page = null){

Spacing +3 added lines, -3 removed lines

@@ -18,12 +18,12 @@
         return DatastoreDatastore::class;
 	}
 
-	public function paginateAccepted($datastore_id, $status = NULL, $limit = 25, $pageName = 'page', $page = null){
+	public function paginateAccepted($datastore_id, $status = NULL, $limit = 25, $pageName = 'page', $page = null) {
 		$this->where('datastore2_id', $datastore_id)->with('datastore');
 
 			$this->whereHas('datastore', function($query) use ($status) {
-				if($status){
-					if(!is_array($status)){
+				if ($status) {
+					if (!is_array($status)) {
 						$status = [$status];
 					}
 					$query->whereIn('status', $status);