phive tools update

.phive/phars.xml

@@ -3,10 +3,10 @@
   <phar name="phpunit" version="^9.6" installed="9.6.17" location="./tools/phpunit" copy="false"/>
   <phar name="phpcbf" version="^3.7.2" installed="3.9.0" location="./tools/phpcbf" copy="false"/>
   <phar name="phpcs" version="^3.7.2" installed="3.9.0" location="./tools/phpcs" copy="false"/>
-  <phar name="phpstan" version="^1.10.37" installed="1.10.59" location="./tools/phpstan" copy="false"/>
+  <phar name="phpstan" version="^1.10.37" installed="1.10.63" location="./tools/phpstan" copy="false"/>
   <phar name="phan" version="^5.4.2" installed="5.4.3" location="./tools/phan" copy="false"/>
-  <phar name="psalm" version="^5.15.0" installed="5.22.2" location="./tools/psalm" copy="false"/>
+  <phar name="psalm" version="^5.15.0" installed="5.23.1" location="./tools/psalm" copy="false"/>
   <phar name="phpdox" version="^0.12.0" installed="0.12.0" location="./tools/phpdox" copy="false"/>
   <phar name="phpdocumentor" version="^3.4.2" installed="3.4.3" location="./tools/phpDocumentor" copy="false"/>
-  <phar name="php-cs-fixer" version="^3.34.1" installed="3.51.0" location="./tools/php-cs-fixer" copy="false"/>
+  <phar name="php-cs-fixer" version="^3.34.1" installed="3.52.0" location="./tools/php-cs-fixer" copy="false"/>
 </phive>

4dev/bin/mo_to_js.sh

@@ -28,7 +28,7 @@ if [ "${target}" == '' ]; then
 	# default is admin
 	TEXTDOMAIN=admin;
 fi;
-js_folder="layout/${TEXTDOMAIN}/javascript/";
+js_folder="${TEXTDOMAIN}/layout/javascript/";
 
 error=0;
 # this checks if the TEXTDOMAIN target actually exists

tools/php-cs-fixer

@@ -1 +1 @@
-/home/clemens/.phive/phars/php-cs-fixer-3.51.0.phar
+/home/clemens/.phive/phars/php-cs-fixer-3.52.0.phar

tools/phpstan

@@ -1 +1 @@
-/home/clemens/.phive/phars/phpstan-1.10.59.phar
+/home/clemens/.phive/phars/phpstan-1.10.63.phar

tools/psalm

@@ -1 +1 @@
-/home/clemens/.phive/phars/psalm-5.22.2.phar
+/home/clemens/.phive/phars/psalm-5.23.1.phar

www/composer.lock

