chdemko / php-sorted-collections

src/SortedCollection/TreeNode.php

Doc Comments +6 added lines, -6 removed lines

@@ -73,7 +73,7 @@ 
 	 * @param   mixed  $key    The node key
 	 * @param   mixed  $value  The node value
 	 *
-	 * @return  A new node
+	 * @return  TreeNode new node
 	 *
 	 * @since   1.0.0
 	 */
@@ -142,7 +142,7 @@ 
 	/**
 	 * Get the first node
 	 *
-	 * @return  the first node
+	 * @return  TreeNode first node
 	 *
 	 * @since   1.0.0
 	 */
@@ -161,7 +161,7 @@ 
 	/**
 	 * Get the last node
 	 *
-	 * @return  the last node
+	 * @return  TreeNode last node
 	 *
 	 * @since   1.0.0
 	 */
@@ -180,7 +180,7 @@ 
 	/**
 	 * Get the predecessor
 	 *
-	 * @return  the predecessor node
+	 * @return  TreeNode predecessor node
 	 *
 	 * @since   1.0.0
 	 */
@@ -206,7 +206,7 @@ 
 	/**
 	 * Get the successor
 	 *
-	 * @return  the successor node
+	 * @return  TreeNode successor node
 	 *
 	 * @since   1.0.0
 	 */
@@ -265,7 +265,7 @@ 
 	 *                                     +1 for the lowest key greater than or equal to the given key
 	 *                                     +2 for the lowest key greater than the given key
 	 *
-	 * @return  mixed  The node or null if not found
+	 * @return  TreeNode|null  The node or null if not found
 	 *
 	 * @since   1.0.0
 	 */

Braces +28 added lines, -56 removed lines

@@ -189,8 +189,7 @@ 
 			}
 
 			return $node;
-		}
-		else
+		} else
 		{
 			return $this->left;
 		}
@@ -215,8 +214,7 @@ 
 			}
 
 			return $node;
-		}
-		else
+		} else
 		{
 			return $this->right;
 		}
@@ -273,12 +271,10 @@ 
 			if ($cmp < 0 && $node->information & 2)
 			{
 				$node = $node->left;
-			}
-			elseif ($cmp > 0 && $node->information & 1)
+			} elseif ($cmp > 0 && $node->information & 1)
 			{
 				$node = $node->right;
-			}
-			else
+			} else
 			{
 				break;
 			}
@@ -289,42 +285,34 @@ 
 			if ($type < 0)
 			{
 				return $node->left;
-			}
-			elseif ($type > 0)
+			} elseif ($type > 0)
 			{
 				return $node;
-			}
-			else
+			} else
 			{
 				return null;
 			}
-		}
-		elseif ($cmp > 0)
+		} elseif ($cmp > 0)
 		{
 			if ($type < 0)
 			{
 				return $node;
-			}
-			elseif ($type > 0)
+			} elseif ($type > 0)
 			{
 				return $node->right;
-			}
-			else
+			} else
 			{
 				return null;
 			}
-		}
-		else
+		} else
 		{
 			if ($type < -1)
 			{
 				return $node->predecessor;
-			}
-			elseif ($type > 1)
+			} elseif ($type > 1)
 			{
 				return $node->successor;
-			}
-			else
+			} else
 			{
 				return $node;
 			}
@@ -346,8 +334,7 @@ 
 		{
 			$this->right = $right->left;
 			$right->left = $this;
-		}
-		else
+		} else
 		{
 			$right->information |= 2;
 			$this->information &= ~ 1;
@@ -385,8 +372,7 @@ 
 		{
 			$this->left = $left->right;
 			$left->right = $this;
-		}
-		else
+		} else
 		{
 			$this->information &= ~ 2;
 			$left->information |= 1;
@@ -484,15 +470,13 @@ 
 				{
 					$node = $this->decBalance();
 				}
-			}
-			else
+			} else
 			{
 				$this->left = new static($key, $value, $this->left, $this);
 				$this->information |= 2;
 				$node = $this->decBalance();
 			}
-		}
-		elseif ($cmp > 0)
+		} elseif ($cmp > 0)
 		{
 			if ($this->information & 1)
 			{
@@ -503,15 +487,13 @@ 
 				{
 					$node = $this->incBalance();
 				}
-			}
-			else
+			} else
 			{
 				$this->right = new static($key, $value, $this, $this->right);
 				$this->information |= 1;
 				$node = $this->incBalance();
 			}
