andreabont/PrettyCSV
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FIX

Browse source
This commit is contained in:
Andrea Bontempi 2021-12-23 10:46:24 +01:00
parent af7b97707a
commit 4a44fc1ec2
3 changed files with 64 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
docker/Dockerfile Executable file
View file

@ -0,0 +1,18 @@
FROM php:8.1.1-cli
RUN apt-get update
# PHP config
RUN cp /usr/local/etc/php/php.ini-development /usr/local/etc/php/php.ini
RUN sed -i 's/memory_limit = 128M/memory_limit = 2G/' /usr/local/etc/php/php.ini
# Composer install
ENV COMPOSER_HOME /var/www/.composer/
RUN curl -sS https://getcomposer.org/installer | php \
&& mv composer.phar /usr/local/bin/composer
RUN chmod +x /usr/local/bin/composer
RUN mkdir -p /home/prettycsv
WORKDIR /home/prettycsv
ENTRYPOINT ["tail", "-f", "/dev/null"]

8
docker/docker-compose.yml Executable file
View file

@ -0,0 +1,8 @@
version: "3"
services:
prettycsv:
image: prettycsv:0.0.3
build: .
volumes:
- ./../:/home/prettycsv

62
src/PrettyCSV/Csv.php
View file

@ -53,7 +53,7 @@ class Csv implements Iterator {
/**
* @var HeaderColumnInterface[]
*/
protected array $headers = [];
protected array $headerList = [];
/**
* @var bool
@ -62,7 +62,7 @@ class Csv implements Iterator {
/**
* @param string $file
* @param array|null $headers
* @param array|bool $header
* @param string $separator
* @param string $enclosure
* @param string $escape
@ -70,12 +70,12 @@ class Csv implements Iterator {
* @throws ParserException
*/
public function __construct(
string $file,
array $headers = null,
string $separator = ',',
string $enclosure = '"',
string $escape = '\\',
int $length = 1000
string $file,
array|bool $header = false,
string $separator = ',',
string $enclosure = '"',
string $escape = '\\',
int $length = 1000
) {
$this->fp = fopen($file, 'r');
@ -83,29 +83,36 @@ class Csv implements Iterator {
$this->enclosure = $enclosure;
$this->escape = $escape;
$this->length = $length;
$this->hasHeader = is_array($header) || $header;
if(!is_null($headers)) {
if($this->hasHeader) {
$this->next();
$this->hasHeader = true;
$expectedColumns = [];
/** @var HeaderColumnInterface $header */
foreach ($headers as $header) {
$this->headers[$header->getName()] = $header;
if($header->getIsRequired()) $expectedColumns[] = $header->getName();
if(!$this->valid()) {
throw new ParserException("Header non found", $this->currentRow);
}
$line = str_getcsv($this->currentLine, $this->separator, $this->enclosure, $this->escape);
$csvColumnIndex = 0;
$expectedColumns = [];
foreach ($line as $csvColumnName) {
if(!array_key_exists($csvColumnName, $this->headers)) {
$this->headers[$csvColumnName] = (new HeaderColumn())->setName($csvColumnName);
if(is_array($header)) {
/** @var HeaderColumnInterface $headerColumn */
foreach ($header as $headerColumn) {
if(!($headerColumn instanceof HeaderColumnInterface)) continue;
$this->headerList[$headerColumn->getName()] = $headerColumn;
if($headerColumn->getIsRequired()) $expectedColumns[] = $headerColumn->getName();
}
}
$csvColumnIndex = 0;
foreach (str_getcsv($this->currentLine, $this->separator, $this->enclosure, $this->escape) as $csvColumnName) {
if(!array_key_exists($csvColumnName, $this->headerList)) {
$this->headerList[$csvColumnName] = (new HeaderColumn())->setName($csvColumnName);
}
$this->headerList[$csvColumnName]->setIndex($csvColumnIndex);
if(array_key_exists($csvColumnName, $expectedColumns)) {
unset($expectedColumns[$csvColumnName]);
}
$this->headers[$csvColumnName]->setIndex($csvColumnIndex);
unset($expectedColumns[$csvColumnName]);
$csvColumnIndex++;
}
@ -119,13 +126,20 @@ class Csv implements Iterator {
}
/**
* Destructor
*/
function __destruct() {
fclose($this->fp);
}
/**
* @return array|CsvLine
*/
public function current() {
$line = str_getcsv($this->currentLine, $this->separator, $this->enclosure, $this->escape);
if(!$this->hasHeader) return $line;
return new CsvLine($line, $this->currentRow, $this->headers);
return new CsvLine($line, $this->currentRow, $this->headerList);
}
/**