@@ -8,11 +8,11 @@
     "packages": [
         {
             "name": "egrajp/smarty-extended",
-            "version": "4.4.1",
+            "version": "4.5.1",
             "dist": {
                 "type": "zip",
-                "url": "https://git.egplusww.jp/api/packages/Composer/composer/files/egrajp%2Fsmarty-extended/4.4.1/egrajp-smarty-extended.4.4.1.zip",
+                "url": "https://git.egplusww.jp/api/packages/Composer/composer/files/egrajp%2Fsmarty-extended/4.5.1/egrajp-smarty-extended.4.5.1.zip",
-                "shasum": "edd7a0960e49bfcc709e0a525729aaaf9ed0db75"
+                "shasum": "1461a83b478b8a34cb7b92aedb283ec673cbdc02"
             },
             "type": "library",
             "autoload": {
@@ -34,7 +34,7 @@
             "keywords": [
                 "templating"
             ],
-            "time": "2024-03-06T18:43:44+09:00"
+            "time": "2024-03-19T10:35:55+09:00"
         },
         {
             "name": "gullevek/dotenv",

www/lib/CoreLibs/DB/Extended/ArrayIO.php

@@ -236,7 +236,7 @@ class ArrayIO extends \CoreLibs\DB\IO
 	 */
 	public function getPkId(): int|string|null
 	{
-		return $this->pk_id;
+		return $this->pk_id ?? null;
 	}
 
 	/**

www/lib/CoreLibs/Output/Form/Generate.php

@@ -1507,7 +1507,7 @@ class Generate
 			}
 			if (
 				!empty($this->reference_array[$key]['mandatory']) &&
-				!$this->reference_array[$key]['selected'][0]
+				empty($this->reference_array[$key]['selected'][0])
 			) {
 				$this->msg .= sprintf(
 					$this->l->__('Please select at least one Element from field <b>%s</b>!<br>'),

www/lib/CoreLibs/Output/Form/TableArrays/EditPages.php

@@ -53,6 +53,7 @@ class EditPages implements Interface\TableArraysInterface
 					'value' => $_POST['name'] ?? '',
 					'output_name' => 'Page name',
 					'mandatory' => 1,
+					'error_check' => 'unique',
 					'type' => 'text'
 				],
 				'order_number' => [

www/vendor/composer/installed.json

@@ -2,14 +2,14 @@
     "packages": [
         {
             "name": "egrajp/smarty-extended",
-            "version": "4.4.1",
+            "version": "4.5.1",
-            "version_normalized": "4.4.1.0",
+            "version_normalized": "4.5.1.0",
             "dist": {
                 "type": "zip",
-                "url": "https://git.egplusww.jp/api/packages/Composer/composer/files/egrajp%2Fsmarty-extended/4.4.1/egrajp-smarty-extended.4.4.1.zip",
+                "url": "https://git.egplusww.jp/api/packages/Composer/composer/files/egrajp%2Fsmarty-extended/4.5.1/egrajp-smarty-extended.4.5.1.zip",
-                "shasum": "edd7a0960e49bfcc709e0a525729aaaf9ed0db75"
+                "shasum": "1461a83b478b8a34cb7b92aedb283ec673cbdc02"
             },
-            "time": "2024-03-06T18:43:44+09:00",
+            "time": "2024-03-19T10:35:55+09:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {

www/vendor/composer/installed.php

@@ -20,8 +20,8 @@
             'dev_requirement' => false,
         ),
         'egrajp/smarty-extended' => array(
-            'pretty_version' => '4.4.1',
+            'pretty_version' => '4.5.1',
-            'version' => '4.4.1.0',
+            'version' => '4.5.1.0',
             'reference' => null,
             'type' => 'library',
             'install_path' => __DIR__ . '/../egrajp/smarty-extended',

www/vendor/egrajp/smarty-extended/publish/last.published

@@ -1 +1 @@
-4.3.4
+4.4.1

www/vendor/egrajp/smarty-extended/src/Smarty.class.php

@@ -107,7 +107,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '4.4.1';
+    const SMARTY_VERSION = '4.5.1';
     /**
      * define variable scopes
      */

www/vendor/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_private_modifier.php

@@ -109,9 +109,11 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa
                             if (!is_object($compiler->smarty->security_policy)
                                 || $compiler->smarty->security_policy->isTrustedPhpModifier($modifier, $compiler)
                             ) {
-                                trigger_error('Using php-function "' . $modifier . '" as a modifier is deprecated and will be ' .
+                                if (!in_array($modifier, ['time', 'join', 'is_array', 'in_array'])) {
-                                    'removed in a future release. Use Smarty::registerPlugin to explicitly register ' .
+                                    trigger_error('Using unregistered function "' . $modifier . '" in a template is deprecated and will be ' .
-                                    'a custom modifier.', E_USER_DEPRECATED);
+                                        'removed in a future release. Use Smarty::registerPlugin to explicitly register ' .
+                                        'a custom modifier.', E_USER_DEPRECATED);
+                                }
                                 $output = "{$modifier}({$params})";
                             }
                             $compiler->known_modifier_type[ $modifier ] = $type;

www/vendor/egrajp/smarty-extended/src/sysplugins/smarty_internal_templatecompilerbase.php

@@ -640,7 +640,17 @@ abstract class Smarty_Internal_TemplateCompilerBase
                         return $func_name . '(' . $parameter[ 0 ] . ')';
                     }
                 } else {
-                    return $name . '(' . implode(',', $parameter) . ')';
+					$first_param = array_shift($parameter);
+					$modifier = array_merge(array($name), $parameter);
+					// Now, compile the function call as a modifier
+					return $this->compileTag(
+						'private_modifier',
+						array(),
+						array(
+							'modifierlist' => array($modifier),
+							'value'        => $first_param
+						)
+					);
                 }
             } else {
                 $this->trigger_template_error("unknown function '{$name}'");

www/vendor/egrajp/smarty-extended/src/sysplugins/smarty_internal_templateparser.php

@@ -2425,6 +2425,9 @@ public static $yy_action = array(
         if (isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor])) {
             $this->_retvalue = $this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor].'::'.$this->yystack[$this->yyidx + 0]->minor[0].$this->yystack[$this->yyidx + 0]->minor[1];
         } else {
+            trigger_error('Using unregistered static method "' . $this->yystack[$this->yyidx + -2]->minor.'::'.$this->yystack[$this->yyidx + 0]->minor[0] . '" in a template is deprecated and will be ' .
+                'removed in a future release. Use Smarty::registerClass to explicitly register ' .
+                'a class for access.', E_USER_DEPRECATED);
             $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'::'.$this->yystack[$this->yyidx + 0]->minor[0].$this->yystack[$this->yyidx + 0]->minor[1];
         } 
     } else {

www/vendor/egrajp/smarty-extended/src/sysplugins/smarty_security.php

@@ -253,7 +253,7 @@ class Smarty_Security
      *
      * @param string $function_name
      * @param object $compiler compiler object
-     *
+     * @deprecated
      * @return boolean                 true if function is trusted
      */
     public function isTrustedPhpFunction($function_name, $compiler)