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

PHP unit 8.2, cel builder br/input fix, doctype add, sync .user.ini

Browse Source 
- do not sync .user.ini file in sync template
- add PHP 8.2 for test target phpunit
- cel/phfo builder update to not close br or img tags (besides input)
- psalm settings update
- add doctype to all base templates
This commit is contained in:
Clemens Schwaighofer
2022-12-27 16:56:33 +09:00
parent 6e59b63791
commit 8ef309d479
7 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
4dev/checking/phpunit.sh
View File

@@ -16,6 +16,7 @@ if [ ! -z "${1}" ]; then
"7.4") php_bin="/usr/bin/php7.4 "; ;; "7.4") php_bin="/usr/bin/php7.4 "; ;;
"8.0") php_bin="/usr/bin/php8.0 "; ;; "8.0") php_bin="/usr/bin/php8.0 "; ;;
"8.1") php_bin="/usr/bin/php8.1 "; ;; "8.1") php_bin="/usr/bin/php8.1 "; ;;
"8.2") php_bin="/usr/bin/php8.2 "; ;;
*) echo "Not support PHP: ${1}"; exit; ;; *) echo "Not support PHP: ${1}"; exit; ;;
esac; esac;
fi; fi;
@@ -25,6 +26,7 @@ if [ ! -z "${2}" ] && [ -z "${php_bin}" ]; then
"7.4") php_bin="/usr/bin/php7.4 "; ;; "7.4") php_bin="/usr/bin/php7.4 "; ;;
"8.0") php_bin="/usr/bin/php8.0 "; ;; "8.0") php_bin="/usr/bin/php8.0 "; ;;
"8.1") php_bin="/usr/bin/php8.1 "; ;; "8.1") php_bin="/usr/bin/php8.1 "; ;;
"8.2") php_bin="/usr/bin/php8.2 "; ;;
*) echo "Not support PHP: ${1}"; exit; ;; *) echo "Not support PHP: ${1}"; exit; ;;
esac; esac;
fi; fi;

1
4dev/sync/sync_template.sh
View File

@@ -18,6 +18,7 @@ rm -f $tmpf_web;
echo ".*.swp" >> $tmpf_web; echo ".*.swp" >> $tmpf_web;
echo "._*" >> $tmpf_web; echo "._*" >> $tmpf_web;
echo ".DS_Store" >> $tmpf_web; echo ".DS_Store" >> $tmpf_web;
echo ".user.ini" >> $tmpf_web;
echo ".svn" >> $tmpf_web; echo ".svn" >> $tmpf_web;
echo ".svnignore" >> $tmpf_web; echo ".svnignore" >> $tmpf_web;
echo ".git" >> $tmpf_web; echo ".git" >> $tmpf_web;

1
www/includes/templates/admin/edit_body.tpl
View File

@@ -8,6 +8,7 @@
******************************************************************** ********************************************************************
*} *}
<!doctype html>
<html> <html>
<head> <head>
<title>{$HTML_TITLE}</title> <title>{$HTML_TITLE}</title>

1
www/includes/templates/admin/main_body.tpl
View File

@@ -8,6 +8,7 @@
******************************************************************** ********************************************************************
*} *}
<!doctype html>
<html> <html>
<head> <head>
<title>{$HTML_TITLE}</title> <title>{$HTML_TITLE}</title>

1
www/includes/templates/admin/main_body4.tpl
View File

@@ -8,6 +8,7 @@
******************************************************************** ********************************************************************
*} *}
<!doctype html>
<html> <html>
<head> <head>
<title>{$HTML_TITLE}</title> <title>{$HTML_TITLE}</title>

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

@@ -1014,8 +1014,12 @@ function phfo(tree)
} else if (tree.content) { } else if (tree.content) {
content.push(tree.content); content.push(tree.content);
} }
// if not input close // if not input, image or br, then close
if (tree.tag != 'input') { if (
tree.tag != 'input' ||
tree.tag != 'img' ||
tree.tag != 'br'
) {
content.push('</' + tree.tag + '>'); content.push('</' + tree.tag + '>');
} }
// combine to string // combine to string

1
www/psalm.xml
View File

@@ -28,7 +28,6 @@
<directory name="lib/FileUpload" /> <directory name="lib/FileUpload" />
<directory name="lib/Smarty" /> <directory name="lib/Smarty" />
<directory name="lib/smarty-4.1.0" /> <directory name="lib/smarty-4.1.0" />
<file name="lib/smarty-4.1.0/SmartyBC.class.php" />
<file name="lib/Smarty/Smarty.class.php" /> <file name="lib/Smarty/Smarty.class.php" />
<file name="lib/CoreLibs/Template/SmartyExtend.php" /> <file name="lib/CoreLibs/Template/SmartyExtend.php" />
</ignoreFiles> </ignoreFiles>