Junker / HSAL

src/HSAL/Driver/Handlersocketi.php

Doc Comments +10 added lines

@@ -65,6 +65,10 @@ 
 			return FALSE;
 	}
 
+	/**
+	 * @param integer $limit
+	 * @param integer $offset
+	 */
 	public function fetchAll($table, Array $fields, $index, Array $condition, $operator, $limit, $offset)
 	{
 		$hs = $this->getReadSocket();
@@ -140,6 +144,9 @@ 
 		return (bool)$result;
 	}
 
+	/**
+	 * @param integer $increment
+	 */
 	public function increment($table, $field, $index, Array $condition, $operator, $increment)
 	{
 		$hs = $this->getWriteSocket();
@@ -155,6 +162,9 @@ 
 		return (bool)$result;
 	}
 
+	/**
+	 * @param integer $decrement
+	 */
 	public function decrement($table, $field, $index, Array $condition, $operator, $decrement)
 	{
 

Braces +25 added lines, -12 removed lines

@@ -48,7 +48,9 @@ 
 
 		list($database, $table) = $this->getTableDatabase($table);
 
-		if ($index == HSAL::INDEX_PRIMARY) $index = 'PRIMARY';
+		if ($index == HSAL::INDEX_PRIMARY) {
+			$index = 'PRIMARY';
+		}
 
 		$index = $hs->openIndex($database, $table, $fields, ['index' => $index]);
 		
@@ -59,10 +61,11 @@ 
 
 		$result = $index->find([$operator => $condition]);
 
-		if (!empty($result) && is_array($result))
-			return $result[0];
-		else
-			return FALSE;
+		if (!empty($result) && is_array($result)) {
+					return $result[0];
+		} else {
+					return FALSE;
+		}
 	}
 
 	public function fetchAll($table, Array $fields, $index, Array $condition, $operator, $limit, $offset)
@@ -71,7 +74,9 @@ 
 
 		list($database, $table) = $this->getTableDatabase($table);
 
-		if ($index == HSAL::INDEX_PRIMARY) $index = 'PRIMARY';
+		if ($index == HSAL::INDEX_PRIMARY) {
+			$index = 'PRIMARY';
+		}
 
 		$index = $hs->openIndex($database, $table, $fields, ['index' => $index]);
 
@@ -90,9 +95,9 @@ 
 			}
 
 			return $result;
+		} else {
+					return FALSE;
 		}
-		else
-			return FALSE;
 	}
 
 	public function delete($table, $index, Array $condition, $operator)
@@ -101,7 +106,9 @@ 
 
 		list($database, $table) = $this->getTableDatabase($table);
 
-		if ($index == HSAL::INDEX_PRIMARY) $index = 'PRIMARY';
+		if ($index == HSAL::INDEX_PRIMARY) {
+			$index = 'PRIMARY';
+		}
 
 		$index = $hs->openIndex($database, $table, [], ['index' => $index]);
 
@@ -129,7 +136,9 @@ 
 
 		list($database, $table) = $this->getTableDatabase($table);
 
-		if ($index == HSAL::INDEX_PRIMARY) $index = 'PRIMARY';
+		if ($index == HSAL::INDEX_PRIMARY) {
+			$index = 'PRIMARY';
+		}
 
 		$fields = array_keys($values);
 
@@ -146,7 +155,9 @@ 
 
 		list($database, $table) = $this->getTableDatabase($table);
 
-		if ($index == HSAL::INDEX_PRIMARY) $index = 'PRIMARY';
+		if ($index == HSAL::INDEX_PRIMARY) {
+			$index = 'PRIMARY';
+		}
 
 		$index = $hs->openIndex($database, $table, [$field]);
 
@@ -162,7 +173,9 @@ 
 
 		list($database, $table) = $this->getTableDatabase($table);
 
-		if ($index == HSAL::INDEX_PRIMARY) $index = 'PRIMARY';
+		if ($index == HSAL::INDEX_PRIMARY) {
+			$index = 'PRIMARY';
+		}
 
 		$index = $hs->openIndex($database, $table, [$field]);
 

src/HSAL/Driver.php

Braces +5 added lines, -4 removed lines

@@ -27,10 +27,11 @@
 	{
 		$result = $this->fetchArray($table, $fields, $index, $condition, $operator);
 
-		if (!empty($result))
-			return array_combine($fields, $result);
-		else
-			return FALSE;
+		if (!empty($result)) {
+					return array_combine($fields, $result);
+		} else {
+					return FALSE;
+		}
 	}
 
 	public function getTableDatabase($table)

src/HSAL/Driver/HSPHP.php

Spacing +2 added lines, -2 removed lines

@@ -47,7 +47,7 @@ 
 
 		list($database, $table) = $this->getTableDatabase($table);
 
-		$idx = $hs->getIndexId($database, $table, $index, implode(',',$fields));
+		$idx = $hs->getIndexId($database, $table, $index, implode(',', $fields));
 		$hs->select($idx, $operator, $condition);
 		$result = $hs->readResponse();
 
@@ -105,7 +105,7 @@ 
 
 		$fields = array_keys($values);
 
