Skip to content

devel: consolidate multiple calls #2500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
interduo wants to merge 2 commits into
base: master
Choose a base branch
from
Open

devel: consolidate multiple calls #2500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a8eca9
devel: consolidate php variadic function calls when it is possible
interduo Feb 24, 2026
8462018
devel: consolidate multiple smarty->assign into arrays
interduo Feb 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bin/lms-payments.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1633,7 +1633,7 @@ function GetBillingTemplates($document_dirs)
$desc = str_replace('%aligned_partial_period', $first_aligned_partial_period[$p], $desc);
unset($first_aligned_partial_period);
} else {
if (isset($dateto) && isset($dateto_nextday) && intval($dateto_nextday[2]) != 1 && intval($dateto[1]) == intval($month) && intval($dateto[0]) == intval($year)) {
if (isset($dateto, $dateto_nextday) && intval($dateto_nextday[2]) != 1 && intval($dateto[1]) == intval($month) && intval($dateto[0]) == intval($year)) {
$last_aligned_partial_period = array(
DAILY => $forward_periods[DAILY],
WEEKLY => $forward_periods[WEEKLY],
Expand Down Expand Up @@ -1663,7 +1663,7 @@ function GetBillingTemplates($document_dirs)
$desc = str_replace('%aligned_partial_period', $first_aligned_partial_period[$p], $desc);
unset($first_aligned_partial_period);
} else {
if (isset($dateto) && isset($dateto_nextday) && intval($dateto_nextday[2]) != 1 && intval($dateto[1]) == intval($backward_month) && intval($dateto[0]) == intval($backward_year)) {
if (isset($dateto, $dateto_nextday) && intval($dateto_nextday[2]) != 1 && intval($dateto[1]) == intval($backward_month) && intval($dateto[0]) == intval($backward_year)) {
$last_aligned_partial_period = array(
DAILY => $forward_periods[DAILY],
WEEKLY => $forward_periods[WEEKLY],
Expand Down
2 changes: 1 addition & 1 deletion bin/lms-pna.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ function convert_pna_to_teryt($data)
}
$state = $all_states[$state_name];
if (preg_match('/^[0-9]{2}-[0-9]{3}$/', $data[PNA])
&& (!isset($state_list) || (isset($state_list) && isset($state_list[$state])))) {
&& (!isset($state_list) || (isset($state_list, $state_list[$state])))) {
convert_pna_to_teryt($data);
}
}
Expand Down
2 changes: 1 addition & 1 deletion bin/lms-teryt.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1644,7 +1644,7 @@ function stream_notification_callback($notification_code, $severity, $message, $
if ($building) {
$fields_to_update = array();

if (isset($record['gml_id']) && $record['gml_id'] != $building['extid'] || !isset($record['gml_id']) && isset($record['extid']) && strlen($record['extid'])) {
if (isset($record['gml_id']) && $record['gml_id'] != $building['extid'] || !isset($record['gml_id'], $record['extid']) && strlen($record['extid'])) {
$fields_to_update[] = 'extid = ' . (isset($record['gml_id']) ? $DB->Escape($record['gml_id']) : 'null');
}

Expand Down
389 changes: 389 additions & 0 deletions devel/refactor_php_variadic_functions.php
View file
Open in desktop

Large diffs are not rendered by default.

304 changes: 304 additions & 0 deletions devel/refactor_smarty_assign_using_array.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,304 @@
<?php

if ($argc < 2) {
die("Usage: php refactor_smarty_assign_using_array.php <file|directory>\n");
}

$target = $argv[1];

function getTokens($source)
{
return token_get_all($source);
}

function processFile($filePath)
{
echo "Processing: $filePath\n";
$source = file_get_contents($filePath);
$tokens = token_get_all($source);

$newSource = '';
$count = count($tokens);
$i = 0;

$modified = false;

while ($i < $count) {
// Look for $SMARTY->assign(
// Expected sequence: T_VARIABLE ($SMARTY) -> T_OBJECT_OPERATOR (->) -> T_STRING (assign) -> (

$matchFound = false;

// Check if we are at start of a potential assign block
if (is_array($tokens[$i]) && $tokens[$i][0] == T_VARIABLE && $tokens[$i][1] == '$SMARTY') {
// Check ahead for -> assign (
$j = $i + 1;
while ($j < $count && is_array($tokens[$j]) && $tokens[$j][0] == T_WHITESPACE) {
$j++; // skip whitespace
}

if ($j < $count && is_array($tokens[$j]) && $tokens[$j][0] == T_OBJECT_OPERATOR) {
$j++;
while ($j < $count && is_array($tokens[$j]) && $tokens[$j][0] == T_WHITESPACE) {
$j++; // skip whitespace
}

if ($j < $count && is_array($tokens[$j]) && $tokens[$j][0] == T_STRING && $tokens[$j][1] == 'assign') {
$j++;
while ($j < $count && is_array($tokens[$j]) && $tokens[$j][0] == T_WHITESPACE) {
$j++; // skip whitespace
}

if ($j < $count && $tokens[$j] == '(') {
// Found valid $SMARTY->assign( start

// Now we need to collect this assignment and any immediately following ones
$assignments = [];
$currentStart = $i;

// Parsing loop to collect consecutive assignments
while (true) {
// Check if this is a $SMARTY->assign call
// Rewind slightly logic wise: we are essentially attempting to parse one full statement here
// We need to verify it is exactly $SMARTY->assign('key', $val);

// Re-verify the sequence for the current potential assignment (since we loop)
$tempJ = $currentStart;

// Skip whitespace
while ($tempJ < $count && is_array($tokens[$tempJ]) && $tokens[$tempJ][0] == T_WHITESPACE) {
$tempJ++;
}

// Must be $SMARTY
if (!($tempJ < $count && is_array($tokens[$tempJ]) && $tokens[$tempJ][0] == T_VARIABLE && $tokens[$tempJ][1] == '$SMARTY')) {
break;
}
$tempJ++;

while ($tempJ < $count && is_array($tokens[$tempJ]) && $tokens[$tempJ][0] == T_WHITESPACE) {
$tempJ++;
}
if (!($tempJ < $count && is_array($tokens[$tempJ]) && $tokens[$tempJ][0] == T_OBJECT_OPERATOR)) {
break;
}
$tempJ++;

while ($tempJ < $count && is_array($tokens[$tempJ]) && $tokens[$tempJ][0] == T_WHITESPACE) {
$tempJ++;
}
if (!($tempJ < $count && is_array($tokens[$tempJ]) && $tokens[$tempJ][0] == T_STRING && $tokens[$tempJ][1] == 'assign')) {
break;
}
$tempJ++;

while ($tempJ < $count && is_array($tokens[$tempJ]) && $tokens[$tempJ][0] == T_WHITESPACE) {
$tempJ++;
}
if (!($tempJ < $count && $tokens[$tempJ] == '(')) {
break;
}
$openParenPos = $tempJ;
$tempJ++;

// Now extraction of arguments: key and value
// We only support simple string keys: 'key' or "key"
// Value can be complex expression, UP TO the comma

while ($tempJ < $count && is_array($tokens[$tempJ]) && $tokens[$tempJ][0] == T_WHITESPACE) {
$tempJ++;
}

$keyTokens = [];
if ($tempJ < $count && is_array($tokens[$tempJ]) && $tokens[$tempJ][0] == T_CONSTANT_ENCAPSED_STRING) {
$keyTokens[] = $tokens[$tempJ];
$tempJ++;
} else {
// First arg is not a simple string, abort this block logic
break;
}

while ($tempJ < $count && is_array($tokens[$tempJ]) && $tokens[$tempJ][0] == T_WHITESPACE) {
$tempJ++;
}

if (!($tempJ < $count && $tokens[$tempJ] == ',')) {
// Only one argument? or "assign by ref"? ignored
break;
}
$tempJ++; // consume comma

// Now capturing value until );
// Careful with nested parens

$valueTokens = [];
$parenDepth = 1; // We are inside assign( ...

while ($tempJ < $count) {
$t = $tokens[$tempJ];
if ($t == '(') {
$parenDepth++;
} elseif ($t == ')') {
$parenDepth--;
}

if ($parenDepth == 0) {
// Found closing paren of assign(...)
break;
}

$valueTokens[] = $t;
$tempJ++;
}

if ($parenDepth != 0) {
break; // formatting error or weirdness
}

$closeParenPos = $tempJ;
$tempJ++; // consume )

while ($tempJ < $count && is_array($tokens[$tempJ]) && $tokens[$tempJ][0] == T_WHITESPACE) {
$tempJ++;
}

if (!($tempJ < $count && $tokens[$tempJ] == ';')) {
// Not a simple statement ending with ;
break;
}
$semiColonPos = $tempJ;
$tempJ++; // consume ;

// Success finding one assignment
$assignments[] = [
'key' => $keyTokens,
'value' => $valueTokens,
'end_pos' => $tempJ // exclusive
];

// Prepare to look for next
$currentStart = $tempJ;
}

if (count($assignments) > 1) {
// We found consecutive assignments!
// Write replacement
$matchFound = true;

// Check indentation of the first variable to try to preserve it
// We can look at whitespace immediately preceding $i if any
$baseIndent = "";
if ($i > 0 && is_array($tokens[$i - 1]) && $tokens[$i - 1][0] == T_WHITESPACE) {
$ws = $tokens[$i - 1][1];
$pos = strrpos($ws, "\n");
if ($pos !== false) {
$baseIndent = substr($ws, $pos + 1);
} else {
$baseIndent = $ws;
}
}

$indentUnit = (strpos($baseIndent, "\t") !== false) ? "\t" : " ";
$twoIndents = $indentUnit . $indentUnit;

$newSource .= "\$SMARTY->assign(\n";
$newSource .= $baseIndent . $indentUnit . "array(\n";

foreach ($assignments as $idx => $assign) {
$newSource .= $baseIndent . $twoIndents; // indent
// Key
foreach ($assign['key'] as $kt) {
$newSource .= is_array($kt) ? $kt[1] : $kt;
}
$newSource .= " => ";
// Value - process token by token
$isFirstValueToken = true;
$valueOutput = '';
foreach ($assign['value'] as $vt) {
$isWhitespace = is_array($vt) && $vt[0] == T_WHITESPACE;
$tokenValue = is_array($vt) ? $vt[1] : $vt;

if ($isFirstValueToken) {
// Strip only leading horizontal whitespace (spaces/tabs), not newlines
$tokenValue = ltrim($tokenValue, " \t");
if ($tokenValue === '') {
continue;
}
$isFirstValueToken = false;
}

// Only modify whitespace tokens, never string content
if ($isWhitespace && strpos($tokenValue, "\n") !== false) {
// Replace each newline + old indent with newline + shifted indent
$wsLines = explode("\n", $tokenValue);
for ($wl = 1; $wl < count($wsLines); $wl++) {
$wsLine = $wsLines[$wl];
if ($indentUnit === "\t") {
$wsLine = str_replace(" ", "\t", $wsLine);
}
$wsLines[$wl] = $twoIndents . $wsLine;
}
$tokenValue = implode("\n", $wsLines);
}

$valueOutput .= $tokenValue;
}

// Clean trailing whitespace on each line of the final value
$valueLines = explode("\n", $valueOutput);
foreach ($valueLines as &$vLine) {
$vLine = rtrim($vLine);
}
$valueOutput = implode("\n", $valueLines);

// If value starts with newline, trim trailing space from "=> " on the key line
if (strlen($valueOutput) > 0 && $valueOutput[0] === "\n") {
$newSource = rtrim($newSource);
}

$newSource .= $valueOutput;

$newSource .= ",\n";
}

$newSource .= $baseIndent . $indentUnit . ")\n";
$newSource .= $baseIndent . ");";

// Advance main loop to end of last assignment
$i = $assignments[count($assignments)-1]['end_pos'];
$modified = true;
} else {
// Only 0 or 1 assignment found, not enough to merge, or structure wasn't perfect
// Just print the token at $i and move on normally
// We fall through to default printer
}
}
}
}
}

if (!$matchFound && $i < $count) {
$token = $tokens[$i];
$newSource .= is_array($token) ? $token[1] : $token;
$i++;
}
}

if ($modified) {
file_put_contents($filePath, $newSource);
echo "Modified: $filePath\n";
}
}

if (is_dir($target)) {
$iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($target));
foreach ($iterator as $file) {
if ($file->isFile() && $file->getExtension() === 'php') {
processFile($file->getPathname());
}
}
} elseif (is_file($target)) {
processFile($target);
} else {
die("Invalid target.\n");
}
6 changes: 3 additions & 3 deletions lib/KSeF/KSeF.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ public function getInvoiceXml(array $invoice)
} else {
$taxRate = null;
}
if (isset($taxRate) && isset($invoice['taxest'][$taxRate])) {
if (isset($taxRate, $invoice['taxest'][$taxRate])) {
$xml .= "\t\t<P_13_1>" . sprintf('%.2f', $invoice['taxest'][$taxRate]['base']) . "</P_13_1>" . PHP_EOL;
$xml .= "\t\t<P_14_1>" . sprintf('%.2f', $invoice['taxest'][$taxRate]['tax']) . "</P_14_1>" . PHP_EOL;
if ($currency != $this->defaultCurrency) {
Expand Down Expand Up @@ -499,7 +499,7 @@ public function getInvoiceXml(array $invoice)
} else {
$taxRate = null;
}
if (isset($taxRate) && isset($invoice['taxest'][$taxRate])) {
if (isset($taxRate, $invoice['taxest'][$taxRate])) {
$xml .= "\t\t<P_13_2>" . sprintf('%.2f', $invoice['taxest'][$taxRate]['base']) . "</P_13_2>" . PHP_EOL;
$xml .= "\t\t<P_14_2>" . sprintf('%.2f', $invoice['taxest'][$taxRate]['tax']) . "</P_14_2>" . PHP_EOL;
if ($currency != $this->defaultCurrency) {
Expand Down Expand Up @@ -541,7 +541,7 @@ public function getInvoiceXml(array $invoice)
} else {
$taxRate = null;
}
if (isset($taxRate) && isset($invoice['taxest'][$taxRate])) {
if (isset($taxRate, $invoice['taxest'][$taxRate])) {
$xml .= "\t\t<P_13_3>" . sprintf('%.2f', $invoice['taxest'][$taxRate]['base']) . "</P_13_3>" . PHP_EOL;
$xml .= "\t\t<P_14_3>" . sprintf('%.2f', $invoice['taxest'][$taxRate]['tax']) . "</P_14_3>" . PHP_EOL;
if ($currency != $this->defaultCurrency) {
Expand Down
2 changes: 1 addition & 1 deletion lib/LMSManagers/LMSCashManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ public function CashImportParseFile($filename, $contents, $patterns, $quiet = tr

if ($patterns_cnt && !empty($sum)) {
foreach ($patterns as $idx => $pattern) {
if (isset($pattern['pattern_sum']) && isset($pattern['pattern_sum_check']) && !$pattern['pattern_sum_check']($data, $sum)) {
if (isset($pattern['pattern_sum'], $pattern['pattern_sum_check']) && !$pattern['pattern_sum_check']($data, $sum)) {
$error['sum'] = true;
}
}
Expand Down
Loading