phpsa / datastore

src/Datastore.php

Spacing +60 added lines, -60 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);
 			}
 		}
@@ -990,9 +990,9 @@ 
 	 */
 	public function statusIsActive() :bool
 	{
-		if($this->__status_equals){
+		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");
 			}
 

src/Http/Controllers/DatastoreController.php

Indentation +9 added lines, -9 removed lines

@@ -17,17 +17,17 @@
 	/**
 	 * @var DatastoreRepository
 	 */
-    protected $datastoreRepository;
+	protected $datastoreRepository;
 
-    /**
-     * UserController constructor.
-     *
-     * @param DatastoreRepository $datastoreRepository
+	/**
+	 * UserController constructor.
+	 *
+	 * @param DatastoreRepository $datastoreRepository
 	 * @todo get rid of these datastoreRepository and make use of the mode only
-     */
-    public function __construct(DatastoreRepository $datastoreRepository)
-    {
-        $this->datastoreRepository = $datastoreRepository;
+	 */
+	public function __construct(DatastoreRepository $datastoreRepository)
+	{
+		$this->datastoreRepository = $datastoreRepository;
 	}
 
 	/**

Spacing +6 added lines, -6 removed lines

@@ -52,16 +52,16 @@ 
 	 *
 	 * @return DatastorePages
 	 */
-	protected function getPageBySlug($slug){
+	protected function getPageBySlug($slug) {
 		$page = DatastorePages::where('slug', $slug)->first();
-		if(!$page){
+		if (!$page) {
 			abort(404);
 		}
 
 		$datastore = $page->datastore;
 		$user = auth()->user();
 
-		if(!$datastore->statusIsActive() && (!$user || !$user->can('manage datastore'))) {
+		if (!$datastore->statusIsActive() && (!$user || !$user->can('manage datastore'))) {
 			abort(404);
 		}
 		return $page;
@@ -74,7 +74,7 @@ 
 	 *
 	 * @return \Illuminate\View\View|\Illuminate\Contracts\View\Factory
 	 */
-	public function page($slug){
+	public function page($slug) {
 
 		$page = $this->getPageBySlug($slug);
 
@@ -88,11 +88,11 @@ 
 
 	}
 
-	public function childPage($parent_slug, $slug){
+	public function childPage($parent_slug, $slug) {
 		return $this->page($slug);
 	}
 
-	public function articleByAuthor($author_id, $slug){
+	public function articleByAuthor($author_id, $slug) {
 		$this->datastoreRepository->paginateSearchProp('author', $author_id, Phpsa\Datastore\Ams\Article\ItemAsset::class, $this->canViewAll('published'));
 	}