chdemko / php-sorted-collections

src/SortedCollection/SubMap.php

Braces +16 added lines, -32 removed lines

@@ -122,8 +122,7 @@ 
 				if ($this->fromOption == self::UNUSED)
 				{
 					throw new \RuntimeException('Undefined property');
-				}
-				else
+				} else
 				{
 					return $this->fromKey;
 				}
@@ -132,8 +131,7 @@ 
 				if ($this->toOption == self::UNUSED)
 				{
 					throw new \RuntimeException('Undefined property');
-				}
-				else
+				} else
 				{
 					return $this->toKey;
 				}
@@ -142,8 +140,7 @@ 
 				if ($this->fromOption == self::UNUSED)
 				{
 					throw new \RuntimeException('Undefined property');
-				}
-				else
+				} else
 				{
 					return $this->fromOption == self::INCLUSIVE;
 				}
@@ -152,8 +149,7 @@ 
 				if ($this->toOption == self::UNUSED)
 				{
 					throw new \RuntimeException('Undefined property');
-				}
-				else
+				} else
 				{
 					return $this->toOption == self::INCLUSIVE;
 				}
@@ -201,8 +197,7 @@ 
 				if ($this->fromOption == self::UNUSED)
 				{
 					throw new \RuntimeException('Undefined property');
-				}
-				else
+				} else
 				{
 					$this->fromOption = $value ? self::INCLUSIVE : self::EXCLUSIVE;
 				}
@@ -211,8 +206,7 @@ 
 				if ($this->toOption == self::UNUSED)
 				{
 					throw new \RuntimeException('Undefined property');
-				}
-				else
+				} else
 				{
 					$this->toOption = $value ? self::INCLUSIVE : self::EXCLUSIVE;
 				}
@@ -311,8 +305,7 @@ 
 			$cmp = call_user_func($this->map->comparator(), $this->fromKey, $this->toKey);
 
 			$this->empty = $cmp > 0 || $cmp == 0 && ($this->fromOption == self::EXCLUSIVE || $this->toOption == self::EXCLUSIVE);
-		}
-		else
+		} else
 		{
 			$this->empty = false;
 		}
@@ -565,8 +558,7 @@ 
 				if (call_user_func($this->map->comparator(), $key, $this->fromKey) <= 0)
 				{
 					throw new \OutOfBoundsException('Lower element unexisting');
-				}
-				else
+				} else
 				{
 					$lower = $this->map->lower($key);
 
@@ -624,8 +616,7 @@ 
 				if (call_user_func($this->map->comparator(), $key, $this->fromKey) < 0)
 				{
 					throw new \OutOfBoundsException('Floor element unexisting');
-				}
-				else
+				} else
 				{
 					$floor = $this->map->floor($key);
 				}
@@ -634,8 +625,7 @@ 
 				if (call_user_func($this->map->comparator(), $key, $this->fromKey) <= 0)
 				{
 					throw new \OutOfBoundsException('Floor element unexisting');
-				}
-				else
+				} else
 				{
 					$floor = $this->map->floor($key);
 				}
@@ -739,8 +729,7 @@ 
 				if (call_user_func($this->map->comparator(), $key, $this->toKey) > 0)
 				{
 					throw new \OutOfBoundsException('Ceiling element unexisting');
-				}
-				else
+				} else
 				{
 					$ceiling = $this->map->ceiling($key);
 				}
@@ -749,8 +738,7 @@ 
 				if (call_user_func($this->map->comparator(), $key, $this->toKey) >= 0)
 				{
 					throw new \OutOfBoundsException('Ceiling element unexisting');
-				}
-				else
+				} else
 				{
 					$ceiling = $this->map->ceiling($key);
 				}
@@ -809,8 +797,7 @@ 
 				if (call_user_func($this->map->comparator(), $key, $this->toKey) >= 0)
 				{
 					throw new \OutOfBoundsException('Higher element unexisting');
-				}
-				else
+				} else
 				{
 					$higher = $this->map->higher($key);
 
@@ -862,8 +849,7 @@ 
 						'map' => $this->map->jsonSerialize(),
 					)
 				);
-			}
-			else
+			} else
 			{
 				return array(
 					'HeadMap' => array(
@@ -873,8 +859,7 @@ 
 					)
 				);
 			}
-		}
-		else
+		} else
 		{
 			if ($this->toOption == self::UNUSED)
 			{
@@ -885,8 +870,7 @@ 
 						'fromInclusive' => $this->fromOption == self::INCLUSIVE,
 					)
 				);
-			}
-			else
+			} else
 			{
 				return array(
 					'SubMap' => array(

src/SortedCollection/SubSet.php

Braces +6 added lines, -12 removed lines

@@ -199,17 +199,14 @@ 
 			if ($toOption == self::UNUSED)
 			{
 				$this->setMap(SubMap::view($set->getMap()));
-			}
-			else
+			} else
 			{
 				$this->setMap(SubMap::head($set->getMap(), $to, $toOption == self::INCLUSIVE));
 			}
-		}
-		elseif ($toOption == self::UNUSED)
+		} elseif ($toOption == self::UNUSED)
 		{
 			$this->setMap(SubMap::tail($set->getMap(), $from, $fromOption == self::INCLUSIVE));
-		}
-		else
+		} else
 		{
 			$this->setMap(SubMap::create($set->getMap(), $from, $to, $fromOption == self::INCLUSIVE, $toOption == self::INCLUSIVE));
 		}
@@ -303,8 +300,7 @@ 
 						'toInclusive' => $this->toInclusive,
 					)
 				);
