Merge pull request #2 from getCompassUtils/release_v2.0.0

Release v2.0.0

Author: getcompass-opensource

src/Exception/Gateway/ShardNotFoundException.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace BaseFrame\Exception\Gateway;
+
+use BaseFrame\Exception\GatewayException;
+
+/**
+ * Ошибка бизнес-логики в сокет запросе
+ */
+class DBShardingNotFoundException extends GatewayException {
+
+
+}

system/functions.php

@@ -501,6 +501,19 @@ function weekStart(int $time = null):int {
 	return dayStart($start);
 }
 
+/**
+ * время начала текущей недели по UTC
+ *
+ * @param int|null $time
+ *
+ * @return int
+ */
+function weekStartOnGreenwich():int {
+
+	$datetime = (new \DateTime())->setTimezone(new \DateTimeZone("UTC"));
+	return $datetime->modify("Monday this week")->getTimestamp();
+}
+
 /**
  * время начала текущего месяца
  *
@@ -1154,6 +1167,29 @@ function obfuscateFullName(string $full_name):string {
 	return implode(" ", $obfuscated_parts);
 }
 
+/**
+ * Универсальняа функция для скрытия слов в строке
+ */
+function obfuscateWords(string $string, int $visible_count = 1):string {
+
+	$string_length = mb_strlen($string);
+
+	$delimiter = " ";
+	$words = explode($delimiter, $string);
+
+	$output = (string) array_reduce($words, static function(string $output, string $word) use ($visible_count, $delimiter) {
+
+		$length = mb_strlen($word);
+		$hidden_count = $length - ($visible_count * 2);
+
+		return $output . mb_substr($word, 0, $visible_count)
+			. ($hidden_count < 0 ? "" : str_repeat('*', $hidden_count))
+			. mb_substr($word, ($visible_count * -1), $visible_count) . $delimiter;
+	}, "");
+
+	return mb_substr($output, 0, $string_length);
+}
+
 /**
  * вернуть массив отсортированный в едином формате для создания подписи
  *
@@ -1412,13 +1448,19 @@ function inHtml(string $html, string $str):bool {
  *
  * @return string
  */
-function generateRandomString(int $length = 10):string {
+function generateRandomString(int $length = 10, bool $with_special_characters = false):string {
+
+	$characters         = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+	$special_characters = "!@#$%^&*()";
+
+	if ($with_special_characters) {
+		$characters .= $special_characters;
+	}
 
-	$characters       = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
 	$charactersLength = strlen($characters);
 	$randomString     = "";
 	for ($i = 0; $i < $length; $i++) {
-		$randomString .= $characters[rand(0, $charactersLength - 1)];
+		$randomString .= $characters[random_int(0, $charactersLength - 1)];
 	}
 
 	return $randomString;
@@ -2349,11 +2391,11 @@ function checkGuid(string $value):bool {
 function matchUuid(int $version_uuid):string {
 
 	return match ($version_uuid) {
-		1       => "/^[0-9A-F]{8}-[0-9A-F]{4}-[1][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/",
-		2       => "/^[0-9A-F]{8}-[0-9A-F]{4}-[2][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/",
-		3       => "/^[0-9A-F]{8}-[0-9A-F]{4}-[3][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/",
-		4       => "/^[0-9a-f]{8}-[0-9a-f]{4}-[4][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/",
-		5       => "/^[0-9A-F]{8}-[0-9A-F]{4}-[5][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i",
+		1 => "/^[0-9A-F]{8}-[0-9A-F]{4}-[1][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/",
+		2 => "/^[0-9A-F]{8}-[0-9A-F]{4}-[2][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/",
+		3 => "/^[0-9A-F]{8}-[0-9A-F]{4}-[3][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/",
+		4 => "/^[0-9a-f]{8}-[0-9a-f]{4}-[4][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/",
+		5 => "/^[0-9A-F]{8}-[0-9A-F]{4}-[5][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i",
 		default => throw new cs_InvalidUuidVersionException(),
 	};
 }

system/sharding_gateway.php

@@ -1,6 +1,7 @@
 <?php declare(strict_types=1);
 
 use BaseFrame\Exception\Domain\ParseFatalException;
+use BaseFrame\Exception\Gateway\DBShardingNotFoundException;
 
 /**
  * Класс шардинга
@@ -70,7 +71,7 @@ public static function database(string $database):myPDObasic {
 		$conf = static::instance()->_config_list[static::DB_KEY];
 
 		if (!isset($conf[$database])) {
-			throw new ParseFatalException("database not found in sharding config");
+			throw new DBShardingNotFoundException("database not found in sharding config");
 		}
 
 		return sharding::configuredPDO($conf[$database]);