diff --git a/www/composer.lock b/www/composer.lock index 8758f4ab..0907128d 100644 --- a/www/composer.lock +++ b/www/composer.lock @@ -12,7 +12,7 @@ "dist": { "type": "path", "url": "/storage/var/www/html/developers/clemens/core_data/composer-packages/CoreLibs-Composer-All", - "reference": "d3d4cf512f62f139c61629d5aa21cf22ad726241" + "reference": "3f5b3f02ad635611fc8e12704995abeff02ee558" }, "require": { "php": ">=8.2", @@ -45,11 +45,11 @@ }, { "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", - "shasum": "edd7a0960e49bfcc709e0a525729aaaf9ed0db75" + "url": "https://git.egplusww.jp/api/packages/Composer/composer/files/egrajp%2Fsmarty-extended/4.5.1/egrajp-smarty-extended.4.5.1.zip", + "shasum": "1461a83b478b8a34cb7b92aedb283ec673cbdc02" }, "type": "library", "autoload": { @@ -71,7 +71,7 @@ "keywords": [ "templating" ], - "time": "2024-03-06T18:43:44+09:00" + "time": "2024-03-19T10:35:55+09:00" }, { "name": "gullevek/dotenv", diff --git a/www/vendor/composer/installed.json b/www/vendor/composer/installed.json index 0ed99cde..3f35792b 100644 --- a/www/vendor/composer/installed.json +++ b/www/vendor/composer/installed.json @@ -7,7 +7,7 @@ "dist": { "type": "path", "url": "/storage/var/www/html/developers/clemens/core_data/composer-packages/CoreLibs-Composer-All", - "reference": "d3d4cf512f62f139c61629d5aa21cf22ad726241" + "reference": "3f5b3f02ad635611fc8e12704995abeff02ee558" }, "require": { "php": ">=8.2", @@ -42,14 +42,14 @@ }, { "name": "egrajp/smarty-extended", - "version": "4.4.1", - "version_normalized": "4.4.1.0", + "version": "4.5.1", + "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", - "shasum": "edd7a0960e49bfcc709e0a525729aaaf9ed0db75" + "url": "https://git.egplusww.jp/api/packages/Composer/composer/files/egrajp%2Fsmarty-extended/4.5.1/egrajp-smarty-extended.4.5.1.zip", + "shasum": "1461a83b478b8a34cb7b92aedb283ec673cbdc02" }, - "time": "2024-03-06T18:43:44+09:00", + "time": "2024-03-19T10:35:55+09:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/www/vendor/composer/installed.php b/www/vendor/composer/installed.php index 6dc428d7..3aefb06d 100644 --- a/www/vendor/composer/installed.php +++ b/www/vendor/composer/installed.php @@ -13,7 +13,7 @@ 'egrajp/corelibs-composer-all' => array( 'pretty_version' => 'dev-development', 'version' => 'dev-development', - 'reference' => 'd3d4cf512f62f139c61629d5aa21cf22ad726241', + 'reference' => '3f5b3f02ad635611fc8e12704995abeff02ee558', 'type' => 'library', 'install_path' => __DIR__ . '/../egrajp/corelibs-composer-all', 'aliases' => array(), @@ -29,8 +29,8 @@ 'dev_requirement' => false, ), 'egrajp/smarty-extended' => array( - 'pretty_version' => '4.4.1', - 'version' => '4.4.1.0', + 'pretty_version' => '4.5.1', + 'version' => '4.5.1.0', 'reference' => null, 'type' => 'library', 'install_path' => __DIR__ . '/../egrajp/smarty-extended', diff --git a/www/vendor/egrajp/corelibs-composer-all/.phive/phars.xml b/www/vendor/egrajp/corelibs-composer-all/.phive/phars.xml index 72b47dc1..c72f3a23 100644 --- a/www/vendor/egrajp/corelibs-composer-all/.phive/phars.xml +++ b/www/vendor/egrajp/corelibs-composer-all/.phive/phars.xml @@ -1,9 +1,9 @@ - - - - - - + + + + + + diff --git a/www/vendor/egrajp/corelibs-composer-all/ReadMe.md b/www/vendor/egrajp/corelibs-composer-all/ReadMe.md index 355aea36..f11fa834 100644 --- a/www/vendor/egrajp/corelibs-composer-all/ReadMe.md +++ b/www/vendor/egrajp/corelibs-composer-all/ReadMe.md @@ -22,7 +22,7 @@ Alternative setup composer local zip file repot: ## Install package -`composer require egrajp/corelibs-composer-all:^8.0` +`composer require egrajp/corelibs-composer-all:^9.0` ## Tests diff --git a/www/vendor/egrajp/corelibs-composer-all/publish/last.published b/www/vendor/egrajp/corelibs-composer-all/publish/last.published index ee1b03fb..2f0dbe6f 100644 --- a/www/vendor/egrajp/corelibs-composer-all/publish/last.published +++ b/www/vendor/egrajp/corelibs-composer-all/publish/last.published @@ -1 +1 @@ -9.11.1 +9.12.0 diff --git a/www/vendor/egrajp/corelibs-composer-all/src/DB/Extended/ArrayIO.php b/www/vendor/egrajp/corelibs-composer-all/src/DB/Extended/ArrayIO.php index 2f19e9df..d40b71b4 100644 --- a/www/vendor/egrajp/corelibs-composer-all/src/DB/Extended/ArrayIO.php +++ b/www/vendor/egrajp/corelibs-composer-all/src/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; } /** diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/Generate.php b/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/Generate.php index 3c406d4d..62ca7370 100644 --- a/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/Generate.php +++ b/www/vendor/egrajp/corelibs-composer-all/src/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 %s!
'), diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditPages.php b/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditPages.php index 1ac90390..ef293f79 100644 --- a/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditPages.php +++ b/www/vendor/egrajp/corelibs-composer-all/src/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' => [ diff --git a/www/vendor/egrajp/smarty-extended/publish/last.published b/www/vendor/egrajp/smarty-extended/publish/last.published index eda862a9..cca25a93 100644 --- a/www/vendor/egrajp/smarty-extended/publish/last.published +++ b/www/vendor/egrajp/smarty-extended/publish/last.published @@ -1 +1 @@ -4.3.4 +4.4.1 diff --git a/www/vendor/egrajp/smarty-extended/src/Smarty.class.php b/www/vendor/egrajp/smarty-extended/src/Smarty.class.php index 0a47c835..1bfc5646 100644 --- a/www/vendor/egrajp/smarty-extended/src/Smarty.class.php +++ b/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 */ diff --git a/www/vendor/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_private_modifier.php b/www/vendor/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_private_modifier.php index aea082f0..31fd6e1d 100644 --- a/www/vendor/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_private_modifier.php +++ b/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 ' . - 'removed in a future release. Use Smarty::registerPlugin to explicitly register ' . - 'a custom modifier.', E_USER_DEPRECATED); + if (!in_array($modifier, ['time', 'join', 'is_array', 'in_array'])) { + trigger_error('Using unregistered function "' . $modifier . '" in a template is deprecated and will be ' . + '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; diff --git a/www/vendor/egrajp/smarty-extended/src/sysplugins/smarty_internal_templatecompilerbase.php b/www/vendor/egrajp/smarty-extended/src/sysplugins/smarty_internal_templatecompilerbase.php index d5c18d31..10caf590 100644 --- a/www/vendor/egrajp/smarty-extended/src/sysplugins/smarty_internal_templatecompilerbase.php +++ b/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}'"); diff --git a/www/vendor/egrajp/smarty-extended/src/sysplugins/smarty_internal_templateparser.php b/www/vendor/egrajp/smarty-extended/src/sysplugins/smarty_internal_templateparser.php index a2dd0d6f..c37d3c18 100644 --- a/www/vendor/egrajp/smarty-extended/src/sysplugins/smarty_internal_templateparser.php +++ b/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 { diff --git a/www/vendor/egrajp/smarty-extended/src/sysplugins/smarty_security.php b/www/vendor/egrajp/smarty-extended/src/sysplugins/smarty_security.php index 97cd0521..49ae2a38 100644 --- a/www/vendor/egrajp/smarty-extended/src/sysplugins/smarty_security.php +++ b/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)