core composer install update

.gitignore

@@ -1,6 +1,5 @@
 .libs
 node_modules/
-**/composer.lock
-**/vendor/
+composer.lock
+vendor/
 tools/
-**/.env

.phive/phars.xml

@@ -3,7 +3,7 @@
   <phar name="phpunit" version="^9.6" installed="9.6.21" location="./tools/phpunit" copy="false"/>
   <phar name="phpcbf" version="^3.7.2" installed="3.10.3" location="./tools/phpcbf" copy="false"/>
   <phar name="phpcs" version="^3.7.2" installed="3.10.3" location="./tools/phpcs" copy="false"/>
-  <phar name="phpstan" version="^1.10.37" installed="1.12.6" location="./tools/phpstan" copy="false"/>
+  <phar name="phpstan" version="^1.10.37" installed="1.12.4" 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.24.0" location="./tools/psalm" copy="false"/>
   <phar name="phpdox" version="^0.12.0" installed="0.12.0" location="./tools/phpdox" copy="false"/>

composer.json

@@ -4,14 +4,16 @@
     "description": "CoreLibs: Development package",
     "type": "library",
     "require": {
-        "php": ">=8.1"
+        "php": ">=8.3"
     },
     "require-dev": {
-        "phpstan/phpstan": "^1.10",
+        "phpstan/phpstan": "^1.12",
         "phan/phan": "^5.4",
-        "phpstan/extension-installer": "^1.2",
+        "phpstan/extension-installer": "^1.4",
         "phpstan/phpstan-strict-rules": "^1.6",
-        "phpunit/phpunit": "^9"
+        "phpunit/phpunit": "^9",
+        "phpstan/phpstan-deprecation-rules": "^1.2",
+        "yamadashy/phpstan-friendly-formatter": "^1.1"
     },
     "config": {
         "allow-plugins": {

phpstan.neon

@@ -1,25 +1,18 @@
 # PHP Stan Config
 includes:
 	- phpstan-conditional.php
+	- ./vendor/yamadashy/phpstan-friendly-formatter/extension.neon
 parameters:
 	tmpDir: %currentWorkingDirectory%/tmp/phpstan-corelibs
-	level: 9 # max is now 9
+	errorFormat: friendly
+	friendly:
+		lineBefore: 5
+		lineAfter: 3
+	level: 8 # max is now 9
+	# strictRules:
+	#	allRules: true
 	checkMissingCallableSignature: true
 	treatPhpDocTypesAsCertain: false
-	strictRules:
-		allRules: false
-		disallowedLooseComparison: false
-		booleansInConditions: false
-		uselessCast: true
-		requireParentConstructorCall: false
-		disallowedConstructs: false
-		overwriteVariablesWithLoop: false
-		closureUsesThis: false
-		matchingInheritedMethodNames: false
-		numericOperandsInArithmeticOperators: false
-		strictCalls: false
-		switchConditionsMatchingType: false
-		noVariableVariables: false
 	paths:
 		- %currentWorkingDirectory%/www
 	bootstrapFiles:
@@ -49,8 +42,6 @@ parameters:
 		- www/log
 		- www/media
 		- www/tmp
-		# File uploader
-		- www/lib/FileUpload
 		# ignore composer
 		- www/vendor
 	# ignore errores with
@@ -69,6 +60,6 @@ parameters:
 		#	paths:
 		#		- ...
 		#		- ...
-		#-
-		#	message: "#^Call to deprecated method #"
-		#	path: www/admin/class_test*.php
+		-
+			message: "#^Call to deprecated method #"
+			path: www/admin/class_test*.php

www/configs/config.master.php

@@ -205,13 +205,11 @@ if (
 }
 // set SSL on
 $is_secure = false;
-if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') {
+if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
 	$is_secure = true;
 } elseif (
-	!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) &&
-	$_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https' ||
-	!empty($_SERVER['HTTP_X_FORWARDED_SSL']) &&
-	$_SERVER['HTTP_X_FORWARDED_SSL'] === 'on'
+	!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' ||
+	!empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on'
 ) {
 	$is_secure = true;
 }

www/vendor/egrajp/smarty-extended/ReadMe.md

@@ -14,9 +14,12 @@ For local install only
 Setup from gitea internal servers
 
 ```sh
-composer config repositories.packages.omnicomproduction.jp.Composer composer https://packages.omnicomproduction.jp/api/packages/Composer/composer
+composer config repositories.git.egplusww.jp.Composer composer https://git.egplusww.jp/api/packages/Composer/composer
 ```
 
+Alternative setup composer local zip file repot:
+`composer config repositories.composer.egplusww.jp composer http://composer.egplusww.jp`
+
 ## Install package
 
 `composer require egrajp/smarty-extended:^4.3`
@@ -25,8 +28,8 @@ composer config repositories.packages.omnicomproduction.jp.Composer composer htt
 
 1) update the original composer for ^4.3
 2) copy over the src/sysplugins and all base files in src/
-3) check either `function_checkboxes.php` and `function_options.php` have changed
-4) copy src/plugins except the above two files, be sure to keep the `block.t.php` and `function_popup*.php`
+3) check either function.html_checkboxes.php and function.html_options.php have changed
+4) copy src/plugins except the above two files, be sure to keep the block.t.php and function_popup*.php
 5) Create new release version as official relase number
 
 ## Updated files (different from master)