README update

.gitignore

@@ -1,5 +1,6 @@
 .libs
 node_modules/
-composer.lock
+**/composer.lock
-vendor/
+**/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.4" location="./tools/phpstan" copy="false"/>
+  <phar name="phpstan" version="^1.10.37" installed="1.12.6" 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"/>

4dev/tests/UrlRequests/CoreLibsUrlRequestsCurlTest.php

@@ -1,31 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace tests;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * Test class for UrlRequests\Curl
- * @coversDefaultClass \CoreLibs\UrlRequests\Curl
- * @testdox \CoreLibs\UrlRequests\Curl method tests
- */
-final class CoreLibsUrlRequestsCurlTest extends TestCase
-{
-	/**
-	 * Undocumented function
-	 *
-	 * @testdox UrlRequests\Curl Class tests
-	 *
-	 * @return void
-	 */
-	public function testUrlRequestsCurl()
-	{
-		$this->markTestIncomplete(
-			'UrlRequests\Curl Tests have not yet been implemented'
-		);
-	}
-}
-
-// __END__

composer.json

@@ -4,16 +4,14 @@
     "description": "CoreLibs: Development package",
     "type": "library",
     "require": {
-        "php": ">=8.3"
+        "php": ">=8.1"
     },
     "require-dev": {
-        "phpstan/phpstan": "^1.12",
+        "phpstan/phpstan": "^1.10",
         "phan/phan": "^5.4",
-        "phpstan/extension-installer": "^1.4",
+        "phpstan/extension-installer": "^1.2",
         "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,18 +1,25 @@
 # PHP Stan Config
 includes:
 	- phpstan-conditional.php
-	- ./vendor/yamadashy/phpstan-friendly-formatter/extension.neon
 parameters:
 	tmpDir: %currentWorkingDirectory%/tmp/phpstan-corelibs
-	errorFormat: friendly
+	level: 9 # max is now 9
-	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:
@@ -42,6 +49,8 @@ parameters:
 		- www/log
 		- www/media
 		- www/tmp
+		# File uploader
+		- www/lib/FileUpload
 		# ignore composer
 		- www/vendor
 	# ignore errores with
@@ -60,6 +69,6 @@ parameters:
 		#	paths:
 		#		- ...
 		#		- ...
-		-
+		#-
-			message: "#^Call to deprecated method #"
+		#	message: "#^Call to deprecated method #"
-			path: www/admin/class_test*.php
+		#	path: www/admin/class_test*.php

www/admin/class_test.php

@@ -117,7 +117,6 @@ $test_files = [
 	'class_test.config.direct.php' => 'Class Test: CONFIG DIRECT',
 	'class_test.class-calls.php' => 'Class Test: CLASS CALLS',
 	'class_test.error_msg.php' => 'Class Test: ERROR MSG',
-	'class_test.url-requests.curl.php' => 'Class Test: URL REQUESTS: CURL',
 	'subfolder/class_test.config.direct.php' => 'Class Test: CONFIG DIRECT SUB',
 ];
 

www/admin/class_test.url-requests.curl.php

@@ -1,48 +0,0 @@
-<?php // phpcs:ignore warning
-
-/**
- * @phan-file-suppress PhanTypeSuspiciousStringExpression
- */
-
-declare(strict_types=1);
-
-error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
-
-ob_start();
-
-// basic class test file
-define('USE_DATABASE', false);
-// sample config
-require 'config.php';
-// define log file id
-$LOG_FILE_ID = 'classTest-urlrequests';
-ob_end_flush();
-
-use CoreLibs\UrlRequests\Curl;
-
-$log = new CoreLibs\Logging\Logging([
-	'log_folder' => BASE . LOG,
-	'log_file_id' => $LOG_FILE_ID,
-	'log_per_date' => true,
-]);
-
-$client = new Curl();
-
-$PAGE_NAME = 'TEST CLASS: URL REQUESTS CURL';
-print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title></head>";
-print "<body>";
-print '<div><a href="class_test.php">Class Test Master</a></div>';
-print '<div><h1>' . $PAGE_NAME . '</h1></div>';
-
-$url = 'https://soba.egplusww.jp';
-
-$data = $client->requestGet($url, []);
-
-print "<hr>";
-print "RESPONSE: <pre>" . print_r($data, true) . "</pre>";
-print "<hr>";
-
-print "</body></html>";
-
-// __END__

www/configs/config.master.php

@@ -205,11 +205,13 @@ 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_PROTO']) &&
-	!empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on'
+	$_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https' ||
+	!empty($_SERVER['HTTP_X_FORWARDED_SSL']) &&
+	$_SERVER['HTTP_X_FORWARDED_SSL'] === 'on'
 ) {
 	$is_secure = true;
 }

