Simplified method names

Author: bpolaszek

src/IterableObject.php

@@ -65,7 +65,7 @@ public function __construct($iterable, $filter = null, $map = null)
      * @param callable $filter
      * @return self
      */
-    public function withFilter($filter)
+    public function filter($filter)
     {
         return new self($this->iterable, $filter, $this->map);
     }
@@ -74,11 +74,31 @@ public function withFilter($filter)
      * @param callable $map
      * @return self
      */
-    public function withMap($map)
+    public function map($map)
     {
         return new self($this->iterable, $this->filter, $map);
     }
 
+    /**
+     * @param callable $filter
+     * @return self
+     * @deprecated Use IterableObject::filter instead.
+     */
+    public function withFilter($filter)
+    {
+        return $this->filter($filter);
+    }
+
+    /**
+     * @param callable $map
+     * @return self
+     * @deprecated Use IterableObject::map instead.
+     */
+    public function withMap($map)
+    {
+        return $this->map($map);
+    }
+
     /**
      * @inheritdoc
      */

tests/TestIterableObject.php

@@ -67,8 +67,12 @@ public function testFilterAndMapMutators()
         $map = 'strtoupper';
         $iterableObject = iterable(array('foo', 'bar'))->withMap($map)->withFilter($filter);
         $this->assertEquals(array(1 => 'BAR'), iterator_to_array($iterableObject));
+        $iterableObject = iterable(array('foo', 'bar'))->map($map)->filter($filter);
+        $this->assertEquals(array(1 => 'BAR'), iterator_to_array($iterableObject));
         $iterableObject = iterable(array('foo', 'bar'))->withFilter($filter)->withMap($map);
         $this->assertEquals(array(1 => 'BAR'), iterator_to_array($iterableObject));
+        $iterableObject = iterable(array('foo', 'bar'))->filter($filter)->map($map);
+        $this->assertEquals(array(1 => 'BAR'), iterator_to_array($iterableObject));
     }
 
     public function dataProvider()
@@ -107,4 +111,4 @@ public function dataProvider()
         );
     }
 
-}
+}