phpsa / datastore

src/Ams/HtmlAsset.php

Indentation +6 added lines, -6 removed lines

@@ -5,12 +5,12 @@
 
 class HtmlAsset extends Asset {
 
-    public $type = HtmlAsset::class;
-    public $namespace = 'property';
+	public $type = HtmlAsset::class;
+	public $namespace = 'property';
 	public $options = ["formatting", "bold", "italic", "deleted", "unorderedlist","orderedlist", "image", "file", "link"];
 
-    // return it raw
-    public static function html($data) {
-        return $data['value'];
-    }
+	// return it raw
+	public static function html($data) {
+		return $data['value'];
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 
     public $type = HtmlAsset::class;
     public $namespace = 'property';
-	public $options = ["formatting", "bold", "italic", "deleted", "unorderedlist","orderedlist", "image", "file", "link"];
+	public $options = ["formatting", "bold", "italic", "deleted", "unorderedlist", "orderedlist", "image", "file", "link"];
 
     // return it raw
     public static function html($data) {

src/Ams/DropdownAsset.php

Indentation +5 added lines, -5 removed lines

@@ -5,10 +5,10 @@
 
 class DropdownAsset extends Asset {
 
-    public $type = DropdownAsset::class;
-    public $namespace = 'property';
+	public $type = DropdownAsset::class;
+	public $namespace = 'property';
 
-    public static function html($data) {
-        return '<span>' . $data['value'] . '</span>';
-    }
+	public static function html($data) {
+		return '<span>' . $data['value'] . '</span>';
+	}
 }
\ No newline at end of file

src/Ams/TextAsset.php

Indentation +5 added lines, -5 removed lines

@@ -4,11 +4,11 @@
 
 class TextAsset extends Asset {
 
-    public $type = TextAsset::class;
-    public $namespace = 'property';
+	public $type = TextAsset::class;
+	public $namespace = 'property';
 
-    public static function html($data) {
-        return '<p>' . $data['value'] . '</p>';
-    }
+	public static function html($data) {
+		return '<p>' . $data['value'] . '</p>';
+	}
 
 }
\ No newline at end of file

src/Ams/TabsAsset.php

Indentation +3 added lines, -3 removed lines

@@ -26,11 +26,11 @@
 			'type' => self::HTML
 		),
 		'status' => array(
-            'name' => 'Published',
-            'type' => self::DROPDOWN,
+			'name' => 'Published',
+			'type' => self::DROPDOWN,
 			'options' => ['published' => 'Published', 'unpublished' => 'Unpublished'],
 			'published' => ['published']
-        ),
+		),
 	);
 
 	public static function about() {

src/views/form/sub-heading-asset.blade.php

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <div class="row form-group">
-	<?php $key = isset($data['unique_id']) ? $data['key'] . '_' . $data['unique_id'] : $data['key'] ; ?>
+	<?php $key = isset($data['unique_id']) ? $data['key'] . '_' . $data['unique_id'] : $data['key']; ?>
 		{{ html()->label($data['name'])->class('col-md-2 form-control-label')->for($key) }}
 		<div class="col-md-10">
 
@@ -7,16 +7,16 @@ 
 			->text()
 			->attribute('id', $key)
 			->class('form-control');
-			if($data['required']){
+			if ($data['required']) {
 				$input = $input->required();
 			}
-			if($asset_classname){
+			if ($asset_classname) {
 				$name = 'assetInjectionform[' . $asset_classname . '][' . $data['unique_id'] . '][' . $data['key'] . ']';
-			}else{
+			}else {
 				$name = $data['key'];
 			}
 
-			$name .= (isset($multiform) && $multiform) ? '[]' : '';?>
+			$name .= (isset($multiform) && $multiform) ? '[]' : ''; ?>
 
 			{{ $input->name($name)->value(old($name, !empty($data['value']) ? $data['value'] : NULL)) }}
 

Braces +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 			}
 			if($asset_classname){
 				$name = 'assetInjectionform[' . $asset_classname . '][' . $data['unique_id'] . '][' . $data['key'] . ']';
-			}else{
+			} else{
 				$name = $data['key'];
 			}
 

src/views/form/string-asset.blade.php

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <div class="row form-group">
-	<?php $key = isset($data['unique_id']) ? $data['key'] . '_' . $data['unique_id'] : $data['key'] ; ?>
+	<?php $key = isset($data['unique_id']) ? $data['key'] . '_' . $data['unique_id'] : $data['key']; ?>
 		{{ html()->label($data['name'])->class('col-md-2 form-control-label')->for($key) }}
 		<div class="col-md-10">
 
@@ -7,16 +7,16 @@ 
 			->text()
 			->attribute('id', $key)
 			->class('form-control');
-			if($data['required']){
+			if ($data['required']) {
 				$input = $input->required();
 			}
-			if($asset_classname){
+			if ($asset_classname) {
 				$name = 'assetInjectionform[' . $asset_classname . '][' . $data['unique_id'] . '][' . $data['key'] . ']';
-			}else{
+			}else {
 				$name = $data['key'];
 			}
 
-			$name .= (isset($multiform) && $multiform) ? '[]' : '';?>
+			$name .= (isset($multiform) && $multiform) ? '[]' : ''; ?>
 
 			{{ $input->name($name)->value(old($name, !empty($data['value']) ? $data['value'] : NULL)) }}
 

Braces +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 			}
 			if($asset_classname){
 				$name = 'assetInjectionform[' . $asset_classname . '][' . $data['unique_id'] . '][' . $data['key'] . ']';
-			}else{
+			} else{
 				$name = $data['key'];
 			}
 

src/Ams/ImageAsset.php

Indentation +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
 	public static function html($data) :string
 	{
 		return '<img src="' . self::getImageUrl($data['value']) . '" />';
-    }
+	}
 
 
 

Spacing +7 added lines, -7 removed lines

@@ -31,24 +31,24 @@
 	 */
 	public static function getImageUrl(string $filename, int $width = null, int $height = null) :string
 	{
-		$imagePath = public_path().'/vendor/phpsa-datastore/';
+		$imagePath = public_path() . '/vendor/phpsa-datastore/';
 
 		if ($width !== null || $height !== null) {
-			$path = 'thumbs/' . (int) $width .  'x' . (int) $height  . '.' . $filename;
+			$path = 'thumbs/' . (int) $width . 'x' . (int) $height . '.' . $filename;
 
-			if(!is_file($imagePath . $path)){
-				try{
+			if (!is_file($imagePath . $path)) {
+				try {
 					Image::make($imagePath . 'img/' . $filename)
-						->resize($width, $height, function ($constraint)
+						->resize($width, $height, function($constraint)
 							{
 								$constraint->aspectRatio();
 							})
 							->save($imagePath . $path);
-				}catch(\Exception $e){
+				}catch (\Exception $e) {
 					//Silent fallback as the image does not exist!
 				}
 			}
-		}else{
+		}else {
 			$path = 'img/' . $filename;
 		}
 		return '/vendor/phpsa-datastore/' . $path;

Braces +2 added lines, -2 removed lines

@@ -44,11 +44,11 @@
 								$constraint->aspectRatio();
 							})
 							->save($imagePath . $path);
-				}catch(\Exception $e){
+				} catch(\Exception $e){
 					//Silent fallback as the image does not exist!
 				}
 			}
-		}else{
+		} else{
 			$path = 'img/' . $filename;
 		}
 		return '/vendor/phpsa-datastore/' . $path;

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'));
 	}
 