-		$idx = $hs->getIndexId($database, $table, '', implode(',',$fields));
+		$idx = $hs->getIndexId($database, $table, '', implode(',', $fields));
 		$hs->insert($idx, array_values($values));
 
 		$result = $hs->readResponse();

Braces +27 added lines, -22 removed lines

@@ -53,10 +53,11 @@ 
 		$hs->select($idx, $operator, $condition);
 		$result = $hs->readResponse();
 
-		if (!empty($result))
-			return $result[0];
-		else
-			return FALSE;
+		if (!empty($result)) {
+					return $result[0];
+		} else {
+					return FALSE;
+		}
 	}
 
 	public function fetchAll($table, Array $fields, $index, Array $condition, $operator, $limit, $offset)
@@ -78,9 +79,9 @@ 
 			}
 
 			return $result;
+		} else {
+					return FALSE;
 		}
-		else
-			return FALSE;
 	}
 
 	public function delete($table, $index, Array $condition, $operator)
@@ -93,10 +94,11 @@ 
 		$hs->delete($idx, $operator, $condition);
 		$result = $hs->readResponse();
 
-		if (!empty($result))
-			return (bool)$result[0][0];
-		else
-			return FALSE;
+		if (!empty($result)) {
+					return (bool)$result[0][0];
+		} else {
+					return FALSE;
+		}
 	}
 
 	public function insert($table, Array $values)
@@ -128,10 +130,11 @@ 
 
 		$result = $hs->readResponse();
 
-		if (!empty($result))
-			return (bool)$result[0][0];
-		else
-			return FALSE;
+		if (!empty($result)) {
+					return (bool)$result[0][0];
+		} else {
+					return FALSE;
+		}
 	}
 
 	public function increment($table, $field, $index, Array $condition, $operator, $increment)
@@ -144,10 +147,11 @@ 
 		$hs->increment($idx, $operator, $condition, [$increment]);
 		$result = $hs->readResponse();
 
-		if (!empty($result))
-			return (bool)$result[0][0];
-		else
-			return FALSE;
+		if (!empty($result)) {
+					return (bool)$result[0][0];
+		} else {
+					return FALSE;
+		}
 	}
 
 	public function decrement($table, $field, $index, Array $condition, $operator, $decrement)
@@ -160,9 +164,10 @@ 
 		$hs->decrement($idx, $operator, $condition, [$decrement]);
 		$result = $hs->readResponse();
 
-		if (!empty($result))
-			return (bool)$result[0][0];
-		else
-			return FALSE;
+		if (!empty($result)) {
+					return (bool)$result[0][0];
+		} else {
+					return FALSE;
+		}
 	}
 }
\ No newline at end of file

tests/bootstrap.php

Spacing +1 added lines, -1 removed lines

@@ -1,3 +1,3 @@
 <?php
 
-$autoload = require __DIR__.'/../vendor/autoload.php';
\ No newline at end of file
+$autoload = require __DIR__ . '/../vendor/autoload.php';
\ No newline at end of file

