x-systems / epesi-base

tests/CommonDataTest.php

Indentation +50 added lines, -50 removed lines

@@ -25,81 +25,81 @@
 		$this->loadMigrationsFrom(__DIR__ . '../../src/CommonData/Database/Migrations');
 	}
 	
-    public function testStoreRetrieve()
-    {
-    	// creating -  retrieving array
-    	$arrayExpected = ['c' => 'cc', 'b' => 'bb', 'a' => 'aa', ];
+	public function testStoreRetrieve()
+	{
+		// creating -  retrieving array
+		$arrayExpected = ['c' => 'cc', 'b' => 'bb', 'a' => 'aa', ];
     	
-    	CommonData::newArray('abc/def', $arrayExpected);
+		CommonData::newArray('abc/def', $arrayExpected);
         
-        $arrayActual = CommonData::getArray('abc/def');
+		$arrayActual = CommonData::getArray('abc/def');
         
-        $this->assertEquals($arrayExpected, $arrayActual, 'Problem retrieving commondata sorted by position!');
+		$this->assertEquals($arrayExpected, $arrayActual, 'Problem retrieving commondata sorted by position!');
         
-        // retrieving sorted array by key
-        $arraySortKey = $arrayExpected;
-        ksort($arraySortKey);
+		// retrieving sorted array by key
+		$arraySortKey = $arrayExpected;
+		ksort($arraySortKey);
         
-        $this->assertEquals($arraySortKey, CommonData::getArray('abc/def', 'key'), 'Problem retrieving commondata sorted by key!');
+		$this->assertEquals($arraySortKey, CommonData::getArray('abc/def', 'key'), 'Problem retrieving commondata sorted by key!');
         
-        // retrieving sorted array by value
-        $arraySortValue = $arrayExpected;
-        sort($arraySortValue);
+		// retrieving sorted array by value
+		$arraySortValue = $arrayExpected;
+		sort($arraySortValue);
         
-        $this->assertEquals($arraySortKey, CommonData::getArray('abc/def', 'value'), 'Problem retrieving commondata sorted by value!');
+		$this->assertEquals($arraySortKey, CommonData::getArray('abc/def', 'value'), 'Problem retrieving commondata sorted by value!');
         
-        // retrieving array value
-        $valueActual = CommonData::getValue('abc/def/a');
+		// retrieving array value
+		$valueActual = CommonData::getValue('abc/def/a');
         
-        $this->assertEquals($arrayExpected['a'], $valueActual, 'Problem retrieving commondata value!');
+		$this->assertEquals($arrayExpected['a'], $valueActual, 'Problem retrieving commondata value!');
         
-        // setting array values
-        $arrayChanged = ['a' => 'aaa', 'b' => 'bbb', 'c' => 'ccc'];
+		// setting array values
+		$arrayChanged = ['a' => 'aaa', 'b' => 'bbb', 'c' => 'ccc'];
         
-        foreach ($arrayChanged as $key => $value) {
-        	CommonData::setValue('abc/def/' . $key, $value);
-        }
+		foreach ($arrayChanged as $key => $value) {
+			CommonData::setValue('abc/def/' . $key, $value);
+		}
         
-        $arrayActual = CommonData::getArray('abc/def');
+		$arrayActual = CommonData::getArray('abc/def');
         
-        $this->assertEquals($arrayChanged, $arrayActual, 'Problem setting commondata value!');
+		$this->assertEquals($arrayChanged, $arrayActual, 'Problem setting commondata value!');
         
-        // deleting array node
-        unset($arrayChanged['a']);
+		// deleting array node
+		unset($arrayChanged['a']);
         
-        CommonData::deleteArray('abc/def/a');
+		CommonData::deleteArray('abc/def/a');
         
-        $arrayActual = CommonData::getArray('abc/def');
+		$arrayActual = CommonData::getArray('abc/def');
         
-        $this->assertEquals($arrayChanged, $arrayActual, 'Problem deleting commondata node!');
+		$this->assertEquals($arrayChanged, $arrayActual, 'Problem deleting commondata node!');
         
-        // extending array
-        $arrayExtension = ['a' => 'aaa'];
+		// extending array
+		$arrayExtension = ['a' => 'aaa'];
         
-        $arrayChanged = array_merge($arrayChanged, $arrayExtension);
+		$arrayChanged = array_merge($arrayChanged, $arrayExtension);
         
-        CommonData::extendArray('abc/def', $arrayExtension);
+		CommonData::extendArray('abc/def', $arrayExtension);
         
-        $arrayActual = CommonData::getArray('abc/def');
+		$arrayActual = CommonData::getArray('abc/def');
         
-        $this->assertEquals($arrayChanged, $arrayActual, 'Problem extending commondata array!');
-    }
+		$this->assertEquals($arrayChanged, $arrayActual, 'Problem extending commondata array!');
+	}
     