-		}
-		else
+		} else
 		{
 			$this->value = $value;
 		}
@@ -536,13 +518,11 @@ 
 			if (!($this->information & 2) || $leftBalance != 0 && ($this->left->information & ~3) == 0)
 			{
 				return $this->incBalance();
-			}
-			else
+			} else
 			{
 				return $this;
 			}
-		}
-		else
+		} else
 		{
 			$this->left->key = $this->key;
 			$this->left->value = $this->value;
@@ -552,16 +532,14 @@ 
 				$this->right->left = $this->left;
 
 				return $this->right;
-			}
-			else
+			} else
 			{
 				if ($this->left->right == $this)
 				{
 					$this->left->information &= ~ 1;
 
 					return $this->right;
-				}
-				else
+				} else
 				{
 					$this->right->information &= ~ 2;
 
@@ -597,8 +575,7 @@ 
 					return $this->incBalance();
 				}
 			}
-		}
-		elseif ($cmp > 0)
+		} elseif ($cmp > 0)
 		{
 			if ($this->information & 1)
 			{
@@ -610,8 +587,7 @@ 
 					return $this->decBalance();
 				}
 			}
-		}
-		else
+		} else
 		{
 			if ($this->information & 1)
 			{
@@ -622,8 +598,7 @@ 
 				{
 					return $this->decBalance();
 				}
-			}
-			else
+			} else
 			{
 				$left = $this->left;
 				$right = $this->right;
@@ -633,22 +608,19 @@ 
 					$left->right = $right;
 
 					return $left;
-				}
-				else
+				} else
 				{
 					if ($left && $left->right == $this)
 					{
 						$left->information &= ~ 1;
 
 						return $right;
-					}
-					elseif ($right && $right->left == $this)
+					} elseif ($right && $right->left == $this)
 					{
 						$right->information &= ~ 2;
 
 						return $left;
-					}
-					else
+					} else
 					{
 						return null;
 					}

src/SortedCollection/AbstractSet.php

Braces +1 added lines, -2 removed lines

@@ -274,8 +274,7 @@
 		try
 		{
 			return (bool) $this->map->find($element);
-		}
-		catch (\OutOfBoundsException $e)
+		} catch (\OutOfBoundsException $e)
 		{
 			return false;
 		}

src/SortedCollection/TreeMap.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 	{
 		if ($comparator == null)
 		{
-			$this->comparator = function ($key1, $key2)
+			$this->comparator = function($key1, $key2)
 			{
 				return $key1 - $key2;
 			};

Braces +17 added lines, -34 removed lines

@@ -71,8 +71,7 @@ 
 			{
 				return $key1 - $key2;
 			};
-		}
-		else
+		} else
 		{
 			$this->comparator = $comparator;
 		}
@@ -118,8 +117,7 @@ 
 		if ($this->root)
 		{
 			return $this->root->first;
-		}
-		else
+		} else
 		{
 			throw new \OutOfBoundsException('First element unexisting');
 		}
@@ -139,8 +137,7 @@ 
 		if ($this->root)
 		{
 			return $this->root->last;
-		}
-		else
+		} else
 		{
 			throw new \OutOfBoundsException('Last element unexisting');
 		}
@@ -164,8 +161,7 @@ 
 		if ($predecessor)
 		{
 			return $predecessor;
-		}
-		else
+		} else
 		{
 			throw new \OutOfBoundsException('Predecessor element unexisting');
 		}
@@ -189,8 +185,7 @@ 
 		if ($successor)
 		{
 			return $successor;
-		}
-		else
+		} else
 		{
 			throw new \OutOfBoundsException('Successor element unexisting');
 		}
@@ -212,8 +207,7 @@ 
 		if ($this->root)
 		{
 			$lower = $this->root->find($key, $this->comparator, -2);
-		}
-		else
+		} else
 		{
 			$lower = null;
 		}
@@ -221,8 +215,7 @@ 
 		if ($lower)
 		{
 			return $lower;
-		}
-		else
+		} else
 		{
 			throw new \OutOfBoundsException('Lower element unexisting');
 		}
@@ -244,8 +237,7 @@ 
 		if ($this->root)
 		{
 			$floor = $this->root->find($key, $this->comparator, -1);
-		}
-		else
+		} else
 		{
 			$floor = null;
 		}
@@ -253,8 +245,7 @@ 
 		if ($floor)
 		{
 			return $floor;
-		}
-		else
+		} else
 		{
 			throw new \OutOfBoundsException('Floor element unexisting');
 		}