-			}
-			else
+			} else
 			{
 				return array(
 					'TailSet' => array(
@@ -314,8 +310,7 @@ 
 					)
 				);
 			}
-		}
-		else
+		} else
 		{
 			if (isset($this->to))
 			{
@@ -326,8 +321,7 @@ 
 						'toInclusive' => $this->toInclusive,
 					)
 				);
-			}
-			else
+			} else
 			{
 				return array(
 					'ViewSet' => array(

src/SortedCollection/TreeNode.php

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

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
 	 */
@@ -135,7 +135,7 @@ 
 	/**
 	 * Get the first node
 	 *
-	 * @return the first node
+	 * @return TreeNode first node
 	 *
 	 * @since 1.0.0
 	 */
@@ -154,7 +154,7 @@ 
 	/**
 	 * Get the last node
 	 *
-	 * @return the last node
+	 * @return TreeNode last node
 	 *
 	 * @since 1.0.0
 	 */
@@ -173,7 +173,7 @@ 
 	/**
 	 * Get the predecessor
 	 *
-	 * @return the predecessor node
+	 * @return TreeNode predecessor node
 	 *
 	 * @since 1.0.0
 	 */
@@ -199,7 +199,7 @@ 
 	/**
 	 * Get the successor
 	 *
-	 * @return the successor node
+	 * @return TreeNode successor node
 	 *
 	 * @since 1.0.0
 	 */
@@ -258,7 +258,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
 	 */

examples/TreeMap.php

Spacing +9 added lines, -9 removed lines

@@ -14,43 +14,43 @@
  * 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;
 
 $tree = TreeMap::create()->put(array(1 => 1, 9 => 9, 5 => 5, 2 => 2, 6 => 6, 3 => 3, 0 => 0, 8 => 8, 7 => 7, 4 => 4));
 
 // Print [0,1,2,3,4,5,6,7,8,9]
-echo $tree . PHP_EOL;
+echo $tree.PHP_EOL;
 
 // Print 0
-echo $tree->firstKey . PHP_EOL;
+echo $tree->firstKey.PHP_EOL;
 
 // Print 9
-echo $tree->lastValue . PHP_EOL;
+echo $tree->lastValue.PHP_EOL;
 
 // Print 10
-echo count($tree) . PHP_EOL;
+echo count($tree).PHP_EOL;
 
 // Print 5
-echo $tree[5] . PHP_EOL;
+echo $tree[5].PHP_EOL;
 
 // Change value for $tree[5]
 $tree[5] = 10;
 
 // Print [0,1,2,3,4,10,6,7,8,9]
-echo $tree . PHP_EOL;
+echo $tree.PHP_EOL;
 
 // Unset $tree[5]
 unset($tree[5]);
 
 // Print {"0":0,"1":1,"2":2,"3":3,"4":4,"6":6,"7":7,"8":8,"9":9}
-echo $tree . PHP_EOL;
+echo $tree.PHP_EOL;
 
 // Print 0-0;1-1;2-2;3-3;4-4;6-6;7-7;8-8;9-9;
 foreach ($tree as $key => $value)
 {
-	echo $key . '-' . $value . ';';
+	echo $key.'-'.$value.';';
 }
 
 echo PHP_EOL;

examples/TreeSet.php

Spacing +9 added lines, -9 removed lines

@@ -14,43 +14,43 @@
  * 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\TreeSet;
 
 $set = TreeSet::create()->put(array(1, 9, 5, 2, 6, 3, 0, 8, 7, 4));
 
 // Print [0,1,2,3,4,5,6,7,8,9]
-echo $set . PHP_EOL;
+echo $set.PHP_EOL;
 
 // Print 0
-echo $set->first . PHP_EOL;
+echo $set->first.PHP_EOL;
 
 // Print 9
-echo $set->last . PHP_EOL;
+echo $set->last.PHP_EOL;
 
 // Print 10
-echo count($set) . PHP_EOL;
+echo count($set).PHP_EOL;
 
 // Print 1
-echo $set[5] . PHP_EOL;
+echo $set[5].PHP_EOL;
 
 // Change value for $set[5]
 $set[5] = false;
 
 // Print [0,1,2,3,4,6,7,8,9]
-echo $set . PHP_EOL;
+echo $set.PHP_EOL;
 
 // Unset $set[6]
 unset($set[6]);
 
 // Print [0,1,2,3,4,7,8,9]
-echo $set . PHP_EOL;
+echo $set.PHP_EOL;
 
 // Print 0-0;1-1;2-2;3-3;4-4;5-7;6-8;7-9;
 foreach ($set as $key => $value)
 {
-	echo $key . '-' . $value . ';';
+	echo $key.'-'.$value.';';
 }
 
 echo PHP_EOL;

benchmarks/TreeMap.php

Braces +4 added lines, -8 removed lines

@@ -105,8 +105,7 @@ 
 							(int) ($params['from'] * $params['count']),
 							(int) ($params['to'] * $params['count'])
 						);
-					}
-					else
+					} else
 					{
 						$this->data = chdemko\SortedCollection\SubMap::create(
 							$this->tree,
@@ -116,8 +115,7 @@ 
 					}
 				break;
 			}
-		}
-		else
+		} else
 		{
 			$this->data = $this->tree;
 		}
@@ -174,8 +172,7 @@ 
 		if (isset($params['from']))
 		{
 			$min = (int) ($params['from'] * $params['count']);
-		}
-		else
+		} else
 		{
 			$min = 0;
 		}
@@ -183,8 +180,7 @@ 
 		if (isset($params['to']))
 		{
 			$max = (int) ($params['to'] * $params['count']);
-		}
-		else
+		} else
 		{
 			$max = $params['count'];
 		}