phive packages updates

Minor php cs fixes
add php code sniffer xml
2024-01-10 17:04:20 +09:00 · 2024-01-10 17:03:18 +09:00 · 2023-12-05 17:37:55 +09:00 · 2023-11-29 10:44:21 +09:00 · 2023-11-29 10:36:49 +09:00 · 2023-11-28 11:34:29 +09:00
17 changed files with 106 additions and 29 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -0,0 +1,43 @@
+module.exports = {
+	'env': {
+		'browser': true,
+		'es6': true,
+		'commonjs': true,
+		'jquery': true
+	},
+	'extends': 'eslint:recommended',
+	'parserOptions': {
+		'ecmaVersion': 6
+	},
+	'rules': {
+		'indent': [
+			'error',
+			'tab',
+			{
+				'SwitchCase': 1
+			}
+		],
+		'linebreak-style': [
+			'error',
+			'unix'
+		],
+		'quotes': [
+			'error',
+			'single'
+		],
+		'semi': [
+			'error',
+			'always'
+		],
+		'no-console': 'off',
+		'no-unused-vars': [
+			'error', {
+				'vars': 'all',
+				'args': 'after-used',
+				'ignoreRestSiblings': false
+			}
+		],
+		// Requires eslint >= v8.14.0
+		'no-constant-binary-expression': 'error'
+	}
+};
--- a/.phive/phars.xml
+++ b/.phive/phars.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpunit" version="^9.6" installed="9.6.13" location="./tools/phpunit" copy="false"/>
-  <phar name="phpcbf" version="^3.7.2" installed="3.7.2" location="./tools/phpcbf" copy="false"/>
-  <phar name="phpcs" version="^3.7.2" installed="3.7.2" location="./tools/phpcs" copy="false"/>
-  <phar name="phpstan" version="^1.10.37" installed="1.10.37" location="./tools/phpstan" copy="false"/>
-  <phar name="phan" version="^5.4.2" installed="5.4.2" location="./tools/phan" copy="false"/>
-  <phar name="psalm" version="^5.15.0" installed="5.15.0" location="./tools/psalm" copy="false"/>
+  <phar name="phpunit" version="^9.6" installed="9.6.15" location="./tools/phpunit" copy="false"/>
+  <phar name="phpcbf" version="^3.7.2" installed="3.8.0" location="./tools/phpcbf" copy="false"/>
+  <phar name="phpcs" version="^3.7.2" installed="3.8.0" location="./tools/phpcs" copy="false"/>
+  <phar name="phpstan" version="^1.10.37" installed="1.10.50" 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.18.0" 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.2" location="./tools/phpDocumentor" copy="false"/>
-  <phar name="php-cs-fixer" version="^3.34.1" installed="3.34.1" location="./tools/php-cs-fixer" 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.42.0" location="./tools/php-cs-fixer" copy="false"/>
 </phive>
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -0,0 +1,15 @@
+{
+	"compilerOptions": {
+		"module": "ESNext",
+		"moduleResolution": "Node",
+		"target": "ES2020",
+		"jsx": "react",
+		"allowImportingTsExtensions": true,
+		"strictNullChecks": true,
+		"strictFunctionTypes": true
+	},
+	"exclude": [
+		"node_modules",
+		"**/node_modules/*"
+	]
+}
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<ruleset name="MyStandard">
+	<description>PSR12 override rules (strict, standard). Switch spaces indent to tab.</description>
+	<arg name="tab-width" value="4"/>
+	<rule ref="PSR1"/>
+	<rule ref="PSR12">
+		<!-- turn off white space check for tab -->
+		<exclude name="Generic.WhiteSpace.DisallowTabIndent"/>
+	</rule>
+	<!-- no space indent, must be tab, 4 is tab iwdth -->
+	<rule ref="Generic.WhiteSpace.DisallowSpaceIndent"/>
+	<rule ref="Generic.WhiteSpace.ScopeIndent">
+		<properties>
+			<property name="indent" value="4"/>
+			<property name="tabIndent" value="true"/>
+		</properties>
+	</rule>
+</ruleset>
--- a/tools/phan
+++ b/tools/phan
@@ -1 +1 @@
-/home/clemens/.phive/phars/phan-5.4.2.phar
+/home/clemens/.phive/phars/phan-5.4.3.phar
--- a/tools/php-cs-fixer
+++ b/tools/php-cs-fixer
@@ -1 +1 @@
-/home/clemens/.phive/phars/php-cs-fixer-3.34.1.phar
+/home/clemens/.phive/phars/php-cs-fixer-3.42.0.phar
--- a/tools/phpDocumentor
+++ b/tools/phpDocumentor
@@ -1 +1 @@
-/home/clemens/.phive/phars/phpdocumentor-3.4.2.phar
+/home/clemens/.phive/phars/phpdocumentor-3.4.3.phar
--- a/tools/phpcbf
+++ b/tools/phpcbf
@@ -1 +1 @@
-/home/clemens/.phive/phars/phpcbf-3.7.2.phar
+/home/clemens/.phive/phars/phpcbf-3.8.0.phar
--- a/tools/phpcs
+++ b/tools/phpcs
@@ -1 +1 @@
-/home/clemens/.phive/phars/phpcs-3.7.2.phar
+/home/clemens/.phive/phars/phpcs-3.8.0.phar
--- a/tools/phpstan
+++ b/tools/phpstan
@@ -1 +1 @@
-/home/clemens/.phive/phars/phpstan-1.10.37.phar
+/home/clemens/.phive/phars/phpstan-1.10.50.phar
--- a/tools/phpunit
+++ b/tools/phpunit
@@ -1 +1 @@
-/home/clemens/.phive/phars/phpunit-9.6.13.phar
+/home/clemens/.phive/phars/phpunit-9.6.15.phar
--- a/tools/psalm
+++ b/tools/psalm
@@ -1 +1 @@
-/home/clemens/.phive/phars/psalm-5.15.0.phar
+/home/clemens/.phive/phars/psalm-5.18.0.phar
--- a/www/admin/class_test.db.query-placeholder.php
+++ b/www/admin/class_test.db.query-placeholder.php
@@ -115,6 +115,8 @@ echo "INSERT ALL COLUMN TYPES: "
 	. "ERROR: " . $db->dbGetLastError(true) . "<br>";
 echo "<hr>";

