From a1564a9a996c70ece5b626acb8090b59c8554aaa Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Wed, 14 May 2014 09:19:42 +0100 Subject: [PATCH 1/6] Correct project URL, and update copyright --- parsecsv.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parsecsv.lib.php b/parsecsv.lib.php index 726136b..03d8d52 100644 --- a/parsecsv.lib.php +++ b/parsecsv.lib.php @@ -4,7 +4,7 @@ class parseCSV { /* Class: parseCSV v0.4.3 beta - https://github.com/jimeh/php-parsecsv + https://github.com/parsecsv/parsecsv-for-php Fully conforms to the specifications lined out on wikipedia: - http://en.wikipedia.org/wiki/Comma-separated_values @@ -12,7 +12,7 @@ class parseCSV { Based on the concept of Ming Hong Ng's CsvFileParser class: - - Copyright (c) 2007 Jim Myhrberg (jim@zydev.info). + Copyright (c) 2014 Jim Myhrberg. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 7a9fc101f81f70e8554d4d2d6027fad75ac2b8ec Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Wed, 14 May 2014 09:24:27 +0100 Subject: [PATCH 2/6] Update copyright year in readme and license file --- License.txt | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/License.txt b/License.txt index f2a6e0f..84efc1c 100644 --- a/License.txt +++ b/License.txt @@ -1,6 +1,6 @@ (The MIT license) -Copyright (c) 2013 Jim Myhrberg. +Copyright (c) 2014 Jim Myhrberg. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 8664257..531fcac 100644 --- a/README.md +++ b/README.md @@ -101,7 +101,7 @@ $csv->output(true, 'movies.csv', $array); (The MIT license) -Copyright (c) 2007 Jim Myhrberg. +Copyright (c) 2014 Jim Myhrberg. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 2aca09e05dc23b50d961eb47785bd6e9c2948251 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Wed, 14 May 2014 09:26:21 +0100 Subject: [PATCH 3/6] Add URL to PHP class which inspired parseCSV's creation --- parsecsv.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parsecsv.lib.php b/parsecsv.lib.php index 03d8d52..cf887a4 100644 --- a/parsecsv.lib.php +++ b/parsecsv.lib.php @@ -10,7 +10,7 @@ class parseCSV { - http://en.wikipedia.org/wiki/Comma-separated_values Based on the concept of Ming Hong Ng's CsvFileParser class: - - + - http://minghong.blogspot.com/2006/07/csv-parser-for-php.html Copyright (c) 2014 Jim Myhrberg. From 698a570a118a6991f8a51bba0a847246e1be261a Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Wed, 14 May 2014 10:12:45 +0100 Subject: [PATCH 4/6] Add license header --- parsecsv.lib.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/parsecsv.lib.php b/parsecsv.lib.php index cf887a4..62b5411 100644 --- a/parsecsv.lib.php +++ b/parsecsv.lib.php @@ -12,6 +12,9 @@ class parseCSV { Based on the concept of Ming Hong Ng's CsvFileParser class: - http://minghong.blogspot.com/2006/07/csv-parser-for-php.html + + (The MIT license) + Copyright (c) 2014 Jim Myhrberg. Permission is hereby granted, free of charge, to any person obtaining a copy @@ -32,6 +35,7 @@ class parseCSV { OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + Code Examples ---------------- # general usage From 629b0c9fd539f2b14eddb0d51d2a59df5db3b873 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Wed, 14 May 2014 10:18:02 +0100 Subject: [PATCH 5/6] Indent header comment start/end strings --- parsecsv.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parsecsv.lib.php b/parsecsv.lib.php index 62b5411..badc945 100644 --- a/parsecsv.lib.php +++ b/parsecsv.lib.php @@ -2,7 +2,7 @@ class parseCSV { -/* + /* Class: parseCSV v0.4.3 beta https://github.com/parsecsv/parsecsv-for-php @@ -72,7 +72,7 @@ class parseCSV { $csv = new parseCSV(); $csv->output (true, 'movies.csv', $array); ---------------- -*/ + */ /** * Configuration From f59af53183af618c8a0dde1457d1e69f9894c06c Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Wed, 14 May 2014 14:50:10 +0100 Subject: [PATCH 6/6] Add contributors section to readme --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 531fcac..17536ea 100644 --- a/README.md +++ b/README.md @@ -97,6 +97,14 @@ $csv->output(true, 'movies.csv', $array); [CsvFileParser]: http://minghong.blogspot.com/2006/07/csv-parser-for-php.html +## Contributors + +Please find a complete list on the project's [contributors][] page. + +[contributors]: https://github.com/parsecsv/parsecsv-for-php/graphs/contributors + + + ## License (The MIT license)