chdemko / php-sorted-collections

examples/SubSet.php

Spacing +4 added lines, -4 removed lines

@@ -14,7 +14,7 @@ 
  * 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;
 use chdemko\SortedCollection\ReversedSet;
@@ -25,12 +25,12 @@ 
 $sub = SubSet::create($reversed, 7, 2);
 
 // Print [7,6,5,4,3]
-echo $sub . PHP_EOL;
+echo $sub.PHP_EOL;
 
 // Print [7,6,5,3]
 unset($set[4]);
-echo $sub . PHP_EOL;
+echo $sub.PHP_EOL;
 
 // Print [9,8,7,6,5,3]
 unset($sub->from);
-echo $sub . PHP_EOL;
+echo $sub.PHP_EOL;

examples/ReversedSet.php

Spacing +3 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
  * 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;
 use chdemko\SortedCollection\ReversedSet;
@@ -23,8 +23,8 @@ 
 $reversed = ReversedSet::create($set);
 
 // Print [9,8,7,6,5,4,3,2,1,0]
-echo $reversed . PHP_EOL;
+echo $reversed.PHP_EOL;
 
 // Print [8,7,6,5,4,3,2,1,0]
 unset($set[9]);
-echo $reversed . PHP_EOL;
+echo $reversed.PHP_EOL;

examples/ReversedMap.php

Spacing +3 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
  * 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;
@@ -23,8 +23,8 @@ 
 $reversed = ReversedMap::create($tree);
 
 // Print {"9":9,"8":8,"7":7,"6":6,"5":5,"4":4,"3":3,"2":2,"1":1,"0":0}
-echo $reversed . PHP_EOL;
+echo $reversed.PHP_EOL;
 
 // Print {"8":8,"7":7,"6":6,"5":5,"4":4,"3":3,"2":2,"1":1,"0":0}
 unset($tree[9]);
-echo $reversed . PHP_EOL;
+echo $reversed.PHP_EOL;

examples/SubMap.php

Spacing +4 added lines, -4 removed lines

@@ -14,7 +14,7 @@ 
  * 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;
@@ -25,12 +25,12 @@ 
 $sub = SubMap::create($reversed, 7, 2);
 
 // Print {"7":7,"6":6,"5":5,"4":4,"3":3}
-echo $sub . PHP_EOL;
+echo $sub.PHP_EOL;
 
 // Print {"7":7,"6":6,"5":5,"3":3}
 unset($tree[4]);
-echo $sub . PHP_EOL;
+echo $sub.PHP_EOL;
 
 // Print {"9":9,"8":8,"7":7,"6":6,"5":5,"3":3}
 unset($sub->fromKey);
-echo $sub . PHP_EOL;
+echo $sub.PHP_EOL;

src/SortedCollection/TreeSet.php

Indentation +137 added lines, -137 removed lines

