Merge branch 'introduce-namespaces' of https://github.com/itexia/parsecsv-for-php into new-enom-datatype

This commit is contained in:
Susann Sgorzaly
2018-02-18 12:43:45 +01:00
12 changed files with 32 additions and 24 deletions

View File

@@ -14,9 +14,9 @@
], ],
"autoload":{ "autoload":{
"psr-4":{ "psr-4":{
"CSV\\": "src", "ParseCsv\\": "src",
"CSV\\extensions\\": "src\\extensions", "ParseCsv\\extensions\\": "src\\extensions",
"CSV\\tests\\": "tests" "ParseCsv\\tests\\": "tests"
} }
}, },
"require-dev": { "require-dev": {

View File

@@ -3,11 +3,11 @@
# include parseCSV class. # include parseCSV class.
require_once('../parsecsv.lib.php'); use ParseCsv\Csv;
# create new parseCSV object. # create new parseCSV object.
$csv = new parseCSV(); $csv = new Csv();
# Parse '_books.csv' using automatic delimiter detection... # Parse '_books.csv' using automatic delimiter detection...

View File

@@ -3,11 +3,11 @@
# include parseCSV class. # include parseCSV class.
require_once('../parsecsv.lib.php'); use ParseCsv\Csv;
# create new parseCSV object. # create new parseCSV object.
$csv = new parseCSV(); $csv = new Csv();
# Example conditions: # Example conditions:

View File

@@ -2,11 +2,11 @@
# include parseCSV class. # include parseCSV class.
require_once('../parsecsv.lib.php'); use ParseCsv\Csv;
# create new parseCSV object. # create new parseCSV object.
$csv = new parseCSV(); $csv = new Csv();
# Parse '_books.csv' using automatic delimiter detection... # Parse '_books.csv' using automatic delimiter detection...
@@ -31,4 +31,4 @@ $csv->output('books.csv');
# or is set to null, output will only return the generated CSV # or is set to null, output will only return the generated CSV
# output data, and will not output to the browser itself. # output data, and will not output to the browser itself.
?> ?>

View File

@@ -3,11 +3,11 @@
# include parseCSV class. # include parseCSV class.
require_once('../parsecsv.lib.php'); use ParseCsv\Csv;
# create new parseCSV object. # create new parseCSV object.
$csv = new parseCSV(); $csv = new Csv();
# if sorting is enabled, the whole CSV file # if sorting is enabled, the whole CSV file

View File

@@ -1,7 +1,7 @@
<?php <?php
namespace CSV; namespace ParseCsv;
use CSV\extensions\DatatypeTrait; use ParseCsv\extensions\DatatypeTrait;
class Csv { class Csv {

View File

@@ -1,5 +1,5 @@
<?php <?php
namespace CSV\extensions; namespace ParseCsv\extensions;
trait DatatypeTrait { trait DatatypeTrait {

View File

@@ -1,7 +1,7 @@
<?php <?php
namespace CSV\tests\methods; namespace ParseCsv\tests\methods;
use CSV\Csv; use ParseCsv\Csv;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
class ConstructTest extends TestCase class ConstructTest extends TestCase

View File

@@ -1,7 +1,7 @@
<?php <?php
namespace CSV\tests\methods; namespace ParseCsv\tests\methods;
use CSV\Csv; use ParseCsv\Csv;
use PHPUnit_Framework_TestCase as TestCase; use PHPUnit_Framework_TestCase as TestCase;
class ParseTest extends TestCase class ParseTest extends TestCase

View File

@@ -1,7 +1,7 @@
<?php <?php
namespace CSV\tests\methods; namespace ParseCsv\tests\methods;
use CSV\Csv; use ParseCsv\Csv;
use PHPUnit_Framework_TestCase as TestCase; use PHPUnit_Framework_TestCase as TestCase;
class SaveTest extends TestCase class SaveTest extends TestCase

View File

@@ -1,6 +1,10 @@
<?php <?php
namespace ParseCsv\tests\properties;
class default_values_properties_Test extends PHPUnit\Framework\TestCase { use ParseCsv\Csv;
use PHPUnit_Framework_TestCase as TestCase;
class default_values_properties_Test extends TestCase {
/** /**
* CSV * CSV

View File

@@ -1,6 +1,10 @@
<?php <?php
namespace ParseCsv\tests\properties;
class worthless_properties_Test extends PHPUnit\Framework\TestCase { use ParseCsv\Csv;
use PHPUnit_Framework_TestCase as TestCase;
class DefaultValuesTest extends TestCase {
/** /**
* CSV * CSV
@@ -36,7 +40,7 @@ class worthless_properties_Test extends PHPUnit\Framework\TestCase {
*/ */
public function setUp() { public function setUp() {
//setup parse CSV //setup parse CSV
$this->csv = new parseCSV(); $this->csv = new Csv();
//setup the reflection class //setup the reflection class
$this->reflection = new ReflectionClass($this->csv); $this->reflection = new ReflectionClass($this->csv);