@@ -276,8 +267,7 @@ 
 		if ($this->root)
 		{
 			$find = $this->root->find($key, $this->comparator, 0);
-		}
-		else
+		} else
 		{
 			$find = null;
 		}
@@ -285,8 +275,7 @@ 
 		if ($find)
 		{
 			return $find;
-		}
-		else
+		} else
 		{
 			throw new \OutOfBoundsException('Element unexisting');
 		}
@@ -308,8 +297,7 @@ 
 		if ($this->root)
 		{
 			$ceiling = $this->root->find($key, $this->comparator, 1);
-		}
-		else
+		} else
 		{
 			$ceiling = null;
 		}
@@ -317,8 +305,7 @@ 
 		if ($ceiling)
 		{
 			return $ceiling;
-		}
-		else
+		} else
 		{
 			throw new \OutOfBoundsException('Ceiling element unexisting');
 		}
@@ -340,8 +327,7 @@ 
 		if ($this->root)
 		{
 			$higher = $this->root->find($key, $this->comparator, 2);
-		}
-		else
+		} else
 		{
 			$higher = null;
 		}
@@ -349,8 +335,7 @@ 
 		if ($higher)
 		{
 			return $higher;
-		}
-		else
+		} else
 		{
 			throw new \OutOfBoundsException('Higher element unexisting');
 		}
@@ -460,8 +445,7 @@ 
 		if ($this->root)
 		{
 			$this->root = $this->root->insert($key, $value, $this->comparator);
-		}
-		else
+		} else
 		{
 			$this->root = TreeNode::create($key, $value);
 		}
@@ -496,8 +480,7 @@ 
 		if ($this->root)
 		{
 			return count($this->root);
-		}
-		else
+		} else
 		{
 			return 0;
 		}

src/SortedCollection/TreeSet.php

Braces +1 added lines, -2 removed lines

@@ -131,8 +131,7 @@
 		if ($value)
 		{
 			$map[$element] = true;
-		}
-		else
+		} else
 		{
 			unset($map[$element]);
 		}

src/SortedCollection/AbstractMap.php

Braces +2 added lines, -4 removed lines

@@ -385,8 +385,7 @@ 
 		try
 		{
 			return $this->find($key)->value;
-		}
-		catch (\OutOfBoundsException $e)
+		} catch (\OutOfBoundsException $e)
 		{
 			throw new \OutOfRangeException('Undefined offset');
 		}
@@ -406,8 +405,7 @@ 
 		try
 		{
 			return (bool) $this->find($key);
-		}
-		catch (\OutOfBoundsException $e)
+		} catch (\OutOfBoundsException $e)
 		{
 			return false;
 		}

src/SortedCollection/Iterator.php

Braces +4 added lines, -8 removed lines

@@ -143,8 +143,7 @@ 
 		try
 		{
 			$this->current = $this->map->first();
-		}
-		catch (\OutOfBoundsException $e)
+		} catch (\OutOfBoundsException $e)
 		{
 			$this->current = null;
 		}
@@ -162,8 +161,7 @@ 
 		if ($this->type == self::PAIRS)
 		{
 			return $this->current->key;
-		}
-		else
+		} else
 		{
 			return $this->index;
 		}
@@ -181,8 +179,7 @@ 
 		if ($this->type == self::KEYS)
 		{
 			return $this->current->key;
-		}
-		else
+		} else
 		{
 			return $this->current->value;
 		}
@@ -200,8 +197,7 @@ 
 		try
 		{
 			$this->current = $this->map->successor($this->current);
-		}
-		catch (\OutOfBoundsException $e)
+		} catch (\OutOfBoundsException $e)
 		{
 			$this->current = null;
 		}

src/SortedCollection/ReversedMap.php

Spacing +2 added lines, -2 removed lines

@@ -67,9 +67,9 @@
 	protected function __construct(SortedMap $map)
 	{
 		$this->map = $map;
-		$this->comparator = function ($key1, $key2)
+		$this->comparator = function($key1, $key2)
 		{
-			return - call_user_func($this->map->comparator, $key1, $key2);
+			return -call_user_func($this->map->comparator, $key1, $key2);
 		};
 	}
 

benchmarks/TreeMap.php

Spacing +9 added lines, -9 removed lines

@@ -14,14 +14,14 @@ 
  * This file is part of the php-sorted-collections package https://github.com/chdemko/php-sorted-collections
  */
 