@@ -29,141 +29,141 @@
  */
 class TreeSet extends AbstractSet
 {
-    /**
-     * Constructor
-     *
-     * @param callable $comparator Comparison function
-     *
-     * @since 1.0.0
-     */
-    protected function __construct($comparator = null)
-    {
-        $this->setMap(TreeMap::create($comparator));
-    }
-
-    /**
-     * Create
-     *
-     * @param callable $comparator Comparison function
-     *
-     * @return TreeSet A new TreeSet
-     *
-     * @since 1.0.0
-     */
-    public static function create($comparator = null)
-    {
-        return new static($comparator);
-    }
-
-    /**
-     * Put values in the set
-     *
-     * @param \Traversable $traversable Values to put in the set
-     *
-     * @return TreeSet $this for chaining
-     *
-     * @since 1.0.0
-     */
-    public function put($traversable = array())
-    {
-        foreach ($traversable as $value) {
-            $this[$value] = true;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Clear the set
-     *
-     * @return TreeSet $this for chaining
-     *
-     * @since 1.0.0
-     */
-    public function clear()
-    {
-        $this->getMap()->clear();
-
-        return $this;
-    }
-
-    /**
-     * Initialise the set
-     *
-     * @param \Traversable $traversable Values to initialise the set
-     *
-     * @return TreeSet $this for chaining
-     *
-     * @since 1.0.0
-     */
-    public function initialise($traversable = array())
-    {
-        return $this->clear()->put($traversable);
-    }
-
-    /**
-     * Clone the set
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function __clone()
-    {
-        $this->setMap(clone $this->getMap());
-    }
-
-    /**
-     * Set the value for an element
-     *
-     * @param mixed $element The element
-     * @param mixed $value   The value
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function offsetSet($element, $value)
-    {
-        $map = $this->getMap();
-
-        if ($value) {
-            $map[$element] = true;
-        } else {
-            unset($map[$element]);
-        }
-    }
-
-    /**
-     * Serialize the object
-     *
-     * @return array Array of values
-     *
-     * @since 1.0.0
-     */
-    public function jsonSerialize()
-    {
-        $array = array();
-
-        foreach ($this as $value) {
-            $array[] = $value;
-        }
-
-        return array('TreeSet' => $array);
-    }
-
-    /**
-     * Unset the existence of an element
-     *
-     * @param mixed $element The element
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function offsetUnset($element)
-    {
-        $map = $this->getMap();
-        unset($map[$element]);
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param callable $comparator Comparison function
+	 *
+	 * @since 1.0.0
+	 */
+	protected function __construct($comparator = null)
+	{
+		$this->setMap(TreeMap::create($comparator));
+	}
+
+	/**
+	 * Create
+	 *
+	 * @param callable $comparator Comparison function
+	 *
+	 * @return TreeSet A new TreeSet
+	 *
+	 * @since 1.0.0
+	 */
+	public static function create($comparator = null)
+	{
+		return new static($comparator);
+	}
+
+	/**
+	 * Put values in the set
+	 *
+	 * @param \Traversable $traversable Values to put in the set
+	 *
+	 * @return TreeSet $this for chaining
+	 *
+	 * @since 1.0.0
+	 */
+	public function put($traversable = array())
+	{
+		foreach ($traversable as $value) {
+			$this[$value] = true;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Clear the set
+	 *
+	 * @return TreeSet $this for chaining
+	 *
+	 * @since 1.0.0
+	 */
+	public function clear()
+	{
+		$this->getMap()->clear();
+
+		return $this;
+	}
+
+	/**
+	 * Initialise the set
+	 *
+	 * @param \Traversable $traversable Values to initialise the set
+	 *
+	 * @return TreeSet $this for chaining
+	 *
+	 * @since 1.0.0
+	 */
+	public function initialise($traversable = array())
+	{
+		return $this->clear()->put($traversable);
+	}
+
+	/**
+	 * Clone the set
+	 *
+	 * @return void
+	 *
+	 * @since 1.0.0
+	 */
+	public function __clone()
+	{
+		$this->setMap(clone $this->getMap());
+	}
+
+	/**
+	 * Set the value for an element
+	 *
+	 * @param mixed $element The element
+	 * @param mixed $value   The value
+	 *
+	 * @return void
+	 *
+	 * @since 1.0.0
+	 */
+	public function offsetSet($element, $value)
+	{
+		$map = $this->getMap();
+
+		if ($value) {
+			$map[$element] = true;
+		} else {
+			unset($map[$element]);
+		}
+	}
+
+	/**
+	 * Serialize the object
+	 *
+	 * @return array Array of values
+	 *
+	 * @since 1.0.0
+	 */
+	public function jsonSerialize()
+	{
+		$array = array();
+
+		foreach ($this as $value) {
+			$array[] = $value;
+		}
+
+		return array('TreeSet' => $array);
+	}
+
+	/**
+	 * Unset the existence of an element
+	 *
+	 * @param mixed $element The element
+	 *
+	 * @return void
+	 *
+	 * @since 1.0.0
+	 */
+	public function offsetUnset($element)
+	{
+		$map = $this->getMap();
+		unset($map[$element]);
+	}
 }

src/SortedCollection/ReversedMap.php

Spacing +2 added lines, -2 removed lines

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

Indentation +226 added lines, -226 removed lines

@@ -36,246 +36,246 @@
  */
 class ReversedMap extends AbstractMap
 {
-    /**
-     * @var SortedMap  Internal map
-     *
-     * @since 1.0.0
-     */
-    private $map;
+	/**
+	 * @var SortedMap  Internal map
+	 *
+	 * @since 1.0.0
+	 */
+	private $map;
 
-    /**
-     * @var callable  Comparator function
-     *
-     * @param mixed $key1 First key
-     * @param mixed $key2 Second key
-     *
-     * @return integer negative if $key1 is lesser than $key2,
-     *                 0 if $key1 is equal to $key2,
-     *                 positive if $key1 is greater than $key2
-     *
-     * @since 1.0.0
-     */
-    private $comparator;
+	/**
+	 * @var callable  Comparator function
+	 *
+	 * @param mixed $key1 First key
+	 * @param mixed $key2 Second key
+	 *
+	 * @return integer negative if $key1 is lesser than $key2,
+	 *                 0 if $key1 is equal to $key2,
+	 *                 positive if $key1 is greater than $key2
+	 *
+	 * @since 1.0.0
+	 */
+	private $comparator;
 
-    /**
-     * Constructor
-     *
-     * @param SortedMap $map Internal map
-     *
-     * @since 1.0.0
-     */
-    protected function __construct(SortedMap $map)
-    {
-        $this->map = $map;
-        $this->comparator = function ($key1, $key2) {
-            return - call_user_func($this->map->comparator, $key1, $key2);
-        };
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param SortedMap $map Internal map
+	 *
+	 * @since 1.0.0
+	 */
+	protected function __construct(SortedMap $map)
+	{
+		$this->map = $map;
+		$this->comparator = function ($key1, $key2) {
+			return - call_user_func($this->map->comparator, $key1, $key2);
+		};
+	}
 
-    /**
-     * Create
-     *
-     * @param SortedMap $map Internal map
-     *
-     * @return ReversedMap A new reversed map
-     *
-     * @since 1.0.0
-     */
-    public static function create(SortedMap $map)
-    {
-        return new static($map);
-    }
+	/**
+	 * Create
+	 *
+	 * @param SortedMap $map Internal map
+	 *
+	 * @return ReversedMap A new reversed map
+	 *
+	 * @since 1.0.0
+	 */
+	public static function create(SortedMap $map)
+	{
+		return new static($map);
+	}
 
-    /**
-     * Magic get method
-     *
-     * @param string $property The property
-     *
-     * @return mixed The value associated to the property
-     *
-     * @since 1.0.0
-     */
-    public function __get($property)
-    {
-        switch ($property) {
-            case 'map':
-                return $this->map;
-            default:
-                return parent::__get($property);
-        }
-    }
+	/**
+	 * Magic get method
+	 *
+	 * @param string $property The property
+	 *
+	 * @return mixed The value associated to the property
+	 *
+	 * @since 1.0.0
+	 */
+	public function __get($property)
+	{
+		switch ($property) {
+			case 'map':
+				return $this->map;
+			default:
+				return parent::__get($property);
+		}
+	}
 
-    /**
-     * Get the comparator
-     *
-     * @return callable The comparator
-     *
-     * @since 1.0.0
-     */
-    public function comparator()
-    {
-        return $this->comparator;
-    }
+	/**
+	 * Get the comparator
+	 *
+	 * @return callable The comparator
+	 *
+	 * @since 1.0.0
+	 */
+	public function comparator()
+	{
+		return $this->comparator;
+	}
 
-    /**
-     * Get the first element
-     *
-     * @return mixed The first element
-     *
-     * @throws OutOfBoundsException If there is no element
-     *
-     * @since 1.0.0
-     */
-    public function first()
-    {
-        return $this->map->last();
-    }
+	/**
+	 * Get the first element
+	 *
+	 * @return mixed The first element
+	 *
+	 * @throws OutOfBoundsException If there is no element
+	 *
+	 * @since 1.0.0
+	 */
+	public function first()
+	{
+		return $this->map->last();
+	}
 
-    /**
-     * Get the last element
-     *
-     * @return mixed The last element
-     *
-     * @throws OutOfBoundsException If there is no element
-     *
-     * @since 1.0.0
-     */
-    public function last()
-    {
-        return $this->map->first();
-    }
+	/**
+	 * Get the last element
+	 *
+	 * @return mixed The last element
+	 *
+	 * @throws OutOfBoundsException If there is no element
+	 *
+	 * @since 1.0.0
+	 */
+	public function last()
+	{
+		return $this->map->first();
+	}
 
-    /**
-     * Get the predecessor element
-     *
-     * @param TreeNode $element A tree node member of the underlying TreeMap
-     *
-     * @return mixed The predecessor element
-     *
-     * @throws OutOfBoundsException If there is no predecessor
-     *
-     * @since 1.0.0
-     */
-    public function predecessor($element)
-    {
-        return $this->map->successor($element);
-    }
+	/**
+	 * Get the predecessor element
+	 *
+	 * @param TreeNode $element A tree node member of the underlying TreeMap
+	 *
+	 * @return mixed The predecessor element
+	 *
+	 * @throws OutOfBoundsException If there is no predecessor
+	 *
+	 * @since 1.0.0
+	 */
+	public function predecessor($element)
+	{
+		return $this->map->successor($element);
+	}
 
-    /**
-     * Get the successor element
-     *
-     * @param TreeNode $element A tree node member of the underlying TreeMap
-     *
-     * @return mixed The successor element
-     *
-     * @throws OutOfBoundsException If there is no successor
-     */
-    public function successor($element)
-    {
-        return $this->map->predecessor($element);
-    }
+	/**
+	 * Get the successor element
+	 *
+	 * @param TreeNode $element A tree node member of the underlying TreeMap
+	 *
+	 * @return mixed The successor element
+	 *
+	 * @throws OutOfBoundsException If there is no successor
+	 */
+	public function successor($element)
+	{
+		return $this->map->predecessor($element);
+	}
 
-    /**
-     * Returns the element whose key is the greatest key lesser than the given key
-     *
-     * @param mixed $key The searched key
-     *
-     * @return mixed The found element
-     *
-     * @throws OutOfBoundsException If there is no lower element
-     *
-     * @since 1.0.0
-     */
-    public function lower($key)
-    {
-        return $this->map->higher($key);
-    }
+	/**
+	 * Returns the element whose key is the greatest key lesser than the given key
+	 *
+	 * @param mixed $key The searched key
+	 *
+	 * @return mixed The found element
+	 *
+	 * @throws OutOfBoundsException If there is no lower element
+	 *
+	 * @since 1.0.0
+	 */
+	public function lower($key)
+	{
+		return $this->map->higher($key);
+	}
 
-    /**
-     * Returns the element whose key is the greatest key lesser than or equal to the given key
-     *
-     * @param mixed $key The searched key
-     *
-     * @return mixed The found element
-     *
-     * @throws OutOfBoundsException If there is no floor element
-     *
-     * @since 1.0.0
-     */
-    public function floor($key)
-    {
-        return $this->map->ceiling($key);
-    }
+	/**
+	 * Returns the element whose key is the greatest key lesser than or equal to the given key
+	 *
+	 * @param mixed $key The searched key
+	 *
+	 * @return mixed The found element
+	 *
+	 * @throws OutOfBoundsException If there is no floor element
+	 *
+	 * @since 1.0.0
+	 */
+	public function floor($key)
+	{
+		return $this->map->ceiling($key);
+	}
 
-    /**
-     * Returns the element whose key is equal to the given key
-     *
-     * @param mixed $key The searched key
-     *
-     * @return mixed The found element
-     *
-     * @throws OutOfBoundsException If there is no such element
-     *
-     * @since 1.0.0
-     */
-    public function find($key)
-    {
-        return $this->map->find($key);
-    }
+	/**
+	 * Returns the element whose key is equal to the given key
+	 *
+	 * @param mixed $key The searched key
+	 *
+	 * @return mixed The found element
+	 *
+	 * @throws OutOfBoundsException If there is no such element
+	 *
+	 * @since 1.0.0
+	 */
+	public function find($key)
+	{
+		return $this->map->find($key);
+	}
 
-    /**
-     * Returns the element whose key is the lowest key greater than or equal to the given key
-     *
-     * @param mixed $key The searched key
-     *
-     * @return mixed The found element
-     *
-     * @throws OutOfBoundsException If there is no ceiling element
-     *
-     * @since 1.0.0
-     */
-    public function ceiling($key)
-    {
-        return $this->map->floor($key);
-    }
+	/**
+	 * Returns the element whose key is the lowest key greater than or equal to the given key
+	 *
+	 * @param mixed $key The searched key
+	 *
+	 * @return mixed The found element
+	 *
+	 * @throws OutOfBoundsException If there is no ceiling element
+	 *
+	 * @since 1.0.0
+	 */
+	public function ceiling($key)
+	{
+		return $this->map->floor($key);
+	}
 
-    /**
-     * Returns the element whose key is the lowest key greater than to the given key
-     *
-     * @param mixed $key The searched key
-     *
-     * @return mixed The found element
-     *
-     * @throws OutOfBoundsException If there is no higher element
-     *
-     * @since 1.0.0
-     */
-    public function higher($key)
-    {
-        return $this->map->lower($key);
-    }
+	/**
+	 * Returns the element whose key is the lowest key greater than to the given key
+	 *
+	 * @param mixed $key The searched key
+	 *
+	 * @return mixed The found element
+	 *
+	 * @throws OutOfBoundsException If there is no higher element
+	 *
+	 * @since 1.0.0
+	 */
+	public function higher($key)
+	{
+		return $this->map->lower($key);
+	}
 
-    /**
-     * Serialize the object
-     *
-     * @return array Array of values
-     *
-     * @since 1.0.0
-     */
-    public function jsonSerialize()
-    {
-        return array('ReversedMap' => $this->map->jsonSerialize());
-    }
+	/**
+	 * Serialize the object
+	 *
+	 * @return array Array of values
+	 *
+	 * @since 1.0.0
+	 */
+	public function jsonSerialize()
+	{
+		return array('ReversedMap' => $this->map->jsonSerialize());
+	}
 
-    /**
-     * Count the number of key/value pairs
-     *
-     * @return integer
-     *
-     * @since 1.0.0
-     */
-    public function count()
-    {
-        return $this->map->count();
-    }
+	/**
+	 * Count the number of key/value pairs
+	 *
+	 * @return integer
+	 *
+	 * @since 1.0.0
+	 */
+	public function count()
+	{
+		return $this->map->count();
+	}
 }

src/SortedCollection/TreeMap.php

Spacing +1 added lines, -1 removed lines

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

Indentation +410 added lines, -410 removed lines

@@ -35,414 +35,414 @@
  */
 class TreeMap extends AbstractMap
 {
-    /**
-     * @var TreeNode  Root of the tree
-     *
-     * @since 1.0.0
-     */
-    private $root;
-
-    /**
-     * @var callable  Comparator function
-     *
-     * @param mixed $key1 First key
-     * @param mixed $key2 Second key
-     *
-     * @return integer negative if $key1 is lesser than $key2,
-     *                  0 if $key1 is equal to $key2,
-     *                  positive if $key1 is greater than $key2
-     *
-     * @since 1.0.0
-     */
-    private $comparator;
-
-    /**
-     * Constructor
-     *
-     * @param callable $comparator Comparison function
-     *
-     * @since 1.0.0
-     */
-    protected function __construct($comparator = null)
-    {
-        if ($comparator == null) {
-            $this->comparator = function ($key1, $key2) {
-                return $key1 - $key2;
-            };
-        } else {
-            $this->comparator = $comparator;
-        }
-    }
-
-    /**
-     * Create
-     *
-     * @param callable $comparator Comparison function
-     *
-     * @return TreeMap A new TreeMap
-     *
-     * @since 1.0.0
-     */
-    public static function create($comparator = null)
-    {
-        return new static($comparator);
-    }
-
-    /**
-     * Get the comparator
-     *
-     * @return callable The comparator
-     *
-     * @since 1.0.0
-     */
-    public function comparator()
-    {
-        return $this->comparator;
-    }
-
-    /**
-     * Get the first element
-     *
-     * @return mixed The first element
-     *
-     * @throws OutOfBoundsException If there is no element
-     *
-     * @since 1.0.0
-     */
-    public function first()
-    {
-        if ($this->root) {
-            return $this->root->first;
-        } else {
-            throw new \OutOfBoundsException('First element unexisting');
-        }
-    }
-
-    /**
-     * Get the last element
-     *
-     * @return mixed The last element
-     *
-     * @throws OutOfBoundsException If there is no element
-     *
-     * @since 1.0.0
-     */
-    public function last()
-    {
-        if ($this->root) {
-            return $this->root->last;
-        } else {
-            throw new \OutOfBoundsException('Last element unexisting');
-        }
-    }
-
-    /**
-     * Get the predecessor element
-     *
-     * @param TreeNode $element A tree node member of the underlying TreeMap
-     *
-     * @return mixed The predecessor element
-     *
-     * @throws OutOfBoundsException  If there is no predecessor
-     *
-     * @since 1.0.0
-     */
-    public function predecessor($element)
-    {
-        $predecessor = $element->predecessor;
-
-        if ($predecessor) {
-            return $predecessor;
-        } else {
-            throw new \OutOfBoundsException('Predecessor element unexisting');
-        }
-    }
-
-    /**
-     * Get the successor element
-     *
-     * @param TreeNode $element A tree node member of the underlying TreeMap
-     *
-     * @return mixed The successor element
-     *
-     * @throws OutOfBoundsException If there is no successor
-     *
-     * @since 1.0.0
-     */
-    public function successor($element)
-    {
-        $successor = $element->successor;
-
-        if ($successor) {
-            return $successor;
-        } else {
-            throw new \OutOfBoundsException('Successor element unexisting');
-        }
-    }
-
-    /**
-     * Returns the element whose key is the greatest key lesser than the given key
-     *
-     * @param mixed $key The searched key
-     *
-     * @return mixed The found element
-     *
-     * @throws OutOfBoundsException If there is no lower element
-     *
-     * @since 1.0.0
-     */
-    public function lower($key)
-    {
-        if ($this->root) {
-            $lower = $this->root->find($key, $this->comparator, -2);
-        } else {
-            $lower = null;
-        }
-
-        if ($lower) {
-            return $lower;
-        } else {
-            throw new \OutOfBoundsException('Lower element unexisting');
-        }
-    }
-
-    /**
-     * Returns the element whose key is the greatest key lesser than or equal to the given key
-     *
-     * @param mixed $key The searched key
-     *
-     * @return mixed The found element
-     *
-     * @throws OutOfBoundsException If there is no floor element
-     *
-     * @since 1.0.0
-     */
-    public function floor($key)
-    {
-        if ($this->root) {
-            $floor = $this->root->find($key, $this->comparator, -1);
-        } else {
-            $floor = null;
-        }
-
-        if ($floor) {
-            return $floor;
-        } else {
-            throw new \OutOfBoundsException('Floor element unexisting');
-        }
-    }
-
-    /**
-     * Returns the element whose key is equal to the given key
-     *
-     * @param mixed $key The searched key
-     *
-     * @return mixed The found element
-     *
-     * @throws OutOfBoundsException If there is no such element
-     *
-     * @since 1.0.0
-     */
-    public function find($key)
-    {
-        if ($this->root) {
-            $find = $this->root->find($key, $this->comparator, 0);
-        } else {
-            $find = null;
-        }
-
-        if ($find) {
-            return $find;
-        } else {
-            throw new \OutOfBoundsException('Element unexisting');
-        }
-    }
-
-    /**
-     * Returns the element whose key is the lowest key greater than or equal to the given key
-     *
-     * @param mixed $key The searched key
-     *
-     * @return mixed The found element
-     *
-     * @throws OutOfBoundsException If there is no ceiling element
-     *
-     * @since 1.0.0
-     */
-    public function ceiling($key)
-    {
-        if ($this->root) {
-            $ceiling = $this->root->find($key, $this->comparator, 1);
-        } else {
-            $ceiling = null;
-        }
-
-        if ($ceiling) {
-            return $ceiling;
-        } else {
-            throw new \OutOfBoundsException('Ceiling element unexisting');
-        }
-    }
-
-    /**
-     * Returns the element whose key is the lowest key greater than to the given key
-     *
-     * @param mixed $key The searched key
-     *
-     * @return mixed The found element
-     *
-     * @throws OutOfBoundsException If there is no higher element
-     *
-     * @since 1.0.0
-     */
-    public function higher($key)
-    {
-        if ($this->root) {
-            $higher = $this->root->find($key, $this->comparator, 2);
-        } else {
-            $higher = null;
-        }
-
-        if ($higher) {
-            return $higher;
-        } else {
-            throw new \OutOfBoundsException('Higher element unexisting');
-        }
-    }
-
-    /**
-     * Put values in the map
-     *
-     * @param \Traversable $traversable Values to put in the map
-     *
-     * @return TreeMap $this for chaining
-     *
-     * @since 1.0.0
-     */
-    public function put($traversable = array())
-    {
-        foreach ($traversable as $key => $value) {
-            $this[$key] = $value;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Clear the map
-     *
-     * @return TreeMap $this for chaining
-     *
-     * @since 1.0.0
-     */
-    public function clear()
-    {
-        $this->root = null;
-
-        return $this;
-    }
-
-    /**
-     * Initialise the map
-     *
-     * @param \Traversable $traversable Values to initialise the map
-     *
-     * @return TreeMap $this for chaining
-     *
-     * @since 1.0.0
-     */
-    public function initialise($traversable = array())
-    {
-        return $this->clear()->put($traversable);
-    }
-
-    /**
-     * Clone the map
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function __clone()
-    {
-        if ($this->root != null) {
-            $root = $this->root;
-            $this->root = null;
-            $node = $root->first;
-
-            while ($node != null) {
-                $this[$node->key] = $node->value;
-                $node = $node->successor;
-            }
-        }
-    }
-
-    /**
-     * Serialize the object
-     *
-     * @return array Array of values
-     *
-     * @since 1.0.0
-     */
-    public function jsonSerialize()
-    {
-        $array = array();
-
-        foreach ($this as $key => $value) {
-            $array[$key] = $value;
-        }
-
-        return array('TreeMap' => $array);
-    }
-
-    /**
-     * Set the value for a key
-     *
-     * @param mixed $key   The key
-     * @param mixed $value The value
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function offsetSet($key, $value)
-    {
-        if ($this->root) {
-            $this->root = $this->root->insert($key, $value, $this->comparator);
-        } else {
-            $this->root = TreeNode::create($key, $value);
-        }
-    }
-
-    /**
-     * Unset the existence of a key
-     *
-     * @param mixed $key The key
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function offsetUnset($key)
-    {
-        if ($this->root) {
-            $this->root = $this->root->remove($key, $this->comparator);
-        }
-    }
-
-    /**
-     * Count the number of key/value pairs
-     *
-     * @return integer
-     *
-     * @since 1.0.0
-     */
-    public function count()
-    {
-        if ($this->root) {
-            return count($this->root);
-        } else {
-            return 0;
-        }
-    }
+	/**
+	 * @var TreeNode  Root of the tree
+	 *
+	 * @since 1.0.0
+	 */
+	private $root;
+
+	/**
+	 * @var callable  Comparator function
+	 *
+	 * @param mixed $key1 First key
+	 * @param mixed $key2 Second key
+	 *
+	 * @return integer negative if $key1 is lesser than $key2,
+	 *                  0 if $key1 is equal to $key2,
+	 *                  positive if $key1 is greater than $key2
+	 *
+	 * @since 1.0.0
+	 */
+	private $comparator;
+
+	/**
+	 * Constructor
+	 *
+	 * @param callable $comparator Comparison function
+	 *
+	 * @since 1.0.0
+	 */
+	protected function __construct($comparator = null)
+	{
+		if ($comparator == null) {
+			$this->comparator = function ($key1, $key2) {
+				return $key1 - $key2;
+			};
+		} else {
+			$this->comparator = $comparator;
+		}
+	}
+
+	/**
+	 * Create
+	 *
+	 * @param callable $comparator Comparison function
+	 *
+	 * @return TreeMap A new TreeMap
+	 *
+	 * @since 1.0.0
+	 */
+	public static function create($comparator = null)
+	{
+		return new static($comparator);
+	}
+
+	/**
+	 * Get the comparator
+	 *
+	 * @return callable The comparator
+	 *
+	 * @since 1.0.0
+	 */
+	public function comparator()
+	{
+		return $this->comparator;
+	}
+
+	/**
+	 * Get the first element
+	 *
+	 * @return mixed The first element
+	 *
+	 * @throws OutOfBoundsException If there is no element
+	 *
+	 * @since 1.0.0
+	 */
+	public function first()
+	{
+		if ($this->root) {
+			return $this->root->first;
+		} else {
+			throw new \OutOfBoundsException('First element unexisting');
+		}
+	}
+
+	/**
+	 * Get the last element
+	 *
+	 * @return mixed The last element
+	 *
+	 * @throws OutOfBoundsException If there is no element
+	 *
+	 * @since 1.0.0
+	 */
+	public function last()
+	{
+		if ($this->root) {
+			return $this->root->last;
+		} else {
+			throw new \OutOfBoundsException('Last element unexisting');
+		}
+	}
+
+	/**
+	 * Get the predecessor element
+	 *
+	 * @param TreeNode $element A tree node member of the underlying TreeMap
+	 *
+	 * @return mixed The predecessor element
+	 *
+	 * @throws OutOfBoundsException  If there is no predecessor
+	 *
+	 * @since 1.0.0
+	 */
+	public function predecessor($element)
+	{
+		$predecessor = $element->predecessor;
+
+		if ($predecessor) {
+			return $predecessor;
+		} else {
+			throw new \OutOfBoundsException('Predecessor element unexisting');
+		}
+	}
+
+	/**
+	 * Get the successor element
+	 *
+	 * @param TreeNode $element A tree node member of the underlying TreeMap
+	 *
+	 * @return mixed The successor element
+	 *
+	 * @throws OutOfBoundsException If there is no successor
+	 *
+	 * @since 1.0.0
+	 */
+	public function successor($element)
+	{
+		$successor = $element->successor;
+
+		if ($successor) {
+			return $successor;
+		} else {
+			throw new \OutOfBoundsException('Successor element unexisting');
+		}
+	}
+
+	/**
+	 * Returns the element whose key is the greatest key lesser than the given key
+	 *
+	 * @param mixed $key The searched key
+	 *
+	 * @return mixed The found element
+	 *
+	 * @throws OutOfBoundsException If there is no lower element
+	 *
+	 * @since 1.0.0
+	 */
+	public function lower($key)
+	{
+		if ($this->root) {
+			$lower = $this->root->find($key, $this->comparator, -2);
+		} else {
+			$lower = null;
+		}
+
+		if ($lower) {
+			return $lower;
+		} else {
+			throw new \OutOfBoundsException('Lower element unexisting');
+		}
+	}
+
+	/**
+	 * Returns the element whose key is the greatest key lesser than or equal to the given key
+	 *
+	 * @param mixed $key The searched key
+	 *
+	 * @return mixed The found element
+	 *
+	 * @throws OutOfBoundsException If there is no floor element
+	 *
+	 * @since 1.0.0
+	 */
+	public function floor($key)
+	{
+		if ($this->root) {
+			$floor = $this->root->find($key, $this->comparator, -1);
+		} else {
+			$floor = null;
+		}
+
+		if ($floor) {
+			return $floor;
+		} else {
+			throw new \OutOfBoundsException('Floor element unexisting');
+		}
+	}
+
+	/**
+	 * Returns the element whose key is equal to the given key
+	 *
+	 * @param mixed $key The searched key
+	 *
+	 * @return mixed The found element
+	 *
+	 * @throws OutOfBoundsException If there is no such element
+	 *
+	 * @since 1.0.0
+	 */
+	public function find($key)
+	{
+		if ($this->root) {
+			$find = $this->root->find($key, $this->comparator, 0);
+		} else {
+			$find = null;
+		}
+
+		if ($find) {
+			return $find;
+		} else {
+			throw new \OutOfBoundsException('Element unexisting');
+		}
+	}
+
+	/**
+	 * Returns the element whose key is the lowest key greater than or equal to the given key
+	 *
+	 * @param mixed $key The searched key
+	 *
+	 * @return mixed The found element
+	 *
+	 * @throws OutOfBoundsException If there is no ceiling element
+	 *
+	 * @since 1.0.0
+	 */
+	public function ceiling($key)
+	{
+		if ($this->root) {
+			$ceiling = $this->root->find($key, $this->comparator, 1);
+		} else {
+			$ceiling = null;
+		}
+
+		if ($ceiling) {
+			return $ceiling;
+		} else {
+			throw new \OutOfBoundsException('Ceiling element unexisting');
+		}
+	}
+
+	/**
+	 * Returns the element whose key is the lowest key greater than to the given key
+	 *
+	 * @param mixed $key The searched key
+	 *
+	 * @return mixed The found element
+	 *
+	 * @throws OutOfBoundsException If there is no higher element
+	 *
+	 * @since 1.0.0
+	 */
+	public function higher($key)
+	{
+		if ($this->root) {
+			$higher = $this->root->find($key, $this->comparator, 2);
+		} else {
+			$higher = null;
+		}
+
+		if ($higher) {
+			return $higher;
+		} else {
+			throw new \OutOfBoundsException('Higher element unexisting');
+		}
+	}
+
+	/**
+	 * Put values in the map
+	 *
+	 * @param \Traversable $traversable Values to put in the map
+	 *
+	 * @return TreeMap $this for chaining
+	 *
+	 * @since 1.0.0
+	 */
+	public function put($traversable = array())
+	{
+		foreach ($traversable as $key => $value) {
+			$this[$key] = $value;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Clear the map
+	 *
+	 * @return TreeMap $this for chaining
+	 *
+	 * @since 1.0.0
+	 */
+	public function clear()
+	{
+		$this->root = null;
+
+		return $this;
+	}
+
+	/**
+	 * Initialise the map
+	 *
+	 * @param \Traversable $traversable Values to initialise the map
+	 *
+	 * @return TreeMap $this for chaining
+	 *
+	 * @since 1.0.0
+	 */
+	public function initialise($traversable = array())
+	{
+		return $this->clear()->put($traversable);
+	}
+
+	/**
+	 * Clone the map
+	 *
+	 * @return void
+	 *
+	 * @since 1.0.0
+	 */
+	public function __clone()
+	{
+		if ($this->root != null) {
+			$root = $this->root;
+			$this->root = null;
+			$node = $root->first;
+
+			while ($node != null) {
+				$this[$node->key] = $node->value;
+				$node = $node->successor;
+			}
+		}
+	}
+
+	/**
+	 * Serialize the object
+	 *
+	 * @return array Array of values
+	 *
+	 * @since 1.0.0
+	 */
+	public function jsonSerialize()
+	{
+		$array = array();
+
+		foreach ($this as $key => $value) {
+			$array[$key] = $value;
+		}
+
+		return array('TreeMap' => $array);
+	}
+
+	/**
+	 * Set the value for a key
+	 *
+	 * @param mixed $key   The key
+	 * @param mixed $value The value
+	 *
+	 * @return void
+	 *
+	 * @since 1.0.0
+	 */
+	public function offsetSet($key, $value)
+	{
+		if ($this->root) {
+			$this->root = $this->root->insert($key, $value, $this->comparator);
+		} else {
+			$this->root = TreeNode::create($key, $value);
+		}
+	}
+
+	/**
+	 * Unset the existence of a key
+	 *
+	 * @param mixed $key The key
+	 *
+	 * @return void
+	 *
+	 * @since 1.0.0
+	 */
+	public function offsetUnset($key)
+	{
+		if ($this->root) {
+			$this->root = $this->root->remove($key, $this->comparator);
+		}
+	}
+
+	/**
+	 * Count the number of key/value pairs
+	 *
+	 * @return integer
+	 *
+	 * @since 1.0.0
+	 */
+	public function count()
+	{
+		if ($this->root) {
+			return count($this->root);
+		} else {
+			return 0;
+		}
+	}
 }

src/SortedCollection/Iterator.php

Indentation +185 added lines, -185 removed lines

@@ -23,189 +23,189 @@
  */
 class Iterator implements \Iterator
 {
-    /**
-     * Iterate on pairs
-     *
-     * @since 1.0.0
-     */
-    private const PAIRS = 0;
-
-    /**
-     * Iterate on keys
-     *
-     * @since 1.0.0
-     */
-    private const KEYS = 1;
-
-    /**
-     * Iterate on values
-     *
-     * @since 1.0.0
-     */
-    private const VALUES = 2;
-
-    /**
-     * @var integer  Type: self::PAIRS, self::KEYS or self::VALUES
-     *
-     * @since 1.0.0
-     */
-    private $type;
-
-    /**
-     * @var integer  Index
-     *
-     * @since 1.0.0
-     */
-    private $index;
-
-    /**
-     * @var SortedMap  Map
-     *
-     * @since 1.0.0
-     */
-    private $map;
-
-    /**
-     * Constructor
-     *
-     * @param SortedMap $map  Sorted map
-     * @param integer   $type Iterator type
-     *
-     * @since 1.0.0
-     */
-    protected function __construct(SortedMap $map, $type)
-    {
-        $this->map = $map;
-        $this->type = $type;
-        $this->rewind();
-    }
-
-    /**
-     * Create a new iterator on pairs
-     *
-     * @param SortedMap $map Sorted map
-     *
-     * @return Iterator A new iterator on pairs
-     *
-     * @since 1.0.0
-     */
-    public static function create(SortedMap $map)
-    {
-        return new static($map, self::PAIRS);
-    }
-
-    /**
-     * Create a new iterator on keys
-     *
-     * @param SortedMap $map Sorted map
-     *
-     * @return Iterator A new iterator on keys
-     *
-     * @since 1.0.0
-     */
-    public static function keys(SortedMap $map)
-    {
-        return new static($map, self::KEYS);
-    }
-
-    /**
-     * Create a new iterator on values
-     *
-     * @param SortedMap $map Sorted map
-     *
-     * @return Iterator A new iterator on values
-     *
-     * @since 1.0.0
-     */
-    public static function values(SortedMap $map)
-    {
-        return new static($map, self::VALUES);
-    }
-
-    /**
-     * @var TreeNode  The current node
-     *
-     * @since 1.0.0
-     */
-    protected $current;
-
-    /**
-     * Rewind the Iterator to the first element
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function rewind()
-    {
-        $this->index = 0;
-
-        try {
-            $this->current = $this->map->first();
-        } catch (\OutOfBoundsException $e) {
-            $this->current = null;
-        }
-    }
-
-    /**
-     * Return the current key
-     *
-     * @return mixed The current key
-     *
-     * @since 1.0.0
-     */
-    public function key()
-    {
-        if ($this->type == self::PAIRS) {
-            return $this->current->key;
-        } else {
-            return $this->index;
-        }
-    }
-
-    /**
-     * Return the current value
-     *
-     * @return mixed The current value
-     *
-     * @since 1.0.0
-     */
-    public function current()
-    {
-        if ($this->type == self::KEYS) {
-            return $this->current->key;
-        } else {
-            return $this->current->value;
-        }
-    }
-
-    /**
-     * Move forward to the next element
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function next()
-    {
-        try {
-            $this->current = $this->map->successor($this->current);
-        } catch (\OutOfBoundsException $e) {
-            $this->current = null;
-        }
-
-        $this->index++;
-    }
-
-    /**
-     * Checks if current position is valid
-     *
-     * @return boolean
-     *
-     * @since 1.0.0
-     */
-    public function valid()
-    {
-        return (bool) $this->current;
-    }
+	/**
+	 * Iterate on pairs
+	 *
+	 * @since 1.0.0
+	 */
+	private const PAIRS = 0;
+
+	/**
+	 * Iterate on keys
+	 *
+	 * @since 1.0.0
+	 */
+	private const KEYS = 1;
+
+	/**
+	 * Iterate on values
+	 *
+	 * @since 1.0.0
+	 */
+	private const VALUES = 2;
+
+	/**
+	 * @var integer  Type: self::PAIRS, self::KEYS or self::VALUES
+	 *
+	 * @since 1.0.0
+	 */
+	private $type;
+
+	/**
+	 * @var integer  Index
+	 *
+	 * @since 1.0.0
+	 */
+	private $index;
+
+	/**
+	 * @var SortedMap  Map
+	 *
+	 * @since 1.0.0
+	 */
+	private $map;
+
+	/**
+	 * Constructor
+	 *
+	 * @param SortedMap $map  Sorted map
+	 * @param integer   $type Iterator type
+	 *
+	 * @since 1.0.0
+	 */
+	protected function __construct(SortedMap $map, $type)
+	{
+		$this->map = $map;
+		$this->type = $type;
+		$this->rewind();
+	}
+
+	/**
+	 * Create a new iterator on pairs
+	 *
+	 * @param SortedMap $map Sorted map
+	 *
+	 * @return Iterator A new iterator on pairs
+	 *
+	 * @since 1.0.0
+	 */
+	public static function create(SortedMap $map)
+	{
+		return new static($map, self::PAIRS);
+	}
+
+	/**
+	 * Create a new iterator on keys
+	 *
+	 * @param SortedMap $map Sorted map
+	 *
+	 * @return Iterator A new iterator on keys
+	 *
+	 * @since 1.0.0
+	 */
+	public static function keys(SortedMap $map)
+	{
+		return new static($map, self::KEYS);
+	}
+
+	/**
+	 * Create a new iterator on values
+	 *
+	 * @param SortedMap $map Sorted map
+	 *
+	 * @return Iterator A new iterator on values
+	 *
+	 * @since 1.0.0
+	 */
+	public static function values(SortedMap $map)
+	{
+		return new static($map, self::VALUES);
+	}
+
+	/**
+	 * @var TreeNode  The current node
+	 *
+	 * @since 1.0.0
+	 */
+	protected $current;
+
+	/**
+	 * Rewind the Iterator to the first element
+	 *
+	 * @return void
+	 *
+	 * @since 1.0.0
+	 */
+	public function rewind()
+	{
+		$this->index = 0;
+
+		try {
+			$this->current = $this->map->first();
+		} catch (\OutOfBoundsException $e) {
+			$this->current = null;
+		}
+	}
+
+	/**
+	 * Return the current key
+	 *
+	 * @return mixed The current key
+	 *
+	 * @since 1.0.0
+	 */
+	public function key()
+	{
+		if ($this->type == self::PAIRS) {
+			return $this->current->key;
+		} else {
+			return $this->index;
+		}
+	}
+
+	/**
+	 * Return the current value
+	 *
+	 * @return mixed The current value
+	 *
+	 * @since 1.0.0
+	 */
+	public function current()
+	{
+		if ($this->type == self::KEYS) {
+			return $this->current->key;
+		} else {
+			return $this->current->value;
+		}
+	}
+
+	/**
+	 * Move forward to the next element
+	 *
+	 * @return void
+	 *
+	 * @since 1.0.0
+	 */
+	public function next()
+	{
+		try {
+			$this->current = $this->map->successor($this->current);
+		} catch (\OutOfBoundsException $e) {
+			$this->current = null;
+		}
+
+		$this->index++;
+	}
+
+	/**
+	 * Checks if current position is valid
+	 *
+	 * @return boolean
+	 *
+	 * @since 1.0.0
+	 */
+	public function valid()
+	{
+		return (bool) $this->current;
+	}
 }

src/SortedCollection/ReversedSet.php

Indentation +59 added lines, -59 removed lines

@@ -30,67 +30,67 @@
  */
 class ReversedSet extends AbstractSet
 {
-    /**
-     * @var SortedSet  Internal set
-     *
-     * @since 1.0.0
-     */
-    private $set;
+	/**
+	 * @var SortedSet  Internal set
+	 *
+	 * @since 1.0.0
+	 */
+	private $set;
 
-    /**
-     * Constructor
-     *
-     * @param SortedSet $set Internal set
-     *
-     * @since 1.0.0
-     */
-    protected function __construct(SortedSet $set)
-    {
-        $this->setMap(ReversedMap::create($set->getMap()))->set = $set;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param SortedSet $set Internal set
+	 *
+	 * @since 1.0.0
+	 */
+	protected function __construct(SortedSet $set)
+	{
+		$this->setMap(ReversedMap::create($set->getMap()))->set = $set;
+	}
 
-    /**
-     * Create
-     *
-     * @param SortedSet $set Internal set
-     *
-     * @return ReversedSet A new reversed set
-     *
-     * @since 1.0.0
-     */
-    public static function create(SortedSet $set)
-    {
-        return new static($set);
-    }
+	/**
+	 * Create
+	 *
+	 * @param SortedSet $set Internal set
+	 *
+	 * @return ReversedSet A new reversed set
+	 *
+	 * @since 1.0.0
+	 */
+	public static function create(SortedSet $set)
+	{
+		return new static($set);
+	}
 
-    /**
-     * Magic get method
-     *
-     * @param string $property The property
-     *
-     * @return mixed The value associated to the property
-     *
-     * @since 1.0.0
-     */
-    public function __get($property)
-    {
-        switch ($property) {
-            case 'set':
-                return $this->set;
-            default:
-                return parent::__get($property);
-        }
-    }
+	/**
+	 * Magic get method
+	 *
+	 * @param string $property The property
+	 *
+	 * @return mixed The value associated to the property
+	 *
+	 * @since 1.0.0
+	 */
+	public function __get($property)
+	{
+		switch ($property) {
+			case 'set':
+				return $this->set;
+			default:
+				return parent::__get($property);
+		}
+	}
 
-    /**
-     * Serialize the object
-     *
-     * @return array Array of values
-     *
-     * @since 1.0.0
-     */
-    public function jsonSerialize()
-    {
-        return array('ReversedSet' => $this->set->jsonSerialize());
-    }
+	/**
+	 * Serialize the object
+	 *
+	 * @return array Array of values
+	 *
+	 * @since 1.0.0
+	 */
+	public function jsonSerialize()
+	{
+		return array('ReversedSet' => $this->set->jsonSerialize());
+	}
 }