restore deprecated methods

6 files changed, 104 insertions, 4 deletions

diff --git a/src/AbstractCsv.php b/src/AbstractCsv.php
index 94f0883..f493919 100644
--- a/src/AbstractCsv.php
+++ b/src/AbstractCsv.php
@@ -169,7 +169,7 @@ abstract class AbstractCsv implements JsonSerializable, IteratorAggregate
     public function getIterator()
     {
         $obj = $this->path;
-        if (! $obj instanceof SplTempFileObject) {
+        if (! $obj instanceof SplFileObject) {
             $obj = new SplFileObject($this->getStreamFilterPath(), $this->open_mode);
         }
         $obj->setCsvControl($this->delimiter, $this->enclosure, $this->escape);
diff --git a/src/Config/Controls.php b/src/Config/Controls.php
index 7306a56..e38e6f0 100644
--- a/src/Config/Controls.php
+++ b/src/Config/Controls.php
@@ -21,7 +21,7 @@ use League\Csv\Iterator\MapIterator;
  *  A trait to configure and check CSV file and content
  *
  * @package League.csv
- * @since  6.0.0
+ * @since  5.5.0
  *
  */
 trait Controls
@@ -175,6 +175,32 @@ trait Controls
     }
 
     /**
+     * DEPRECATION WARNING! This method will be removed in the next major point release
+     *
+     * @deprecated deprecated since version 5.5
+     *
+     * @param string $str
+     *
+     * @return self
+     */
+    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
+     *
+     * @return string
+     */
+    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 dc032e7..f279a97 100644
--- a/src/Iterator/Filter.php
+++ b/src/Iterator/Filter.php
@@ -33,6 +33,20 @@ trait Filter
     protected $iterator_filters = [];
 
     /**
+     * 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
diff --git a/src/Iterator/SortBy.php b/src/Iterator/SortBy.php
index b59d92d..ad462d2 100644
--- a/src/Iterator/SortBy.php
+++ b/src/Iterator/SortBy.php
@@ -33,6 +33,20 @@ trait SortBy
     protected $iterator_sort_by = [];
 
     /**
+     * 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 ebcde2f..b3a2360 100644
--- a/src/Reader.php
+++ b/src/Reader.php
@@ -185,6 +185,23 @@ class Reader extends AbstractCsv
     }
 
     /**
+     * DEPRECATION WARNING! This method will be removed in the next major point release
+     *
+     * @deprecated deprecated since version 5.5
+     *
+     * @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
@@ -215,6 +232,20 @@ class Reader extends AbstractCsv
     }
 
     /**
+     * DEPRECATION WARNING! This method will be removed in the next major point release
+     *
+     * @deprecated deprecated since version 5.5
+     *
+     * @param string $open_mode the file open mode flag
+     *
+     * @return \League\Csv\Writer object
+     */
+    public function getWriter($open_mode = 'r+')
+    {
+        return $this->newWriter($open_mode);
+    }
+
+    /**
      * Create a {@link Writer} instance from a {@link Reader} object
      *
      * @param string $open_mode the file open mode flag
diff --git a/src/Writer.php b/src/Writer.php
index 215fd86..8602fed 100644
--- a/src/Writer.php
+++ b/src/Writer.php
@@ -15,6 +15,7 @@ namespace League\Csv;
 use Traversable;
 use SplFileObject;
 use InvalidArgumentException;
+use RuntimeException;
 use OutOfBoundsException;
 
 /**
@@ -278,7 +279,7 @@ class Writer extends AbstractCsv
         $data = $this->validateRow($data);
         $data = $this->sanitizeColumnsContent($data);
         if (! $this->isColumnsCountConsistent($data)) {
-            throw new InvalidArgumentException(
+            throw new RuntimeException(
                 'You are trying to add '.count($data).' columns to a CSV
                 that requires '.$this->columns_count.' columns per row.'
             );
@@ -315,11 +316,25 @@ class Writer extends AbstractCsv
     }
 
     /**
+     * DEPRECATION WARNING! This method will be removed in the next major point release
+     *
+     * @deprecated deprecated since version 5.5
+     *
+     * @param string $open_mode the file open mode flag
+     *
+     * @return \League\Csv\Reader object
+     */
+    public function getReader($open_mode = 'r+')
+    {
+        return $this->newReader($open_mode);
+    }
+
+    /**
      * Create a {@link Reader} instance from a {@link Writer} object
      *
      * @param string $open_mode the file open mode flag
      *
-     * @return \League\Csv\Writer object
+     * @return \League\Csv\Reader object
      */
     public function newReader($open_mode = 'r+')
     {