remove deprecated method to prepare for v6

5 files changed, 1 insertions, 92 deletions

diff --git a/src/AbstractCsv.php b/src/AbstractCsv.php
index 3a31b09..bacaa67 100644
--- a/src/AbstractCsv.php
+++ b/src/AbstractCsv.php
@@ -369,7 +369,7 @@ abstract class AbstractCsv implements JsonSerializable, IteratorAggregate
     public function getIterator()
     {
         $obj = $this->path;
-        if (! $obj instanceof SplFileObject) {
+        if (! $obj instanceof SplTempFileObject) {
             $obj = new SplFileObject($this->getStreamFilterPath(), $this->open_mode);
         }
         $obj->setCsvControl($this->delimiter, $this->enclosure, $this->escape);
@@ -379,26 +379,6 @@ abstract class AbstractCsv implements JsonSerializable, IteratorAggregate
     }
 
     /**
-     * DEPRECATION WARNING! This method will be removed in the next major point release
-     *
-     * @deprecated deprecated since version 5.5
-     */
-    public function setEncoding($str)
-    {
-        return $this->setEncodingFrom($str);
-    }
-
-    /**
-     * DEPRECATION WARNING! This method will be removed in the next major point release
-     *
-     * @deprecated deprecated since version 5.5
-     */
-    public function getEncoding()
-    {
-        return $this->getEncodingFrom();
-    }
-
-    /**
      * Set the CSV encoding charset
      *
      * @param string $str
diff --git a/src/Iterator/Filter.php b/src/Iterator/Filter.php
index b04de5e..dc032e7 100644
--- a/src/Iterator/Filter.php
+++ b/src/Iterator/Filter.php
@@ -35,22 +35,6 @@ trait Filter
     /**
      * Set the Iterator filter method
      *
-     * DEPRECATION WARNING! This method will be removed in the next major point release
-     *
-     * @deprecated deprecated since version 5.1
-     *
-     * @param callable $callable
-     *
-     * @return self
-     */
-    public function setFilter(callable $callable)
-    {
-        return $this->addFilter($callable);
-    }
-
-    /**
-     * Set the Iterator filter method
-     *
      * @param callable $callable
      *
      * @return self
diff --git a/src/Iterator/SortBy.php b/src/Iterator/SortBy.php
index 8e4b2e0..b59d92d 100644
--- a/src/Iterator/SortBy.php
+++ b/src/Iterator/SortBy.php
@@ -33,22 +33,6 @@ trait SortBy
     protected $iterator_sort_by = [];
 
     /**
-     * Set the Iterator SortBy method
-     *
-     * DEPRECATION WARNING! This method will be removed in the next major point release
-     *
-     * @deprecated deprecated since version 5.2
-     *
-     * @param callable $callable
-     *
-     * @return self
-     */
-    public function setSortBy(callable $callable)
-    {
-        return $this->addSortBy($callable);
-    }
-
-    /**
      * Set an Iterator sorting callable function
      *
      * @param callable $callable
diff --git a/src/Reader.php b/src/Reader.php
index 473aa7c..ff90e15 100644
--- a/src/Reader.php
+++ b/src/Reader.php
@@ -187,25 +187,6 @@ class Reader extends AbstractCsv
     /**
      * Return a single column from the CSV data
      *
-     * DEPRECATION WARNING! This method will be removed in the next major point release
-     *
-     * @deprecated deprecated since version 5.4
-     *
-     * @param integer  $column_index field Index
-     * @param callable $callable     a callable function to be applied to each value to be return
-     *
-     * @return array
-     *
-     * @throws \InvalidArgumentException If the column index is not a positive integer or 0
-     */
-    public function fetchCol($column_index = 0, callable $callable = null)
-    {
-        return $this->fetchColumn($column_index, $callable);
-    }
-
-    /**
-     * Return a single column from the CSV data
-     *
      * @param integer  $column_index field Index
      * @param callable $callable     a callable function to be applied to each value to be return
      *
@@ -232,14 +213,4 @@ class Reader extends AbstractCsv
 
         return iterator_to_array($iterator, false);
     }
-
-    /**
-     * DEPRECATION WARNING! This method will be removed in the next major point release
-     *
-     * @deprecated deprecated since version 5.5
-     */
-    public function getWriter($open_mode = 'r+')
-    {
-        return $this->newWriter($open_mode);
-    }
 }
diff --git a/src/Writer.php b/src/Writer.php
index 3349f7c..5f30678 100644
--- a/src/Writer.php
+++ b/src/Writer.php
@@ -313,14 +313,4 @@ class Writer extends AbstractCsv
 
         return $this;
     }
-
-    /**
-     * DEPRECATION WARNING! This method will be removed in the next major point release
-     *
-     * @deprecated deprecated since version 5.5
-     */
-    public function getReader($open_mode = 'r+')
-    {
-        return $this->newReader($open_mode);
-    }
 }