CoreLibs/development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mo create script update, phpstan fixes, document updates

Browse Source 
create_mo:
set auto base folder bases on current location so we do not need do
adjust paths in script

phpstan fixes:
edit_base.php
CoreLibs/Basci.php
CoreLibs/DB/SQL/PgSQL.php

Update documentation in method headers
CoreLibs/Combined/DateTime.php
This commit is contained in:
Clemens Schwaighofer
2022-10-12 09:48:22 +09:00
parent d15618cde4
commit e48a86985a
6 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
4dev/bin/create_mo.sh
View File

@@ -1,6 +1,8 @@
#!/usr/bin/env bash #!/usr/bin/env bash
base_folder='/var/www/html/developers/clemens/core_data/php_libraries/trunk/www/'; BASE_FOLDER=$(dirname $(readlink -f $0))"/";
# Assume script is in 4dev/bin
base_folder="${BASE_FOLDER}../../www/";
# locale gettext po to mo translator master # locale gettext po to mo translator master
for file in $(ls -1 ${base_folder}../4dev/locale/*.po); do for file in $(ls -1 ${base_folder}../4dev/locale/*.po); do

2
www/includes/edit_base.php
View File

@@ -457,6 +457,8 @@ if ($form->my_page_name == 'edit_order') {
$pathinfo = pathinfo($output_file); $pathinfo = pathinfo($output_file);
if (!empty($pathinfo['dirname'])) { if (!empty($pathinfo['dirname'])) {
$pathinfo['dirname'] .= DIRECTORY_SEPARATOR; $pathinfo['dirname'] .= DIRECTORY_SEPARATOR;
} else {
$pathinfo['dirname'] = '';
} }
if ($t_q) { if ($t_q) {
$t_q .= ', '; $t_q .= ', ';

2
www/layout/admin/javascript/edit.jq.js
View File

@@ -1387,6 +1387,8 @@ function createNavMenu(nav_menu, header_id = 'mainHeader') // eslint-disable-lin
} }
}); });
$('#menuRow').html(content.join('')); $('#menuRow').html(content.join(''));
} else {
$('#menuRow').hide();
} }
} }

2
www/lib/CoreLibs/Basic.php
View File

@@ -66,7 +66,7 @@ class Basic
// logging interface, Debug\Logging class // logging interface, Debug\Logging class
/** @var \CoreLibs\Debug\Logging */ /** @var \CoreLibs\Debug\Logging */
public $log; public $log;
/** @var\CoreLibs\Create\Session */ /** @var \CoreLibs\Create\Session */
public $session; public $session;
// email valid checks // email valid checks

28
www/lib/CoreLibs/Combined/DateTime.php
View File

@@ -312,16 +312,17 @@ class DateTime
} }
/** /**
* plits & checks date, wrap around for check_date function * compares two dates, tries to convert them via strtotime to timestamps
* returns int in: * returns int/bool in:
* -1 if the first date is smaller the last * -1 if the first date is smaller the last
* 0 if both are equal * 0 if both are equal
* 1 if the first date is bigger than the last * 1 if the first date is bigger than the last
* false (bool): error * false if date validation/conversion failed
* *
* @param string $start_date start date string in YYYY-MM-DD * @param string $start_date start date string in YYYY-MM-DD
* @param string $end_date end date string in YYYY-MM-DD * @param string $end_date end date string in YYYY-MM-DD
* @return int|bool false on error, or int -1/0/1 as difference * @return int|bool false on error
* or int -1 (s<e)/0 (s=e)/1 (s>e) as difference
*/ */
public static function compareDate($start_date, $end_date) public static function compareDate($start_date, $end_date)
{ {
@@ -354,16 +355,17 @@ class DateTime
/** /**
* compares the two dates + times. if seconds missing in one set, * compares the two dates + times. if seconds missing in one set,
* add :00, converts / to - * adds :00, converts date + times via strtotime to timestamps
* returns int/bool in: * returns int/bool in:
* -1 if the first date is smaller the last * -1 if the first date is smaller the last
* 0 if both are equal * 0 if both are equal
* 1 if the first date is bigger than the last * 1 if the first date is bigger than the last
* false if no valid date/times chould be found * false if date/times validation/conversion failed
* *
* @param string $start_datetime start date/time in YYYY-MM-DD HH:mm:ss * @param string $start_datetime start date/time in YYYY-MM-DD HH:mm:ss
* @param string $end_datetime end date/time in YYYY-MM-DD HH:mm:ss * @param string $end_datetime end date/time in YYYY-MM-DD HH:mm:ss
* @return int|bool false for error or -1/0/1 as difference * @return int|bool false for error
* or -1 (s<e)/0 (s=e)/1 (s>e) as difference
*/ */
public static function compareDateTime($start_datetime, $end_datetime) public static function compareDateTime($start_datetime, $end_datetime)
{ {

2
www/lib/CoreLibs/DB/SQL/PgSQL.php
View File

@@ -779,7 +779,6 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
} }
// get result // get result
$db_schema = $this->__dbFetchArray($cursor, PGSQL_ASSOC); $db_schema = $this->__dbFetchArray($cursor, PGSQL_ASSOC);
/** @phpstan-ignore-next-line Cannot access offset string on array|bool */
return $db_schema[$show_string] ?? ''; return $db_schema[$show_string] ?? '';
} }
@@ -806,7 +805,6 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
} }
// check if schema does not exists // check if schema does not exists
$row = $this->__dbFetchArray($cursor, PGSQL_ASSOC); $row = $this->__dbFetchArray($cursor, PGSQL_ASSOC);
/** @phpstan-ignore-next-line */
if (empty($row['exists']) || $row['exists'] == 'f') { if (empty($row['exists']) || $row['exists'] == 'f') {
return 2; return 2;
} }