prepare for 6.3 release

thephpleague · Jan 20, 2015 · e11c59b · e11c59b
1 parent 7333dc1
commit e11c59b
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 17 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2014 ignace nyamagana butera
+Copyright (c) 2013-2015 ignace nyamagana butera
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

diff --git a/composer.json b/composer.json
@@ -36,7 +36,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "6.2-dev"
+            "dev-master": "6.3-dev"
         }
     }
 }
diff --git a/examples/bom.php b/examples/bom.php
@@ -12,6 +12,6 @@
 stream_filter_register(FilterTranscode::FILTER_NAME."*", "\lib\FilterTranscode");
 
 $csv = Reader::createFromPath(__DIR__.'/data/prenoms.csv');
-$csv->setBOMOnOutput(Reader::BOM_UTF16_LE);
+$csv->setOutputBOM(Reader::BOM_UTF16_LE);
 $csv->appendStreamFilter(FilterTranscode::FILTER_NAME."UTF-8:UTF-16LE");
 $csv->output('test.csv');
diff --git a/src/AbstractCsv.php b/src/AbstractCsv.php
@@ -4,7 +4,7 @@
 *
 * @license http://opensource.org/licenses/MIT
 * @link https://github.com/thephpleague/csv/
-* @version 6.2.0
+* @version 6.3.0
 * @package League.csv
 *
 * For the full copyright and license information, please view the LICENSE

diff --git a/src/Config/Controls.php b/src/Config/Controls.php
@@ -4,7 +4,7 @@
 *
 * @license http://opensource.org/licenses/MIT
 * @link https://github.com/thephpleague/csv/
-* @version 6.2.0
+* @version 6.3.0
 * @package League.csv
 *
 * For the full copyright and license information, please view the LICENSE

diff --git a/src/Config/Output.php b/src/Config/Output.php
@@ -4,7 +4,7 @@
 *
 * @license http://opensource.org/licenses/MIT
 * @link https://github.com/thephpleague/csv/
-* @version 6.2.0
+* @version 6.3.0
 * @package League.csv
 *
 * For the full copyright and license information, please view the LICENSE
@@ -125,12 +125,11 @@ public function output($filename = null)
         $iterator = $this->getIterator();
         //@codeCoverageIgnoreStart
         if (! is_null($filename) && self::isValidString($filename)) {
-            $fname = (string) $filename;
-            $fname = trim($fname);
-            $fname = filter_var($fname, FILTER_UNSAFE_RAW, ['flags' => FILTER_FLAG_STRIP_LOW]);
-            header('Content-Type: application/octet-stream');
-            header('Content-Transfer-Encoding: binary');
-            header("Content-Disposition: attachment; filename=\"$fname\"; filename*=UTF-8 ".rawurlencode($fname));
+            $filename = trim($filename);
+            $filename = filter_var($filename, FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_LOW);
+            header("Content-Type: application/octet-stream");
+            header("Content-Transfer-Encoding: binary");
+            header("Content-Disposition: attachment; filename=\"$filename\"; filename*=UTF-8 $filename");
         }
         //@codeCoverageIgnoreEnd
         echo $this->bom;

diff --git a/src/Config/StreamFilter.php b/src/Config/StreamFilter.php
@@ -4,7 +4,7 @@
 *
 * @license http://opensource.org/licenses/MIT
 * @link https://github.com/thephpleague/csv/
-* @version 6.2.0
+* @version 6.3.0
 * @package League.csv
 *
 * For the full copyright and license information, please view the LICENSE

diff --git a/src/Iterator/MapIterator.php b/src/Iterator/MapIterator.php
@@ -4,7 +4,7 @@
 *
 * @license http://opensource.org/licenses/MIT
 * @link https://github.com/thephpleague/csv/
-* @version 6.2.0
+* @version 6.3.0
 * @package League.csv
 *
 * For the full copyright and license information, please view the LICENSE

diff --git a/src/Iterator/Query.php b/src/Iterator/Query.php
@@ -4,7 +4,7 @@
 *
 * @license http://opensource.org/licenses/MIT
 * @link https://github.com/thephpleague/csv/
-* @version 6.2.0
+* @version 6.3.0
 * @package League.csv
 *
 * For the full copyright and license information, please view the LICENSE

diff --git a/src/Reader.php b/src/Reader.php
@@ -4,7 +4,7 @@
 *
 * @license http://opensource.org/licenses/MIT
 * @link https://github.com/thephpleague/csv/
-* @version 6.2.0
+* @version 6.3.0
 * @package League.csv
 *
 * For the full copyright and license information, please view the LICENSE

diff --git a/src/Writer.php b/src/Writer.php
@@ -4,7 +4,7 @@
 *
 * @license http://opensource.org/licenses/MIT
 * @link https://github.com/thephpleague/csv/
-* @version 6.2.0
+* @version 6.3.0
 * @package League.csv
 *
 * For the full copyright and license information, please view the LICENSE