Compare commits
No commits in common. "8c0dfded4fb7bf192e92a8dba34a8dcadba36052" and "9d4ca3955dc5ace20c1cb773a004a3e76fbee131" have entirely different histories.
8c0dfded4f
...
9d4ca3955d
13
.pman.conf
13
.pman.conf
@ -9,15 +9,4 @@ TAG_PREFIX=
|
|||||||
TAG_SUFFIX=p82
|
TAG_SUFFIX=p82
|
||||||
HOTFIX=hotf82-
|
HOTFIX=hotf82-
|
||||||
DIST=
|
DIST=
|
||||||
NOAUTO=
|
NOAUTO=1
|
||||||
|
|
||||||
AFTER_CREATE_RELEASE='
|
|
||||||
pman --composer-select-profile dist
|
|
||||||
composer u
|
|
||||||
git commit -am "<pman>deps de dist"
|
|
||||||
'
|
|
||||||
AFTER_MERGE_RELEASE='
|
|
||||||
pman --composer-select-profile dev
|
|
||||||
composer u
|
|
||||||
git commit -am "<pman>deps de dev"
|
|
||||||
'
|
|
||||||
|
|||||||
12
.pman.yml
12
.pman.yml
@ -1,12 +0,0 @@
|
|||||||
# -*- coding: utf-8 mode: yaml -*- vim:sw=2:sts=2:et:ai:si:sta:fenc=utf-8
|
|
||||||
|
|
||||||
composer:
|
|
||||||
profiles: [ dev, dist ]
|
|
||||||
dev:
|
|
||||||
link: true
|
|
||||||
require:
|
|
||||||
nulib/php: ^8.2-dev
|
|
||||||
dist:
|
|
||||||
link: false
|
|
||||||
require:
|
|
||||||
nulib/php: ^0.3.0p82
|
|
||||||
@ -1,8 +1,3 @@
|
|||||||
## Release 0.3.1p82 du 04/03/2025-12:17
|
|
||||||
|
|
||||||
* `519f341` application patch page_order
|
|
||||||
* `85e9740` réorganiser les patches
|
|
||||||
|
|
||||||
## Release 0.3.0p82 du 01/03/2025-09:28
|
## Release 0.3.0p82 du 01/03/2025-09:28
|
||||||
|
|
||||||
## Release 0.3.0p74 du 01/03/2025-09:23
|
## Release 0.3.0p74 du 01/03/2025-09:23
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
0.3.1
|
0.3.0
|
||||||
|
|||||||
2590
composer.lock
generated
2590
composer.lock
generated
File diff suppressed because it is too large
Load Diff
@ -517,10 +517,6 @@ final class FileSystemHelper implements FileSystemWithRootFolderHelperInterface
|
|||||||
$xml .= " paperSize=\"{$pageSetup->paperSize->value}\"";
|
$xml .= " paperSize=\"{$pageSetup->paperSize->value}\"";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (null !== $pageSetup->pageOrder) {
|
|
||||||
$xml .= " pageOrder=\"{$pageSetup->pageOrder->value}\"";
|
|
||||||
}
|
|
||||||
|
|
||||||
if (null !== $pageSetup->fitToHeight) {
|
if (null !== $pageSetup->fitToHeight) {
|
||||||
$xml .= " fitToHeight=\"{$pageSetup->fitToHeight}\"";
|
$xml .= " fitToHeight=\"{$pageSetup->fitToHeight}\"";
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,11 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
declare(strict_types=1);
|
|
||||||
|
|
||||||
namespace OpenSpout\Writer\XLSX\Options;
|
|
||||||
|
|
||||||
enum PageOrder: string
|
|
||||||
{
|
|
||||||
case DOWN_THEN_OVER = 'downThenOver';
|
|
||||||
case OVER_THEN_DOWN = 'overThenDown';
|
|
||||||
}
|
|
||||||
@ -13,7 +13,6 @@ final readonly class PageSetup
|
|||||||
public ?PaperSize $paperSize,
|
public ?PaperSize $paperSize,
|
||||||
public ?int $fitToHeight = null,
|
public ?int $fitToHeight = null,
|
||||||
public ?int $fitToWidth = null,
|
public ?int $fitToWidth = null,
|
||||||
public ?PageOrder $pageOrder = null,
|
|
||||||
) {
|
) {
|
||||||
$this->fitToPage = null !== $fitToHeight || null !== $fitToWidth;
|
$this->fitToPage = null !== $fitToHeight || null !== $fitToWidth;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,33 +0,0 @@
|
|||||||
diff --git a/src/Reader/XLSX/Helper/CellValueFormatter.php b/src/Reader/XLSX/Helper/CellValueFormatter.php
|
|
||||||
index 776de0a..bc7a5c4 100644
|
|
||||||
--- a/src/Reader/XLSX/Helper/CellValueFormatter.php
|
|
||||||
+++ b/src/Reader/XLSX/Helper/CellValueFormatter.php
|
|
||||||
@@ -284,9 +284,13 @@ final class CellValueFormatter
|
|
||||||
\assert(false !== $dateObj);
|
|
||||||
|
|
||||||
if ($this->shouldFormatDates) {
|
|
||||||
- $styleNumberFormatCode = $this->styleManager->getNumberFormatCode($cellStyleId);
|
|
||||||
- $phpDateFormat = DateFormatHelper::toPHPDateFormat($styleNumberFormatCode);
|
|
||||||
+ //$styleNumberFormatCode = $this->styleManager->getNumberFormatCode($cellStyleId);
|
|
||||||
+ //$phpDateFormat = DateFormatHelper::toPHPDateFormat($styleNumberFormatCode);
|
|
||||||
+ // Toujours utiliser le format français complet
|
|
||||||
+ $phpDateFormat = "d/m/Y H:i:s";
|
|
||||||
$cellValue = $dateObj->format($phpDateFormat);
|
|
||||||
+ // Enlever la composante heure si elle n'existe pas
|
|
||||||
+ $cellValue = preg_replace('/ 00:00:00$/', "", $cellValue);
|
|
||||||
} else {
|
|
||||||
$cellValue = $dateObj;
|
|
||||||
}
|
|
||||||
diff --git a/src/Reader/XLSX/Options.php b/src/Reader/XLSX/Options.php
|
|
||||||
index 636d2a4..e8609b5 100644
|
|
||||||
--- a/src/Reader/XLSX/Options.php
|
|
||||||
+++ b/src/Reader/XLSX/Options.php
|
|
||||||
@@ -10,7 +10,7 @@ final class Options
|
|
||||||
{
|
|
||||||
use TempFolderOptionTrait;
|
|
||||||
|
|
||||||
- public bool $SHOULD_FORMAT_DATES = false;
|
|
||||||
+ public bool $SHOULD_FORMAT_DATES = true;
|
|
||||||
public bool $SHOULD_PRESERVE_EMPTY_ROWS = false;
|
|
||||||
public bool $SHOULD_USE_1904_DATES = false;
|
|
||||||
public bool $SHOULD_LOAD_MERGE_CELLS = false;
|
|
||||||
@ -1,40 +0,0 @@
|
|||||||
diff -urN a/src/Writer/XLSX/Helper/FileSystemHelper.php b/src/Writer/XLSX/Helper/FileSystemHelper.php
|
|
||||||
--- a/src/Writer/XLSX/Helper/FileSystemHelper.php 2025-03-04 12:07:12.938528783 +0400
|
|
||||||
+++ b/src/Writer/XLSX/Helper/FileSystemHelper.php 2024-11-30 15:32:06.000000000 +0400
|
|
||||||
@@ -517,6 +517,10 @@
|
|
||||||
$xml .= " paperSize=\"{$pageSetup->paperSize->value}\"";
|
|
||||||
}
|
|
||||||
|
|
||||||
+ if (null !== $pageSetup->pageOrder) {
|
|
||||||
+ $xml .= " pageOrder=\"{$pageSetup->pageOrder->value}\"";
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
if (null !== $pageSetup->fitToHeight) {
|
|
||||||
$xml .= " fitToHeight=\"{$pageSetup->fitToHeight}\"";
|
|
||||||
}
|
|
||||||
diff -urN a/src/Writer/XLSX/Options/PageOrder.php b/src/Writer/XLSX/Options/PageOrder.php
|
|
||||||
--- a/src/Writer/XLSX/Options/PageOrder.php 1970-01-01 04:00:00.000000000 +0400
|
|
||||||
+++ b/src/Writer/XLSX/Options/PageOrder.php 2024-11-30 15:32:06.000000000 +0400
|
|
||||||
@@ -0,0 +1,11 @@
|
|
||||||
+<?php
|
|
||||||
+
|
|
||||||
+declare(strict_types=1);
|
|
||||||
+
|
|
||||||
+namespace OpenSpout\Writer\XLSX\Options;
|
|
||||||
+
|
|
||||||
+enum PageOrder: string
|
|
||||||
+{
|
|
||||||
+ case DOWN_THEN_OVER = 'downThenOver';
|
|
||||||
+ case OVER_THEN_DOWN = 'overThenDown';
|
|
||||||
+}
|
|
||||||
diff -urN a/src/Writer/XLSX/Options/PageSetup.php b/src/Writer/XLSX/Options/PageSetup.php
|
|
||||||
--- a/src/Writer/XLSX/Options/PageSetup.php 2025-03-04 12:07:12.938528783 +0400
|
|
||||||
+++ b/src/Writer/XLSX/Options/PageSetup.php 2024-11-30 15:32:06.000000000 +0400
|
|
||||||
@@ -13,6 +13,7 @@
|
|
||||||
public ?PaperSize $paperSize,
|
|
||||||
public ?int $fitToHeight = null,
|
|
||||||
public ?int $fitToWidth = null,
|
|
||||||
+ public ?PageOrder $pageOrder = null,
|
|
||||||
) {
|
|
||||||
$this->fitToPage = null !== $fitToHeight || null !== $fitToWidth;
|
|
||||||
}
|
|
||||||
@ -1,3 +1,36 @@
|
|||||||
|
diff --git a/src/Reader/XLSX/Helper/CellValueFormatter.php b/src/Reader/XLSX/Helper/CellValueFormatter.php
|
||||||
|
index 776de0a..bc7a5c4 100644
|
||||||
|
--- a/src/Reader/XLSX/Helper/CellValueFormatter.php
|
||||||
|
+++ b/src/Reader/XLSX/Helper/CellValueFormatter.php
|
||||||
|
@@ -284,9 +284,13 @@ final class CellValueFormatter
|
||||||
|
\assert(false !== $dateObj);
|
||||||
|
|
||||||
|
if ($this->shouldFormatDates) {
|
||||||
|
- $styleNumberFormatCode = $this->styleManager->getNumberFormatCode($cellStyleId);
|
||||||
|
- $phpDateFormat = DateFormatHelper::toPHPDateFormat($styleNumberFormatCode);
|
||||||
|
+ //$styleNumberFormatCode = $this->styleManager->getNumberFormatCode($cellStyleId);
|
||||||
|
+ //$phpDateFormat = DateFormatHelper::toPHPDateFormat($styleNumberFormatCode);
|
||||||
|
+ // Toujours utiliser le format français complet
|
||||||
|
+ $phpDateFormat = "d/m/Y H:i:s";
|
||||||
|
$cellValue = $dateObj->format($phpDateFormat);
|
||||||
|
+ // Enlever la composante heure si elle n'existe pas
|
||||||
|
+ $cellValue = preg_replace('/ 00:00:00$/', "", $cellValue);
|
||||||
|
} else {
|
||||||
|
$cellValue = $dateObj;
|
||||||
|
}
|
||||||
|
diff --git a/src/Reader/XLSX/Options.php b/src/Reader/XLSX/Options.php
|
||||||
|
index 636d2a4..e8609b5 100644
|
||||||
|
--- a/src/Reader/XLSX/Options.php
|
||||||
|
+++ b/src/Reader/XLSX/Options.php
|
||||||
|
@@ -10,7 +10,7 @@ final class Options
|
||||||
|
{
|
||||||
|
use TempFolderOptionTrait;
|
||||||
|
|
||||||
|
- public bool $SHOULD_FORMAT_DATES = false;
|
||||||
|
+ public bool $SHOULD_FORMAT_DATES = true;
|
||||||
|
public bool $SHOULD_PRESERVE_EMPTY_ROWS = false;
|
||||||
|
public bool $SHOULD_USE_1904_DATES = false;
|
||||||
|
public bool $SHOULD_LOAD_MERGE_CELLS = false;
|
||||||
diff --git a/src/Writer/AbstractWriter.php b/src/Writer/AbstractWriter.php
|
diff --git a/src/Writer/AbstractWriter.php b/src/Writer/AbstractWriter.php
|
||||||
index eef34fb..a22e90f 100644
|
index eef34fb..a22e90f 100644
|
||||||
--- a/src/Writer/AbstractWriter.php
|
--- a/src/Writer/AbstractWriter.php
|
||||||
Loading…
x
Reference in New Issue
Block a user