-    public function testNonExistingArrayException()
-    {
-    	$this->expectException(CommonDataNotFound::class);
+	public function testNonExistingArrayException()
+	{
+		$this->expectException(CommonDataNotFound::class);
     	
-    	CommonData::getArray('abc/d/ef');
-    }
+		CommonData::getArray('abc/d/ef');
+	}
     
-    public function testNonExistingArraySilent()
-    {
-    	$this->assertEquals([], CommonData::getArray('abc/d/ef', 'position', true), 'Problem retrieving non-existent commondata array silently!');
-    }
+	public function testNonExistingArraySilent()
+	{
+		$this->assertEquals([], CommonData::getArray('abc/d/ef', 'position', true), 'Problem retrieving non-existent commondata array silently!');
+	}
     
-    public function testNonExistingValue()
-    {
-    	$this->assertFalse(CommonData::getValue('abc/d/ef'), 'Problem retrieving non-existent commondata value!');
-    }
+	public function testNonExistingValue()
+	{
+		$this->assertFalse(CommonData::getValue('abc/d/ef'), 'Problem retrieving non-existent commondata value!');
+	}
     
 }

src/CommonData/Database/Models/CommonData.php

Indentation +156 added lines, -156 removed lines

@@ -9,204 +9,204 @@
 class CommonDataNotFound extends \Exception {}
 
 class CommonData extends Model {
-    use NodeTrait;
+	use NodeTrait;
     
-    protected $table = 'commondata';
-    public $timestamps = false;
-    protected static $unguarded = true;
+	protected $table = 'commondata';
+	public $timestamps = false;
+	protected static $unguarded = true;
     
-    protected static $cache = [
-    		'id' => [],
-    		'value' => [],
-    		'array' => []
-    ];
+	protected static $cache = [
+			'id' => [],
+			'value' => [],
+			'array' => []
+	];
     
-    public static function getId($path, $clearCache = false)
-    {
-    	$parentId = null;
-    	foreach(explode('/', trim($path,'/')) as $nodeKey) {
-    		if ($nodeKey === '') continue; //ignore empty paths
+	public static function getId($path, $clearCache = false)
+	{
+		$parentId = null;
+		foreach(explode('/', trim($path,'/')) as $nodeKey) {
+			if ($nodeKey === '') continue; //ignore empty paths
     		
-    		if ($clearCache || empty(self::$cache['id'][$parentId][$nodeKey])) {
-    			if (! $node = self::where('parent_id', $parentId)->where('key', $nodeKey)->first()) {
-    				return false;
-    			}
+			if ($clearCache || empty(self::$cache['id'][$parentId][$nodeKey])) {
+				if (! $node = self::where('parent_id', $parentId)->where('key', $nodeKey)->first()) {
+					return false;
+				}
 
-    			self::$cache['id'][$parentId][$nodeKey] = $node->id;
-    		}
+				self::$cache['id'][$parentId][$nodeKey] = $node->id;
+			}
     		
-    		$parentId = $id = self::$cache['id'][$parentId][$nodeKey];
-    	}
+			$parentId = $id = self::$cache['id'][$parentId][$nodeKey];
+		}
     	
-    	return $id;
-    }
+		return $id;
+	}
    
-    public static function newId($path, $readonly = false)
-    {
-    	if (! $path = trim($path,'/')) return false;
+	public static function newId($path, $readonly = false)
+	{
+		if (! $path = trim($path,'/')) return false;
 
-    	$id = $parentId = null;
-    	foreach(explode('/', $path) as $nodeKey) {
-    		if ($nodeKey === '') continue;
+		$id = $parentId = null;
+		foreach(explode('/', $path) as $nodeKey) {
+			if ($nodeKey === '') continue;
 
-    		if (! $node = self::where('parent_id', $parentId)->where('key', $nodeKey)->first()) {
-    			$node = self::create([
-    					'parent_id' => $parentId,
-    					'key' => $nodeKey,
-    					'readonly' => $readonly,
-    					'position' => self::where('parent_id', $parentId)->count()
-    			], $parentId? self::find($parentId): null);
-    		}
+			if (! $node = self::where('parent_id', $parentId)->where('key', $nodeKey)->first()) {
+				$node = self::create([
+						'parent_id' => $parentId,
+						'key' => $nodeKey,
+						'readonly' => $readonly,
+						'position' => self::where('parent_id', $parentId)->count()
+				], $parentId? self::find($parentId): null);
+			}
     		
-    		$parentId = $id = $node->id;
-    	}
+			$parentId = $id = $node->id;
+		}
     	
-    	return $id;
-    }
+		return $id;
+	}
     
-    public static function setValue($path, $value, $overwrite = true, $readonly = false)
-    {
-    	if (! $id = self::getId($path)) {
-    		if (! $id = self::newId($path, $readonly)) return false;
-    	} else {
-    		if (! $overwrite) return false;
-    	}
+	public static function setValue($path, $value, $overwrite = true, $readonly = false)
+	{
+		if (! $id = self::getId($path)) {
+			if (! $id = self::newId($path, $readonly)) return false;
+		} else {
+			if (! $overwrite) return false;
+		}
 
-    	self::findOrFail($id)->update(compact('value', 'readonly'));
+		self::findOrFail($id)->update(compact('value', 'readonly'));
     	
-    	self::clearCache();
+		self::clearCache();
     	
-    	return true;
-    }
+		return true;
+	}
     
-    public static function clearCache()
-    {
-    	self::$cache = array_fill_keys(array_keys(self::$cache), []);
-    }
+	public static function clearCache()
+	{
+		self::$cache = array_fill_keys(array_keys(self::$cache), []);
+	}
     
-    public static function getValue($path, $translate = false)
-    {
-    	$key = md5(serialize($path));
+	public static function getValue($path, $translate = false)
+	{
+		$key = md5(serialize($path));
     	
-    	if (! isset(self::$cache['value'][$key])) {
-    		if(! $id = self::getId($path)) return false;
+		if (! isset(self::$cache['value'][$key])) {
+			if(! $id = self::getId($path)) return false;
 
-    		self::$cache['value'][$key] = self::find($id)->value;
-	    }
+			self::$cache['value'][$key] = self::find($id)->value;
+		}
 	    
-	    return $translate? __(self::$cache['value'][$key]): self::$cache['value'][$key];
-    }
+		return $translate? __(self::$cache['value'][$key]): self::$cache['value'][$key];
+	}
         
-    /**
-     * Creates new array for common use.
-     *
-     * @param $path string
-     * @param $array array initialization value
-     * @param $overwrite bool whether method should overwrite if array already exists, otherwise the data will be appended
-     * @param $readonly bool do not allow user to change this array from GUI
-     */
-    public static function newArray($path, $array, $overwrite = false, $readonly = false)
-    {
-    	self::validateArrayKeys($array);
+	/**
+	 * Creates new array for common use.
+	 *
+	 * @param $path string
+	 * @param $array array initialization value
+	 * @param $overwrite bool whether method should overwrite if array already exists, otherwise the data will be appended
+	 * @param $readonly bool do not allow user to change this array from GUI
+	 */
+	public static function newArray($path, $array, $overwrite = false, $readonly = false)
+	{
+		self::validateArrayKeys($array);
     		
-    	$path = trim($path, '/');
+		$path = trim($path, '/');
     	
 		if ($id = self::getId($path)) {
-    		if (! $overwrite) {
-    			self::extendArray($path, $array);
-    			return true;
-    		}
+			if (! $overwrite) {
+				self::extendArray($path, $array);
+				return true;
+			}
     				
-    		self::find($id)->delete();
-    	}
+			self::find($id)->delete();
+		}
     			
-    	if(! $id = self::newId($path, $readonly)) return false;
+		if(! $id = self::newId($path, $readonly)) return false;
     			
-    	if ($overwrite) {
-    		self::find($id)->update(compact('readonly'));
-    	}
+		if ($overwrite) {
+			self::find($id)->update(compact('readonly'));
+		}
     			
-    	foreach ($array as $key => $value) {
-    		self::setValue($path . '/' . $key, $value, true, $readonly);
-    	}
+		foreach ($array as $key => $value) {
+			self::setValue($path . '/' . $key, $value, true, $readonly);
+		}
     			
-    	return true;
-    }
+		return true;
+	}
 