-require __DIR__ . '/../vendor/autoload.php';
+require __DIR__.'/../vendor/autoload.php';
 
 use chdemko\SortedCollection\TreeMap;
 
 date_default_timezone_set('UTC');
-printf('TreeMap benchmarking run on ' . date('r') . PHP_EOL . PHP_EOL);
-printf('%25s %10s %10s %10s' . PHP_EOL, 'Operation', 'n', 'seconds', 'μs/(n log(n))');
-printf('-------------------------------------------------------------' . PHP_EOL);
+printf('TreeMap benchmarking run on '.date('r').PHP_EOL.PHP_EOL);
+printf('%25s %10s %10s %10s'.PHP_EOL, 'Operation', 'n', 'seconds', 'μs/(n log(n))');
+printf('-------------------------------------------------------------'.PHP_EOL);
 
 $tree = TreeMap::create();
 
@@ -37,7 +37,7 @@ 
 	$end = microtime(true);
 
 	printf(
-		'%25s %10d %10.2f %10.2f' . PHP_EOL,
+		'%25s %10d %10.2f %10.2f'.PHP_EOL,
 		'Insert all elements',
 		$count,
 		$end - $start,
@@ -64,7 +64,7 @@ 
 	$end = microtime(true);
 
 	printf(
-		'%25s %10d %10.2f %10.2f' . PHP_EOL,
+		'%25s %10d %10.2f %10.2f'.PHP_EOL,
 		'Remove all elements',
 		$count,
 		$end - $start,
@@ -91,7 +91,7 @@ 
 	$end = microtime(true);
 
 	printf(
-		'%25s %10d %10.2f %10.2f' . PHP_EOL,
+		'%25s %10d %10.2f %10.2f'.PHP_EOL,
 		'Search all elements',
 		$count,
 		$end - $start,
@@ -117,7 +117,7 @@ 
 	$end = microtime(true);
 
 	printf(
-		'%25s %10d %10.2f %10.2f' . PHP_EOL,
+		'%25s %10d %10.2f %10.2f'.PHP_EOL,
 		'Loop on all elements',
 		$count,
 		$end - $start,
@@ -141,7 +141,7 @@ 
 	$end = microtime(true);
 
 	printf(
-		'%25s %10d %10.2f %10.2f' . PHP_EOL,
+		'%25s %10d %10.2f %10.2f'.PHP_EOL,
 		'Count all elements',
 		$count,
 		$end - $start,

benchmarks/ReversedMap.php

Spacing +7 added lines, -7 removed lines

@@ -14,15 +14,15 @@ 
  * This file is part of the php-sorted-collections package https://github.com/chdemko/php-sorted-collections
  */
 
-require __DIR__ . '/../vendor/autoload.php';
+require __DIR__.'/../vendor/autoload.php';
 
 use chdemko\SortedCollection\TreeMap;
 use chdemko\SortedCollection\ReversedMap;
 
 date_default_timezone_set('UTC');
-printf('ReversedMap benchmarking run on ' . date('r') . PHP_EOL . PHP_EOL);
-printf('%25s %10s %10s %10s' . PHP_EOL, 'Operation', 'n', 'seconds', 'μs/(n log(n))');
-printf('-------------------------------------------------------------' . PHP_EOL);
+printf('ReversedMap benchmarking run on '.date('r').PHP_EOL.PHP_EOL);
+printf('%25s %10s %10s %10s'.PHP_EOL, 'Operation', 'n', 'seconds', 'μs/(n log(n))');
+printf('-------------------------------------------------------------'.PHP_EOL);
 
 $tree = TreeMap::create();
 $reversed = ReversedMap::create($tree);
@@ -44,7 +44,7 @@ 
 	$end = microtime(true);
 
 	printf(
-		'%25s %10d %10.2f %10.2f' . PHP_EOL,
+		'%25s %10d %10.2f %10.2f'.PHP_EOL,
 		'Search all elements',
 		$count,
 		$end - $start,
@@ -70,7 +70,7 @@ 
 	$end = microtime(true);
 
 	printf(
-		'%25s %10d %10.2f %10.2f' . PHP_EOL,
+		'%25s %10d %10.2f %10.2f'.PHP_EOL,
 		'Loop on all elements',
 		$count,
 		$end - $start,
@@ -94,7 +94,7 @@ 
 	$end = microtime(true);
 
 	printf(
-		'%25s %10d %10.2f %10.2f' . PHP_EOL,
+		'%25s %10d %10.2f %10.2f'.PHP_EOL,
 		'Count all elements',
 		$count,
 		$end - $start,