www/lib/CoreLibs/UrlRequests/Curl.php

@@ -1,405 +0,0 @@
-<?php
-
-/**
- * AUTHOR: Clemens Schwaighofer
- * CREATED: 2024/9/20
- * DESCRIPTION:
- * Curl Client for get/post/put/delete requests through the php curl inteface
-*/
-
-namespace CoreLibs\UrlRequests;
-
-use RuntimeException;
-use CoreLibs\Convert\Json;
-
-class Curl implements Interface\RequestsInterface
-{
-	/** @var array<string> all the valid request type */
-	private const VALID_REQUEST_TYPES = ["get", "post", "put", "delete"];
-	/** @var int error bad request */
-	public const HTTP_BAD_REQUEST = 400;
-	/** @var int error not authorized Request */
-	public const HTTP_NOT_AUTHORIZED = 401;
-	/** @var int error forbidden */
-	public const HTTP_FORBIDDEN = 403;
-	/** @var int error not found */
-	public const HTTP_NOT_FOUND = 404;
-	/** @var int error conflict */
-	public const HTTP_CONFLICT = 409;
-	/** @var int error unprocessable entity */
-	public const HTTP_UNPROCESSABLE_ENTITY = 422;
-	/** @var int http ok request */
-	public const HTTP_OK = 200;
-	/** @var int http ok creted response */
-	public const HTTP_CREATED = 201;
-	/** @var int http ok no content */
-	public const HTTP_NO_CONTENT = 204;
-
-	/** @var string auth ident as "email:api_token */
-	private string $auth_ident;
-	/** @var bool if flagged to true, will raise an exception on failed authentication */
-	private bool $exception_on_not_authorized = false;
-
-	/**
-	 * init class with auth ident token
-	 *
-	 * @param ?string $auth_ident [defaul=null]                    String to send for authentication, optional
-	 * @param bool    $exception_on_not_authorized [default=false] If set to true
-	 *                                                             will raise excepion on http auth error
-	 */
-	public function __construct(?string $auth_ident = null, bool $exception_on_not_authorized = false)
-	{
-		if (is_string($auth_ident)) {
-			$this->auth_ident = $auth_ident;
-		}
-		$this->exception_on_not_authorized = $exception_on_not_authorized;
-	}
-
-	// *********************************************************************
-	// MARK: PRIVATE METHODS
-	// *********************************************************************
-
-	// MARK: query and params convert
-
-	/**
-	 * Convert Query params and combine with url
-	 *
-	 * @param  string                          $url
-	 * @param  null|string|array<string,mixed> $query
-	 * @return string
-	 */
-	private function convertQuery(string $url, null|string|array $query = null): string
-	{
-		// conert to URL encoded query if array
-		if (is_array($query)) {
-			$query = http_build_query($query);
-		}
-		// add the params to the url
-		if (!empty($query)) {
-			// add ? if the string doesn't strt with one
-			// check if URL has "?", if yes, add as "&" block
-			$param_prefix = '?';
-			if (strstr($url, '?') !== false) {
-				$param_prefix = '&';
-			}
-			// if set, strip first character
-			if (str_starts_with($query, '?') || str_starts_with($query, '&')) {
-				$query = substr($query, 1);
-			}
-			// build url string
-			$url .= $param_prefix . $query;
-		}
-		return $url;
-	}
-
-	/**
-	 * Convert array params to json type string
-	 *
-	 * @param  string|array<string,mixed> $params
-	 * @return string
-	 */
-	private function convertParams(string|array $params): string
-	{
-		// convert to string as JSON block if it is an array
-		if (is_array($params)) {
-			$params = Json::jsonConvertArrayTo($params);
-		}
-		return $params;
-	}
-
-	// MARK: main curl request
-
-	/**
-	 * Overall reequest call
-	 *
-	 * @param  string        $type    get, post, put, delete: if not set or invalid throw error
-	 * @param  string        $url     The URL being requested,
-	 *                                including domain and protocol
-	 * @param  array<string> $headers [default=[]] Headers to be used in the request
-	 * @param  string|null $params [default=null] Optional url parameters for post/put requests
-	 * @return array{code:string,content:string}
-	 */
-	private function curlRequest(string $type, string $url, array $headers = [], ?string $params = null): array
-	{
-		if (!in_array($type, self::VALID_REQUEST_TYPES)) {
-			throw new RuntimeException(
-				json_encode([
-					'status' => 'FAILURE',
-					'code' => 'C003',
-					'type' => 'InvalidRequestType',
-					'message' => 'Invalid request type set: ' . $type,
-					'context' => [
-						'url' => $url,
-						'type' => $type,
-					],
-				]) ?: '',
-				0,
-			);
-		}
-		// init curl handle
-		$handle = $this->handleCurleInit($url);
-		// set the standard curl options
-		$this->setCurlOptions($handle, $headers);
-		// for post we set POST option
-		if ($type == "post") {
-			curl_setopt($handle, CURLOPT_POST, true);
-		} elseif (in_array($type, ["put", "delete"])) {
-			curl_setopt($handle, CURLOPT_CUSTOMREQUEST, strtoupper($type));
-		}
-		if (in_array($type, ["post", "put"]) && !empty($params)) {
-			curl_setopt($handle, CURLOPT_POSTFIELDS, $params);
-		}
-		// run curl execute
-		$http_result = $this->handleCurlExec($handle);
-		// get response code and bail on not authorized
-		$http_response = $this->handleCurlResponse($http_result, $handle);
-		// return response and result
-		return [
-			'code' => (string)$http_response,
-			'content' => (string)$http_result
-		];
-	}
-
-	// MARK: curl request helpers
-
-	/**
-	 * Handel curl init and errors
-	 *
-	 * @param  string            $url
-	 * @return \CurlHandle
-	 */
-	private function handleCurleInit(string $url): \CurlHandle
-	{
-		$handle = curl_init($url);
-		if ($handle !== false) {
-			return $handle;
-		}
-		// throw Error here with all codes
-		throw new RuntimeException(
-			json_encode([
-				'status' => 'FAILURE',
-				'code' => 'C001',
-				'type' => 'CurlInitError',
-				'message' => 'Failed to init curl with url: ' . $url,
-				'context' => [
-					'url' => $url,
-				],
-			]) ?: '',
-			0,
-		);
-	}
-
-	/**
-	 * set the default curl options
-	 *
-	 * headers array: do not split into "key" => "value", they must be "key: value"
-	 *
-	 * @param  \CurlHandle   $handle
-	 * @param  array<string> $headers list of options
-	 * @return void
-	 */
-	private function setCurlOptions(\CurlHandle $handle, array $headers): void
-	{
-		if (!empty($this->auth_ident)) {
-			curl_setopt($handle, CURLOPT_USERPWD, $this->auth_ident);
-		}
-		if ($headers !== []) {
-			curl_setopt($handle, CURLOPT_HTTPHEADER, $headers);
-		}
-		// curl_setopt($handle, CURLOPT_FAILONERROR, true);
-		curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
-		// for debug only
-		curl_setopt($handle, CURLINFO_HEADER_OUT, true);
-	}
-
-	// MARK: Curl Exception handler
-
-	/**
-	 * handles any CURL execute and on error throws a correct error message
-	 *
-	 * @param  \CurlHandle $handle
-	 * @return string
-	 */
-	private function handleCurlExec(\CurlHandle $handle): string
-	{
-		// execute query
-		$http_result = curl_exec($handle);
-		if ($http_result === true) {
-			return (string)self::HTTP_OK;
-		} elseif ($http_result !== false) {
-			return $http_result;
-		}
-		$url = curl_getinfo($handle, CURLINFO_EFFECTIVE_URL);
-		$errno = curl_errno($handle);
-		$message = curl_error($handle);
-		switch ($errno) {
-			case CURLE_COULDNT_CONNECT:
-			case CURLE_COULDNT_RESOLVE_HOST:
-			case CURLE_OPERATION_TIMEOUTED:
-				$message = 'Could not connect to server (' . $url . '). Please check your '
-					. 'internet connection and try again. [' . $message . ']';
-				break;
-			case CURLE_SSL_PEER_CERTIFICATE:
-				$message = 'Could not verify SSL certificate. Please make sure '
-					. 'that your network is not intercepting certificates. '
-					. '(Try going to ' . $url . 'in your browser.) '
-					. '[' . $message . ']';
-				break;
-			case 0:
-			default:
-				$message = 'Unexpected error communicating with server: ' . $message;
-		}
-
-		// throw an error like in the normal reqeust, but set to CURL error
-		throw new RuntimeException(
-			json_encode([
-				'status' => 'FAILURE',
-				'code' => 'C002',
-				'type' => 'CurlError',
-				'message' => $message,
-				'context' => [
-					'url' => $url,
-					'errno' => $errno,
-					'message' => $message,
-				],
-			]) ?: '',
-			$errno
-		);
-	}
-
-	// MARK: curl response hanlder
-
-	/**
-	 * Handle curl response and not auth 401 errors
-	 *
-	 * @param  string      $http_result
-	 * @param  \CurlHandle $handle
-	 * @return string
-	 */
-	private function handleCurlResponse(
-		string $http_result,
-		\CurlHandle $handle
-	): string {
-		$http_response = curl_getinfo($handle, CURLINFO_RESPONSE_CODE);
-		if (
-			!$this->exception_on_not_authorized ||
-			$http_response !== self::HTTP_NOT_AUTHORIZED
-		) {
-			return (string)$http_response;
-		}
-		$err = curl_errno($handle);
-		// extract all the error codes
-		$result_ar = json_decode((string)$http_result, true);
-
-		$url = curl_getinfo($handle, CURLINFO_EFFECTIVE_URL);
-		$error_status = 'ERROR';
-		$error_code = $http_response;
-		$error_type = 'UnauthorizedRequest';
-		$message = 'Request could not be finished successfully because of an authorization error';
-
-		// throw Error here with all codes
-		throw new RuntimeException(
-			json_encode([
-				'status' => $error_status,
-				'code' => $error_code,
-				'type' => $error_type,
-				'message' => $message,
-				'context' => [
-					'url' => $url,
-					'result' => $result_ar,
-				],
-			]) ?: '',
-			$err
-		);
-	}
-
-	// *********************************************************************
-	// MARK: PUBLIC METHODS
-	// *********************************************************************
-
-	// MARK: request methods
-
-	/**
-	 * Makes an request to the target url via curl: GET
-	 * Returns result as string (json)
-	 *
-	 * @param  string                          $url     The URL being requested,
-	 *                                                  including domain and protocol
-	 * @param  array<string>                   $headers [default=[]] Headers to be used in the request
-	 * @param  null|string|array<string,mixed> $query   [default=null] String to pass on as GET,
-	 *                                                  if array will be converted
-	 * @return array{code:string,content:string} Result code and content as array, content is json
-	 */
-	public function requestGet(string $url, array $headers = [], null|string|array $query = null): array
-	{
-		return $this->curlRequest("get", $this->convertQuery($url, $query), $headers);
-	}
-
-	/**
-	 * Makes an request to the target url via curl: POST
-	 * Returns result as string (json)
-	 *
-	 * @param  string                          $url     The URL being requested,
-	 *                                                  including domain and protocol
-	 * @param  string|array<string,mixed>      $params  String to pass on as POST
-	 * @param  array<string>                   $headers Headers to be used in the request
-	 * @param  null|string|array<string,mixed> $query   Optinal query parameters, array will be converted
-	 * @return array{code:string,content:string} Result code and content as array, content is json
-	 */
-	public function requestPost(
-		string $url,
-		string|array $params,
-		array $headers,
-		null|string|array $query = null
-	): array {
-		return $this->curlRequest(
-			"post",
-			$this->convertQuery($url, $query),
-			$headers,
-			$this->convertParams($params)
-		);
-	}
-
-	/**
-	 * Makes an request to the target url via curl: PUT
-	 * Returns result as string (json)
-	 *
-	 * @param  string                          $url     The URL being requested,
-	 *                                                  including domain and protocol
-	 * @param  string|array<string,mixed>      $params  String to pass on as POST
-	 * @param  array<string>                   $headers Headers to be used in the request
-	 * @param  null|string|array<string,mixed> $query   Optinal query parameters, array will be converted
-	 * @return array{code:string,content:string} Result code and content as array, content is json
-	 */
-	public function requestPut(
-		string $url,
-		string|array $params,
-		array $headers,
-		null|string|array $query = null
-	): array {
-		return $this->curlRequest(
-			"put",
-			$this->convertQuery($url, $query),
-			$headers,
-			$this->convertParams($params)
-		);
-	}
-
-	/**
-	 * Makes an request to the target url via curl: DELETE
-	 * Returns result as string (json)
-	 *
-	 * @param  string                          $url     The URL being requested,
-	 *                                                  including domain and protocol
-	 * @param  array<string>                   $headers [default=[]] Headers to be used in the request
-	 * @param  null|string|array<string,mixed> $query   [default=null] String to pass on as GET,
-	 *                                                  if array will be converted
-	 * @return array{code:string,content:string} Result code and content as array, content is json
-	 */
-	public function requestDelete(string $url, array $headers = [], null|string|array $query = null): array
-	{
-		return $this->curlRequest("delete", $this->convertQuery($url, $query), $headers);
-	}
-}
-
-// __END__