-    /**
-     * Extends common data array.
-     *
-     * @param $path string
-     * @param $array array values to insert
-     * @param $overwrite bool whether method should overwrite data if array key already exists, otherwise the data will be preserved
-     */
-    public static function extendArray($path, $array, $overwrite=false, $readonly=false)
-    {
-    	self::validateArrayKeys($array);
+	/**
+	 * Extends common data array.
+	 *
+	 * @param $path string
+	 * @param $array array values to insert
+	 * @param $overwrite bool whether method should overwrite data if array key already exists, otherwise the data will be preserved
+	 */
+	public static function extendArray($path, $array, $overwrite=false, $readonly=false)
+	{
+		self::validateArrayKeys($array);
     	
-    	$path = trim($path, '/');
+		$path = trim($path, '/');
     			
-    	if (! self::getId($path)){
-    		return self::newArray($path, $array, $overwrite, $readonly);
-    	}
+		if (! self::getId($path)){
+			return self::newArray($path, $array, $overwrite, $readonly);
+		}
 
-    	foreach ($array as $key => $value) {
-    		self::setValue($path . '/' . $key, $value, $overwrite, $readonly);
-    	}
-    }
+		foreach ($array as $key => $value) {
+			self::setValue($path . '/' . $key, $value, $overwrite, $readonly);
+		}
+	}
         
