phpsa / datastore

src/Helpers.php

Indentation +3 added lines, -3 removed lines

@@ -16,8 +16,8 @@ 
 	 * @return bool
 	 */
 	public static function isAssocArray(array $array){
-        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);
 	}
 
 	/**
@@ -176,7 +176,7 @@ 
 	}
 
 
-    /**
+	/**
 	 * Gets the module based on the classname
 	 * @param string $class
 	 * @return string

Spacing +31 added lines, -32 removed lines

@@ -15,7 +15,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public static function isAssocArray(array $array){
+	public static function isAssocArray(array $array) {
         if (array() === $array) return false;
         return array_keys($array) !== range(0, count($array) - 1);
 	}
@@ -33,8 +33,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) ? str_replace(' ', $glue, $return) : $return;
 	}
@@ -47,9 +46,9 @@ 
 	 *
 	 * @return void
 	 */
-	public static function parseAssetType($queryString, $key = false){
+	public static function parseAssetType($queryString, $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);
@@ -57,7 +56,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];
@@ -70,7 +69,7 @@ 
 	 *
 	 * @return void
 	 */
-	public static function getAssetItem($className){
+	public static function getAssetItem($className) {
 		return array(
 			'class'			 => $className,
 			'name'			 => Self::assetInfo($className, 'name'),
@@ -87,22 +86,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;
@@ -120,7 +119,7 @@ 
 	{
 		$assets = array();
 		$datastoreAssets = config("datastore.assets");
-		foreach($datastoreAssets as $className){
+		foreach ($datastoreAssets as $className) {
 
 			$asset = self::getAssetItem($className);
 
@@ -128,20 +127,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
 				{
@@ -152,8 +151,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
 			{
@@ -164,9 +163,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']);
 				});
 			}
@@ -186,7 +185,7 @@ 
 		$parts = explode('\\', $class);
 		array_pop($parts);
 		$ns = '';
-		if(end($parts) !== 'Ams'){
+		if (end($parts) !== 'Ams') {
 			$ns = ucfirst(array_pop($parts));
 		}
 
@@ -211,10 +210,10 @@ 
 	 * @return void
 	 * @author Craig Smith <craig.smith@customd.com>
 	 */
-	public static function getPath($className){
+	public static function getPath($className) {
 		$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);
 	}
 
 	/**
@@ -254,15 +253,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

@@ -16,7 +16,9 @@ 
 	 * @return bool
 	 */
 	public static function isAssocArray(array $array){
-        if (array() === $array) return false;
+        if (array() === $array) {
+        	return false;
+        }
         return array_keys($array) !== range(0, count($array) - 1);
 	}
 
@@ -142,8 +144,7 @@ 
 				{
 					$mod			 = Helpers::getModule($child['class']);
 					$assets[strtolower($mod)][strtolower($child['shortname'])]	 = $child;
-				}
-				else
+				} else
 				{
 					$assets[strtolower($child['shortname'])] = $child;
 				}
@@ -154,8 +155,7 @@ 
 			{
 				$mod			 = Helpers::getModule($className);
 				$assets[strtolower($mod)][strtolower($asset['shortname'])]	 = $asset;
-			}
-			else
+			} else
 			{
 				$assets[strtolower($asset['shortname'])] = $asset;
 			}
@@ -258,14 +258,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++)
 			{

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