www/lib/CoreLibs/UrlRequests/Interface/RequestsInterface.php

@@ -1,75 +0,0 @@
-<?php
-
-/**
- * AUTHOR: Clemens Schwaighofer
- * CREATED: 2024/9/20
- * DESCRIPTION:
- * URL Requests client interface
-*/
-
-namespace CoreLibs\UrlRequests\Interface;
-
-interface RequestsInterface
-{
-	/**
-	 * Makes an request to the target url via curl: GET
-	 * Returns result as string (json)
-	 *
-	 * @param  string                          $url     The URL being requested,
-	 *                                                  including domain and protocol
-	 * @param  array<string>                   $headers Headers to be used in the request
-	 * @param  null|string|array<string,mixed> $query   String to pass on as GET, if array will be converted
-	 * @return array{code:string,content:string} Result code and content as array, content is json
-	 */
-	public function requestGet(string $url, array $headers, null|string|array $query = null): array;
-
-	/**
-	 * Makes an request to the target url via curl: POST
-	 * Returns result as string (json)
-	 *
-	 * @param  string                          $url     The URL being requested,
-	 *                                                  including domain and protocol
-	 * @param  string|array<string,mixed>      $params  String to pass on as POST
-	 * @param  array<string>                   $headers Headers to be used in the request
-	 * @param  null|string|array<string,mixed> $query   URL query parameters
-	 * @return array{code:string,content:string} Result code and content as array, content is json
-	 */
-	public function requestPost(
-		string $url,
-		string|array $params,
-		array $headers,
-		null|string|array $query = null
-	): array;
-
-	/**
-	 * Makes an request to the target url via curl: PUT
-	 * Returns result as string (json)
-	 *
-	 * @param  string                          $url     The URL being requested,
-	 *                                                  including domain and protocol
-	 * @param  string|array<string,mixed>      $params  String to pass on as POST
-	 * @param  array<string>                   $headers Headers to be used in the request
-	 * @param  null|string|array<string,mixed> $query   String to pass on as GET, if array will be converted
-	 * @return array{code:string,content:string} Result code and content as array, content is json
-	 */
-	public function requestPut(
-		string $url,
-		string|array $params,
-		array $headers,
-		null|string|array $query = null
-	): array;
-
-	/**
-	 * Makes an request to the target url via curl: DELETE
-	 * Returns result as string (json)
-	 *
-	 * @param  string                          $url     The URL being requested,
-	 *                                                  including domain and protocol
-	 * @param  array<string>                   $headers Headers to be used in the request
-	 * @param  null|string|array<string,mixed> $query   String to pass on as GET, if array will be converted
-	 * @return array{code:string,content:string} Result code and content as array, content is json
-	 */
-	public function requestDelete(string $url, array $headers, null|string|array $query = null): array;
-}
-
-// __END__

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

@@ -14,12 +14,9 @@ For local install only
 Setup from gitea internal servers
 
 ```sh
-composer config repositories.git.egplusww.jp.Composer composer https://git.egplusww.jp/api/packages/Composer/composer
+composer config repositories.packages.omnicomproduction.jp.Composer composer https://packages.omnicomproduction.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`
@@ -28,8 +25,8 @@ Alternative setup composer local zip file repot:
 
 1) update the original composer for ^4.3
 2) copy over the src/sysplugins and all base files in src/
-3) check either function.html_checkboxes.php and function.html_options.php have changed
+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
+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)