src/Helpers.php

Indentation +3 added lines, -3 removed lines

@@ -17,8 +17,8 @@ 
 	 */
 	public static function isAssocArray(array $array) :bool
 	{
-        if (array() === $array) return false;
-        return array_keys($array) !== range(0, count($array) - 1);
+		if (array() === $array) return false;
+		return array_keys($array) !== range(0, count($array) - 1);
 	}
 
 	/**
@@ -179,7 +179,7 @@ 
 	}
 
 
-    /**
+	/**
 	 * Gets the module based on the classname
 	 * @param string $class
 	 * @return string

Spacing +27 added lines, -28 removed lines

@@ -34,8 +34,7 @@ 
 		$pattern	 = "/(.)([A-Z])/";
 		$replacement = "\\1 \\2";
 		$return		 = ($ucfirst) ?
-			ucfirst(preg_replace($pattern, $replacement, $string)) :
-			strtolower(preg_replace($pattern, $replacement, $string));
+			ucfirst(preg_replace($pattern, $replacement, $string)) : strtolower(preg_replace($pattern, $replacement, $string));
 
 		return ($glue !== null) ? str_replace(' ', $glue, $return) : $return;
 	}
@@ -51,7 +50,7 @@ 
 	public static function parseAssetType(string $queryString, bool $key = false)
 	{
 		$assetParts = explode(".", strtolower($queryString));
-		if(count($assetParts) > 2){
+		if (count($assetParts) > 2) {
 			throw new DatastoreException("Assets are only 2 tiers deep");
 		}
 		$asset = array_pop($assetParts);
@@ -59,7 +58,7 @@ 
 
 		$list = !empty($assetParts) && isset($list[$assetParts[0]]) ? $list[$assetParts[0]] : array_shift($list);
 
-		if(!isset($list[$asset])){
+		if (!isset($list[$asset])) {
 			throw new DatastoreException("Asset not found");
 		}
 		return $key ? $list[$asset]['class'] : $list[$asset];
@@ -90,22 +89,22 @@ 
 		);
 	}
 
-	public static function getStatusEquals($className){
+	public static function getStatusEquals($className) {
 		$statusEquals = self::assetInfo($className, 'status_equals');
-		if(!$statusEquals){
+		if (!$statusEquals) {
 			return null;
 		}
-		$props = self::getAssetProps($className,$statusEquals);
-		return isset($props['published'])?$props['published'] : null;
+		$props = self::getAssetProps($className, $statusEquals);
+		return isset($props['published']) ? $props['published'] : null;
 	}
 
 
-	public static function getAssetProps($className, $property = null){
+	public static function getAssetProps($className, $property = null) {
 		$properties = self::assetInfo($className, 'properties');
-		if(!$properties){
+		if (!$properties) {
 			throw new DatastoreException("No Properties found for asset");
 		}
-		if($property){
+		if ($property) {
 			return isset($properties[$property]) ? $properties[$property] : null;
 		}
 		return $properties;
@@ -123,7 +122,7 @@ 
 	{
 		$assets = array();
 		$datastoreAssets = config("datastore.assets");
-		foreach($datastoreAssets as $className){
+		foreach ($datastoreAssets as $className) {
 
 			$asset = self::getAssetItem($className);
 
@@ -131,20 +130,20 @@ 
 				throw new DatastoreException('Only assets of type assets should be used ' . $className);
 			}
 
-			if(!$includeChildren && $asset['is_child']){
+			if (!$includeChildren && $asset['is_child']) {
 				continue;
 			}
 
-			if($asset['children'] && $includeChildren && !in_array($asset['children'], $datastoreAssets)){
-				$child =  self::getAssetItem($asset['children']);
+			if ($asset['children'] && $includeChildren && !in_array($asset['children'], $datastoreAssets)) {
+				$child = self::getAssetItem($asset['children']);
 				if (self::assetNamespace($child['class']) !== 'asset') {
 					throw new DatastoreException('Only assets of type assets should be used ' . $child['class']);
 				}
 
 				if ($grouped)
 				{
-					$mod			 = Helpers::getModule($child['class']);
-					$assets[strtolower($mod)][strtolower($child['shortname'])]	 = $child;
+					$mod = Helpers::getModule($child['class']);
+					$assets[strtolower($mod)][strtolower($child['shortname'])] = $child;
 				}
 				else
 				{
@@ -155,8 +154,8 @@ 
 
 			if ($grouped)
 			{
-				$mod			 = Helpers::getModule($className);
-				$assets[strtolower($mod)][strtolower($asset['shortname'])]	 = $asset;
+				$mod = Helpers::getModule($className);
+				$assets[strtolower($mod)][strtolower($asset['shortname'])] = $asset;
 			}
 			else
 			{
@@ -167,9 +166,9 @@ 
 		}
 
 		ksort($assets);
-		if($grouped){
-			foreach($assets as &$group){
-				uasort($group, function ($a , $b) {
+		if ($grouped) {
+			foreach ($assets as &$group) {
+				uasort($group, function($a, $b) {
 					return strcmp($a['name'], $b['name']);
 				});
 			}
@@ -189,7 +188,7 @@ 
 		$parts = explode('\\', $class);
 		array_pop($parts);
 		$ns = '';
-		if(end($parts) !== 'Ams'){
+		if (end($parts) !== 'Ams') {
 			$ns = ucfirst(array_pop($parts));
 		}
 
@@ -217,7 +216,7 @@ 
 	{
 		$mod = self::getModule($className);
 		$sn = Self::assetInfo($className, 'shortname');
-		return !empty($mod) ? strtolower($mod .'.' . $sn) : strtolower($sn);
+		return !empty($mod) ? strtolower($mod . '.' . $sn) : strtolower($sn);
 	}
 
 	/**
@@ -257,15 +256,15 @@ 
 		}
 		$fp = fopen(FCPATH . $file, 'r');
 
-		$class	 = $buffer	 = '';
-		$i		 = 0;
+		$class = $buffer = '';
+		$i = 0;
 		while (!$class)
 		{
 			if (feof($fp))
 				break;
 
-			$buffer	 .= fread($fp, 512);
-			$tokens	 = token_get_all($buffer);
+			$buffer .= fread($fp, 512);
+			$tokens = token_get_all($buffer);
 
 			if (strpos($buffer, '{') === false)
 				continue;

Braces +11 added lines, -9 removed lines

@@ -17,7 +17,9 @@ 
 	 */
 	public static function isAssocArray(array $array) :bool
 	{
-        if (array() === $array) return false;
+        if (array() === $array) {
+        	return false;
+        }
         return array_keys($array) !== range(0, count($array) - 1);
 	}
 
@@ -145,8 +147,7 @@ 
 				{
 					$mod			 = Helpers::getModule($child['class']);
 					$assets[strtolower($mod)][strtolower($child['shortname'])]	 = $child;
-				}
-				else
+				} else
 				{
 					$assets[strtolower($child['shortname'])] = $child;
 				}
@@ -157,8 +158,7 @@ 
 			{
 				$mod			 = Helpers::getModule($className);
 				$assets[strtolower($mod)][strtolower($asset['shortname'])]	 = $asset;
-			}
-			else
+			} else
 			{
 				$assets[strtolower($asset['shortname'])] = $asset;
 			}
@@ -261,14 +261,16 @@ 
 		$i		 = 0;
 		while (!$class)
 		{
-			if (feof($fp))
-				break;
+			if (feof($fp)) {
+							break;
+			}
 
 			$buffer	 .= fread($fp, 512);
 			$tokens	 = token_get_all($buffer);
 
-			if (strpos($buffer, '{') === false)
-				continue;
+			if (strpos($buffer, '{') === false) {
+							continue;
+			}
 
 			for (; $i < count($tokens); $i++)
 			{