sda-php
/
nur-sery
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modifs.mineures sans commentaires

This commit is contained in:
Jephté Clain 2024-07-07 14:25:10 +04:00
parent 15a5e7805f
commit 104da4515b
3 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/db/CapacitorChannel.php
View File

@ -20,9 +20,23 @@ class CapacitorChannel {
const EACH_COMMIT_THRESHOLD = 100; const EACH_COMMIT_THRESHOLD = 100;
static function verifix_name(?string $name): string { static function verifix_name(?string &$name, ?string &$tableName=null): void {
if ($name === null) $name = "default"; if ($name !== null) {
return strtolower($name); $name = strtolower($name);
if ($tableName === null) $tableName = "${name}_channel";
} else {
$name = static::class;
if ($name === self::class) {
$name = "default";
if ($tableName === null) $tableName = "default_channel";
} else {
$name = preg_replace('/^.*\\\\/', "", $name);
$name = preg_replace('/Channel$/', "", $name);
$name = lcfirst($name);
if ($tableName === null) $tableName = str::camel2us($name);
$name = strtolower($name);
}
}
} }
protected static function verifix_eachCommitThreshold(?int $eachCommitThreshold): ?int { protected static function verifix_eachCommitThreshold(?int $eachCommitThreshold): ?int {
@ -32,8 +46,11 @@ class CapacitorChannel {
} }
function __construct(?string $name=null, ?int $eachCommitThreshold=null, ?bool $manageTransactions=null) { function __construct(?string $name=null, ?int $eachCommitThreshold=null, ?bool $manageTransactions=null) {
$this->name = self::verifix_name($name ?? static::NAME); $name ??= static::NAME;
$this->tableName = static::TABLE_NAME ?? ($this->name."_channel"); $tableName ??= static::TABLE_NAME;
self::verifix_name($name, $tableName);
$this->name = $name;
$this->tableName = $tableName;
$this->manageTransactions = $manageTransactions ?? static::MANAGE_TRANSACTIONS; $this->manageTransactions = $manageTransactions ?? static::MANAGE_TRANSACTIONS;
$this->eachCommitThreshold = self::verifix_eachCommitThreshold($eachCommitThreshold); $this->eachCommitThreshold = self::verifix_eachCommitThreshold($eachCommitThreshold);
$this->setup = false; $this->setup = false;

2
src/db/CapacitorStorage.php
View File

@ -22,7 +22,7 @@ abstract class CapacitorStorage {
} }
protected function getChannel(?string $name): CapacitorChannel { protected function getChannel(?string $name): CapacitorChannel {
$name = CapacitorChannel::verifix_name($name); CapacitorChannel::verifix_name($name);
$channel = $this->channels[$name] ?? null; $channel = $this->channels[$name] ?? null;
if ($channel === null) { if ($channel === null) {
$channel = $this->addChannel(new CapacitorChannel($name)); $channel = $this->addChannel(new CapacitorChannel($name));

12
src/file/Stream.php
View File

@ -162,7 +162,7 @@ class Stream extends AbstractIterator implements IReader, IWriter {
const DEFAULT_CSV_FLAVOUR = ref_csv::OO_FLAVOUR; const DEFAULT_CSV_FLAVOUR = ref_csv::OO_FLAVOUR;
/** @var array paramètres pour la lecture et l'écriture de flux au format CSV */ /** @var string paramètres pour la lecture et l'écriture de flux au format CSV */
protected $csvFlavour; protected $csvFlavour;
function setCsvFlavour(?string $flavour): void { function setCsvFlavour(?string $flavour): void {
@ -315,6 +315,11 @@ class Stream extends AbstractIterator implements IReader, IWriter {
return unserialize(...$args); return unserialize(...$args);
} }
function decodeJson(bool $close=true, bool $alreadyLocked=false) {
$contents = $this->getContents($close, $alreadyLocked);
return json_decode($contents, true, 512, JSON_THROW_ON_ERROR);
}
############################################################################# #############################################################################
# Iterator # Iterator
@ -456,6 +461,11 @@ class Stream extends AbstractIterator implements IReader, IWriter {
$this->putContents(serialize($object), $close, $alreadyLocked); $this->putContents(serialize($object), $close, $alreadyLocked);
} }
function encodeJson($data, bool $close=true, bool $alreadyLocked=false): void {
$contents = json_encode($data, JSON_UNESCAPED_SLASHES + JSON_UNESCAPED_UNICODE);
$this->putContents($contents, $close, $alreadyLocked);
}
/** /**
* annuler une tentative d'écriture commencée avec {@link self::canWrite()} * annuler une tentative d'écriture commencée avec {@link self::canWrite()}
*/ */