+// test connectors: = , <> () for query detection
+
 // convert placeholder tests
 // ? -> $n
 // :name -> $n
--- a/www/admin/edit_base_page_test.php
+++ b/www/admin/edit_base_page_test.php
@@ -3,4 +3,3 @@
 // empty file for add and remove test

 // __END__
-
--- a/www/lib/CoreLibs/Combined/DateTime.php
+++ b/www/lib/CoreLibs/Combined/DateTime.php
@@ -385,7 +385,7 @@ class DateTime
 		} else {
 			$str = implode(', ', array_slice($formatted, 0, -1));
 			if (!empty($formatted[count($formatted) - 1])) {
-				$str .= ' and ' . $formatted[count($formatted) - 1];
+				$str .= ' and ' . (string)array_pop($formatted);
 			}
 			return $negative . $str;
 		}
@@ -675,9 +675,9 @@ class DateTime
 		foreach ($period as $dt) {
 			$curr = $dt->format('D');
 			if ($curr == 'Sat' || $curr == 'Sun') {
-				$days[2] ++;
+				$days[2]++;
 			} else {
-				$days[1] ++;
+				$days[1]++;
 			}
 		}
 		if ($return_named === true) {
--- a/www/lib/CoreLibs/DB/IO.php
+++ b/www/lib/CoreLibs/DB/IO.php
@@ -1302,7 +1302,7 @@ class IO
 				}
 			}
 		}
-		$this->cursor_ext[$query_hash]['pos'] ++;
+		$this->cursor_ext[$query_hash]['pos']++;
 		return $return;
 	}