tests/HSAL/HSPHPTest.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
 	{
 		$hs = new HSAL('localhost', 'hstest', HSAL::DRIVER_HSPHP);
 
-		$result = $hs->fetchArray('test', ['id','name','cnt'], [HSAL::INDEX_PRIMARY => 3]);
+		$result = $hs->fetchArray('test', ['id', 'name', 'cnt'], [HSAL::INDEX_PRIMARY => 3]);
 
 		$this->assertTrue(is_array($result));
 		$this->assertEquals(3, count($result));
@@ -21,7 +21,7 @@ 
 	{
 		$hs = new HSAL('localhost', 'hstest', HSAL::DRIVER_HSPHP);
 
-		$result = $hs->fetchAssoc('test', ['id','name','cnt'], [HSAL::INDEX_PRIMARY => 3]);
+		$result = $hs->fetchAssoc('test', ['id', 'name', 'cnt'], [HSAL::INDEX_PRIMARY => 3]);
 
 		$this->assertTrue(is_array($result));
 		$this->assertEquals(3, count($result));

tests/HSAL/HandlersocketiTest.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
 	{
 		$hs = new HSAL('localhost', 'hstest', HSAL::DRIVER_HANDLERSOCKETI);
 
-		$result = $hs->fetchArray('test2', ['id','name','cnt'], [HSAL::INDEX_PRIMARY => 3]);
+		$result = $hs->fetchArray('test2', ['id', 'name', 'cnt'], [HSAL::INDEX_PRIMARY => 3]);
 
 		$this->assertTrue(is_array($result));
 		$this->assertEquals(3, count($result));
@@ -21,7 +21,7 @@ 
 	{
 		$hs = new HSAL('localhost', 'hstest', HSAL::DRIVER_HANDLERSOCKETI);
 
-		$result = $hs->fetchAssoc('test2', ['id','name','cnt'], [HSAL::INDEX_PRIMARY => 3]);
+		$result = $hs->fetchAssoc('test2', ['id', 'name', 'cnt'], [HSAL::INDEX_PRIMARY => 3]);
 
 		$this->assertTrue(is_array($result));
 		$this->assertEquals(3, count($result));

src/HSAL/HSAL.php

Doc Comments +34 added lines

@@ -23,6 +23,10 @@ 
 	const INDEX_PRIMARY = '';
 
 
+	/**
+	 * @param string $host
+	 * @param string $database
+	 */
 	public function __construct($host, $database, Array $options = NULL)
 	{
 		if (!extension_loaded('handlersocketi') && (!class_exists('\\HSPHP\\ReadSocket')))
@@ -64,6 +68,9 @@ 
 	}
 
 
+	/**
+	 * @param string $table
+	 */
 	public function fetchArray($table, Array $fields, Array $index_condition, $operator = HSAL::OPERATOR_EQUAL)
 	{
 		list($index, $condition) = self::parse_index_condition($index_condition);
@@ -71,6 +78,9 @@ 
 		return $this->hs->fetchArray($table, $fields, $index, $condition, $operator);
 	}
 
+	/**
+	 * @param string $table
+	 */
 	public function fetchAssoc($table, Array $fields, Array $index_condition, $operator = HSAL::OPERATOR_EQUAL)
 	{
 		list($index, $condition) = self::parse_index_condition($index_condition);
@@ -78,6 +88,10 @@ 
 		return $this->hs->fetchAssoc($table, $fields, $index, $condition, $operator);
 	}
 
+	/**
+	 * @param string $table
+	 * @param string $field
+	 */
 	public function fetchColumn($table, $field, Array $index_condition, $operator = HSAL::OPERATOR_EQUAL)
 	{
 		list($index, $condition) = self::parse_index_condition($index_condition);
@@ -85,6 +99,9 @@ 
 		return $this->hs->fetchColumn($table, $field, $index, $condition, $operator);
 	}
 
+	/**
+	 * @param string $table
+	 */
 	public function fetchAll($table, Array $fields, Array $index_condition, $operator = HSAL::OPERATOR_EQUAL, $limit = 1000, $offset = 0)
 	{
 		list($index, $condition) = self::parse_index_condition($index_condition);
@@ -92,6 +109,9 @@ 
 		return $this->hs->fetchAll($table, $fields, $index, $condition, $operator, $limit, $offset);
 	}
 
+	/**
+	 * @param string $table
+	 */
 	public function delete($table, Array $index_condition, $operator = HSAL::OPERATOR_EQUAL)
 	{
 		list($index, $condition) = self::parse_index_condition($index_condition);
@@ -99,11 +119,17 @@ 
 		return $this->hs->delete($table, $index, $condition, $operator);
 	}
 
+	/**
+	 * @param string $table
+	 */
 	public function insert($table, Array $values)
 	{
 		return $this->hs->insert($table, $values);
 	}
 
+	/**
+	 * @param string $table
+	 */
 	public function update($table, Array $values, Array $index_condition, $operator = HSAL::OPERATOR_EQUAL)
 	{
 		list($index, $condition) = self::parse_index_condition($index_condition);
@@ -111,6 +137,10 @@ 
 		return $this->hs->update($table, $values, $index, $condition, $operator);
 	}
 
+	/**
+	 * @param string $table
+	 * @param string $field
+	 */
 	public function increment($table, $field, Array $index_condition, $operator = HSAL::OPERATOR_EQUAL, $increment = 1)
 	{
 		list($index, $condition) = self::parse_index_condition($index_condition);
@@ -118,6 +148,10 @@ 
 		return $this->hs->increment($table, $field, $index, $condition, $operator, $increment);
 	}
 
+	/**
+	 * @param string $table
+	 * @param string $field
+	 */
 	public function decrement($table, $field, Array $index_condition, $operator = HSAL::OPERATOR_EQUAL, $decrement = 1)
 	{
 		list($index, $condition) = self::parse_index_condition($index_condition);

Braces +5 added lines, -6 removed lines

@@ -34,8 +34,9 @@ 
 
 		if (!empty($options))
 		{
-			if (isset($options['driver']))
-				$driver = $options['driver'];
+			if (isset($options['driver'])) {
+							$driver = $options['driver'];
+			}
 		}
 
 		if ($driver == self::DRIVER_AUTO)
@@ -43,8 +44,7 @@ 
 			if (extension_loaded('handlersocketi'))
 			{
 				$driver = self::DRIVER_HANDLERSOCKETI;
-			}
-			else if (class_exists('\\HSPHP\\ReadSocket'))
+			} else if (class_exists('\\HSPHP\\ReadSocket'))
 			{
 				$driver = self::DRIVER_HSPHP;
 			}
@@ -53,8 +53,7 @@ 
 		if ($driver == self::DRIVER_HANDLERSOCKETI)
 		{
 			$this->hs = new \HSAL\Driver\Handlersocketi($host, $database, $options);
-		}
-		else if ($driver == self::DRIVER_HSPHP)
+		} else if ($driver == self::DRIVER_HSPHP)
 		{
 			$this->hs = new \HSAL\Driver\HSPHP($host, $database, $options);
 		}