-    /**
-     * Returns common data array.
-     *
-     * @param string array name
-     * @return mixed returns an array if such array exists, false otherwise
-     */
-    public static function getArray($path, $sortColumn = 'position', $silent = false)
-    {
-    	return self::getCollection($path, $silent)->sortBy($sortColumn)->pluck('value', 'key')->all();
-    }
+	/**
+	 * Returns common data array.
+	 *
+	 * @param string array name
+	 * @return mixed returns an array if such array exists, false otherwise
+	 */
+	public static function getArray($path, $sortColumn = 'position', $silent = false)
+	{
+		return self::getCollection($path, $silent)->sortBy($sortColumn)->pluck('value', 'key')->all();
+	}
 
-    /**
-     * Removes common data array or entry.
-     *
-     * @param $path string
-     * @return true on success, false otherwise
-     */
-    public static function deleteArray($path){
-    	if (! $id = self::getId($path, true)) return false;
+	/**
+	 * Removes common data array or entry.
+	 *
+	 * @param $path string
+	 * @return true on success, false otherwise
+	 */
+	public static function deleteArray($path){
+		if (! $id = self::getId($path, true)) return false;
     	
-    	self::find($id)->delete();
+		self::find($id)->delete();
     	
-    	self::clearCache();
-    }
+		self::clearCache();
+	}
 
-    /**
-     * Returns common data collection.
-     *
-     * @param $path string
-     * @return Collection
-     */
-    public static function getCollection($path, $silent = false)
-    {
-    	if(isset(self::$cache['array'][$path])) {
-    		return self::$cache['array'][$path];
-    	}
+	/**
+	 * Returns common data collection.
+	 *
+	 * @param $path string
+	 * @return Collection
+	 */
+	public static function getCollection($path, $silent = false)
+	{
+		if(isset(self::$cache['array'][$path])) {
+			return self::$cache['array'][$path];
+		}
     	
-    	if (! $id = self::getId($path)) {
-    		if ($silent) return collect();
+		if (! $id = self::getId($path)) {
+			if ($silent) return collect();
     		
-    		throw new CommonDataNotFound('Invalid CommonData::getArray() request: ' . $path);
-    	}
+			throw new CommonDataNotFound('Invalid CommonData::getArray() request: ' . $path);
+		}
     	
-    	return self::$cache['array'][$path] = self::where('parent_id', $id)->get();
-    }
+		return self::$cache['array'][$path] = self::where('parent_id', $id)->get();
+	}
     
-    protected static function validateArrayKeys($array)
-    {
-    	foreach($array as $key => $value) {
-    		if (strpos($key, '/') === false) continue;
+	protected static function validateArrayKeys($array)
+	{
+		foreach($array as $key => $value) {
+			if (strpos($key, '/') === false) continue;
     		
-    		\Exception('Invalid common data key: '. $key);
-    	}
-    }
+			\Exception('Invalid common data key: '. $key);
+		}
+	}
 }
\ No newline at end of file