@@ -1318,14 +1318,14 @@ class IO
 		// regex for params: only stand alone $number allowed
 		// exclude all '' enclosed strings, ignore all numbers [note must start with digit]
 		// can have space/tab/new line
-		// must have = , ( [equal, comma, opening round bracket]
+		// must have <> = , ( [not equal, equal, comma, opening round bracket]
 		// can have space/tab/new line
 		// $ number with 1-9 for first and 0-9 for further digits
 		// /s for matching new line in . list
 		// [disabled, we don't used ^ or $] /m for multi line match
 		// Matches in 1:, must be array_filtered to remove empty, count with array_unique
 		preg_match_all(
-			'/(?:\'.*?\')?\s*(?:\?\?|[(=,])\s*(?:\d+|(?:\'.*?\')|(\$[1-9]{1}(?:[0-9]{1,})?))/s',
+			'/(?:\'.*?\')?\s*(?:\?\?|<>|[(=,])\s*(?:\d+|(?:\'.*?\')|(\$[1-9]{1}(?:[0-9]{1,})?))/s',
 			$query,
 			$match
 		);
@@ -1519,7 +1519,7 @@ class IO
 				]);
 				return false;
 		}
-		$this->query_called[$query_hash] ++;
+		$this->query_called[$query_hash]++;
 		// return hash
 		return $query_hash;
 	}
@@ -2469,7 +2469,7 @@ class IO
 				return false;
 			}
 		} else {
-			$this->cursor_ext[$query_hash]['log_pos'] ++;
+			$this->cursor_ext[$query_hash]['log_pos']++;
 		}
 		// reset log for each read
 		$this->cursor_ext[$query_hash]['log'] = [];
@@ -2668,8 +2668,8 @@ class IO
 				if ($return) {
 					$this->cursor_ext[$query_hash]['log'][] = 'Return Data';
 					// internal position counter
-					$this->cursor_ext[$query_hash]['pos'] ++;
-					$this->cursor_ext[$query_hash]['read_rows'] ++;
+					$this->cursor_ext[$query_hash]['pos']++;
+					$this->cursor_ext[$query_hash]['read_rows']++;
 					// read is finished
 					if (
 						$this->cursor_ext[$query_hash]['read_rows'] ==
--- a/www/lib/CoreLibs/Output/ProgressBar.php
+++ b/www/lib/CoreLibs/Output/ProgressBar.php
@@ -156,7 +156,7 @@ class ProgressBar
 	{
 		// avoid divison through 0
 		if ($this->max - $this->min == 0) {
-			$this->max ++;
+			$this->max++;
 		}
 		$percent = round(($step - $this->min) / ($this->max - $this->min) * 100);
 		if ($percent > 100) {
@@ -186,7 +186,7 @@ class ProgressBar
 		}
 		// avoid divison through 0
 		if ($this->max - $this->min == 0) {
-			$this->max ++;
+			$this->max++;
 		}
 		$pixel = round(($step - $this->min) * ($bar - ($this->pedding * 2)) / ($this->max - $this->min));
 		if ($step <= $this->min) {
Author	SHA1	Message	Date
Clemens Schwaighofer	10ed5b3ea0	phive packages updates	2024-01-10 17:04:20 +09:00
Clemens Schwaighofer	5f290419c6	Minor php cs fixes	2024-01-10 17:03:18 +09:00
Clemens Schwaighofer	0152af6e65	add php code sniffer xml	2023-12-05 17:37:55 +09:00
Clemens Schwaighofer	4adb9fba30	DB IO Bug Fix for parameter detect after <>, DateTime code fix Query Parameters where not detected after a <> unequal check DateTime fix for last element, use array_pop instead of $array[count - 1]	2023-11-29 10:44:21 +09:00
Clemens Schwaighofer	672931ee67	phive packages update	2023-11-29 10:36:49 +09:00
Clemens Schwaighofer	373a9aff2f	Add local eslintrc and jsconfig	2023-11-28 11:34:29 +09:00
Clemens Schwaighofer	4e3ceecac8	Phive update	2023-11-02 14:05:49 +09:00