Renamed class to follow the PHP community guidelines such as:

- https://svn.apache.org/repos/asf/shindig/attic/php/docs/style-guide.html:
  "Acryonyms are treated as normal words."

- https://softwareengineering.stackexchange.com/a/149321/80632
  Overview of class naming conventions of PHP frameworks

- https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-4-autoloader.md
  No .lib allowed: "The class name corresponds to a file name ending in .php"

See issue #50
This commit is contained in:
Christian Bläul
2018-02-02 13:04:39 +01:00
parent 7a9d55dd1e
commit 387a0f5761
13 changed files with 47 additions and 57 deletions

View File

@@ -3,7 +3,7 @@
$dir = realpath(__DIR__);
defined('BASE') OR define('BASE', dirname($dir) . '/');
require_once BASE . 'parsecsv.lib.php';
require_once BASE . 'ParseCsvForPhp.php';
if (!class_exists('PHPUnit\Framework\TestCase')) {
// we run on an older PHPUnit version without namespaces.

View File

@@ -11,17 +11,6 @@ class ConstructTest extends PHPUnit\Framework\TestCase {
*/
protected $csv = null;
/**
* Setup
* Setup our test environment objects
*
* @access public
*/
public function setUp() {
//setup parse CSV
#$this->csv = new parseCSV();
}
/**
* Tear down
* Tear down our test environment objects
@@ -34,35 +23,35 @@ class ConstructTest extends PHPUnit\Framework\TestCase {
public function test_offset_param() {
$offset = 10;
$this->csv = new parseCSV(null, $offset);
$this->csv = new ParseCsvForPhp(null, $offset);
$this->assertTrue(is_numeric($this->csv->offset));
$this->assertEquals($offset, $this->csv->offset);
}
public function test_limit_param() {
$limit = 10;
$this->csv = new parseCSV(null, null, $limit);
$this->csv = new ParseCsvForPhp(null, null, $limit);
$this->assertTrue(is_numeric($this->csv->limit));
$this->assertEquals($limit, $this->csv->limit);
}
public function test_conditions_param() {
$conditions = 'some column NOT value';
$this->csv = new parseCSV(null, null, null, $conditions);
$this->csv = new ParseCsvForPhp(null, null, null, $conditions);
$this->assertTrue(is_string($this->csv->conditions));
$this->assertEquals($conditions, $this->csv->conditions);
}
public function test_keep_file_data_param() {
$keep = true;
$this->csv = new parseCSV(null, null, null, null, $keep);
$this->csv = new ParseCsvForPhp(null, null, null, null, $keep);
$this->assertTrue(is_bool($this->csv->keep_file_data));
$this->assertEquals($keep, $this->csv->keep_file_data);
}
public function test_input_param() {
$csv = "col1,col2,col3\r\nval1,val2,val3\r\nval1A,val2A,val3A\r\n";
$this->csv = new parseCSV($csv, null, null, null, true);
$this->csv = new ParseCsvForPhp($csv, null, null, null, true);
$this->assertTrue(is_string($this->csv->file_data));
$this->assertEquals($csv, $this->csv->file_data);
}

View File

@@ -7,7 +7,7 @@ class ParseTest extends PHPUnit\Framework\TestCase {
* The parseCSV object
*
* @access protected
* @var parseCSV
* @var ParseCsvForPhp
*/
protected $csv;
@@ -18,7 +18,7 @@ class ParseTest extends PHPUnit\Framework\TestCase {
* @access public
*/
public function setUp() {
$this->csv = new parseCSV();
$this->csv = new ParseCsvForPhp();
}
public function test_parse() {
@@ -164,7 +164,7 @@ class ParseTest extends PHPUnit\Framework\TestCase {
* @param string $enclosure
*/
public function testAutoQuotes($file, $enclosure) {
$csv = new parseCSV();
$csv = new ParseCsvForPhp();
$csv->auto(__DIR__ . '/../example_files/' . $file, true, null, null, $enclosure);
$this->assertArrayHasKey('column1', $csv->data[0], 'Data parsed incorrectly with enclosure ' . $enclosure);
$this->assertEquals('value1', $csv->data[0]['column1'], 'Data parsed incorrectly with enclosure ' . $enclosure);

View File

@@ -2,7 +2,7 @@
class SaveTest extends PHPUnit\Framework\TestCase {
/** @var parseCSV */
/** @var ParseCsvForPhp */
private $csv;
private $temp_filename;
@@ -11,7 +11,7 @@ class SaveTest extends PHPUnit\Framework\TestCase {
* Setup our test environment objects; will be called before each test.
*/
public function setUp() {
$this->csv = new parseCSV();
$this->csv = new ParseCsvForPhp();
$this->csv->auto(__DIR__ . '/../example_files/single_column.csv');
// Remove last 2 lines to simplify comparison

View File

@@ -7,7 +7,7 @@ class BaseClass extends PHPUnit\Framework\TestCase {
* The parseCSV object
*
* @access protected
* @var parseCSV
* @var ParseCsvForPhp
*/
protected $csv;
@@ -18,7 +18,7 @@ class BaseClass extends PHPUnit\Framework\TestCase {
* @access public
*/
public function setUp() {
$this->csv = new parseCSV();
$this->csv = new ParseCsvForPhp();
}
protected function _compareWithExpected($expected) {

View File

@@ -7,7 +7,7 @@ class default_values_properties_Test extends PHPUnit\Framework\TestCase {
* The parseCSV object
*
* @access protected
* @var [parseCSV]
* @var ParseCsvForPhp
*/
protected $csv = null;
@@ -19,7 +19,7 @@ class default_values_properties_Test extends PHPUnit\Framework\TestCase {
*/
public function setUp() {
//setup parse CSV
$this->csv = new parseCSV();
$this->csv = new ParseCsvForPhp();
}
/**

View File

@@ -7,7 +7,7 @@ class worthless_properties_Test extends PHPUnit\Framework\TestCase {
* The parseCSV object
*
* @access protected
* @var [parseCSV]
* @var ParseCsvForPhp
*/
protected $csv = null;
@@ -16,7 +16,7 @@ class worthless_properties_Test extends PHPUnit\Framework\TestCase {
* The reflection class object
*
* @access protected
* @var [ReflectionClass]
* @var ReflectionClass
*/
protected $reflection = null;
@@ -25,6 +25,7 @@ class worthless_properties_Test extends PHPUnit\Framework\TestCase {
* The reflected class properties
*
* @access protected
* @var ReflectionProperty[]
*/
protected $properties = null;
@@ -36,7 +37,7 @@ class worthless_properties_Test extends PHPUnit\Framework\TestCase {
*/
public function setUp() {
//setup parse CSV
$this->csv = new parseCSV();
$this->csv = new ParseCsvForPhp();
//setup the reflection class
$this->reflection = new ReflectionClass($this->csv);
@@ -107,7 +108,7 @@ class worthless_properties_Test extends PHPUnit\Framework\TestCase {
'error',
'error_info',
'titles',
'data'
'data',
);
// Find our real properties
@@ -129,7 +130,7 @@ class worthless_properties_Test extends PHPUnit\Framework\TestCase {
public function test_count_public_properties() {
$counter = 0;
for ($a = 0; $a < count($this->properties); $a++) {
for ($a = count($this->properties) - 1; $a >= 0; $a--) {
if ($this->properties[$a]->isPublic() === true) {
$counter++;
}