Subversion Repositories oidplus

Compare Revisions

Regard whitespace Rev 1469 → Rev 1470

/trunk/vendor/composer/installed.json
392,18 → 392,18
"source": {
"type": "git",
"url": "https://github.com/danielmarschall/uuid_mac_utils.git",
"reference": "4936898473ce09a5fd06e47d33c582365d0c3b38"
"reference": "ad30e67d0092009d14b50d23f3d4e33bbec4ff52"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/danielmarschall/uuid_mac_utils/zipball/4936898473ce09a5fd06e47d33c582365d0c3b38",
"reference": "4936898473ce09a5fd06e47d33c582365d0c3b38",
"url": "https://api.github.com/repos/danielmarschall/uuid_mac_utils/zipball/ad30e67d0092009d14b50d23f3d4e33bbec4ff52",
"reference": "ad30e67d0092009d14b50d23f3d4e33bbec4ff52",
"shasum": ""
},
"require": {
"php": ">=7.0"
},
"time": "2024-03-09T20:36:07+00:00",
"time": "2024-04-05T00:44:32+00:00",
"default-branch": true,
"type": "library",
"installation-source": "dist",
579,17 → 579,17
},
{
"name": "matthiasmullie/minify",
"version": "1.3.72",
"version_normalized": "1.3.72.0",
"version": "1.3.73",
"version_normalized": "1.3.73.0",
"source": {
"type": "git",
"url": "https://github.com/matthiasmullie/minify.git",
"reference": "531fdeef1911ffe27a53f8a19c297648c78f757e"
"reference": "cb7a9297b4ab070909cefade30ee95054d4ae87a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/matthiasmullie/minify/zipball/531fdeef1911ffe27a53f8a19c297648c78f757e",
"reference": "531fdeef1911ffe27a53f8a19c297648c78f757e",
"url": "https://api.github.com/repos/matthiasmullie/minify/zipball/cb7a9297b4ab070909cefade30ee95054d4ae87a",
"reference": "cb7a9297b4ab070909cefade30ee95054d4ae87a",
"shasum": ""
},
"require": {
606,7 → 606,7
"suggest": {
"psr/cache-implementation": "Cache implementation to use with Minify::cache"
},
"time": "2024-03-13T12:02:00+00:00",
"time": "2024-03-15T10:27:10+00:00",
"bin": [
"bin/minifycss",
"bin/minifyjs"
641,7 → 641,7
],
"support": {
"issues": "https://github.com/matthiasmullie/minify/issues",
"source": "https://github.com/matthiasmullie/minify/tree/1.3.72"
"source": "https://github.com/matthiasmullie/minify/tree/1.3.73"
},
"funding": [
{
/trunk/vendor/composer/installed.php
95,7 → 95,7
'danielmarschall/uuid_mac_utils' => array(
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => '4936898473ce09a5fd06e47d33c582365d0c3b38',
'reference' => 'ad30e67d0092009d14b50d23f3d4e33bbec4ff52',
'type' => 'library',
'install_path' => __DIR__ . '/../danielmarschall/uuid_mac_utils',
'aliases' => array(
151,9 → 151,9
'dev_requirement' => false,
),
'matthiasmullie/minify' => array(
'pretty_version' => '1.3.72',
'version' => '1.3.72.0',
'reference' => '531fdeef1911ffe27a53f8a19c297648c78f757e',
'pretty_version' => '1.3.73',
'version' => '1.3.73.0',
'reference' => 'cb7a9297b4ab070909cefade30ee95054d4ae87a',
'type' => 'library',
'install_path' => __DIR__ . '/../matthiasmullie/minify',
'aliases' => array(),
/trunk/vendor/danielmarschall/uuid_mac_utils/includes/uuid_utils.inc.php
3,7 → 3,7
/*
* UUID utils for PHP
* Copyright 2011 - 2024 Daniel Marschall, ViaThinkSoft
* Version 2024-03-09
* Version 2024-04-05
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
815,6 → 815,62
 
// END: OIDplus 2.0 Custom UUID Interpretation
 
// START: hayageek UUIDv8 Interpretation
// https://github.com/hayageek/uuid-v8
// Example: 07e80404-1736-8934-8374-e63eb25babd2
 
$year = hexdec(substr($uuid,0,4));
$month = hexdec(substr($uuid,4,2));
$day = hexdec(substr($uuid,6,2));
$hours = hexdec(substr($uuid,8,2));
$minutes = hexdec(substr($uuid,10,2));
$ver = hexdec(substr($uuid,12,1));
$rnd1 = substr($uuid,13,1);
$seconds = hexdec(substr($uuid,14,2));
 
// Diagram (WRONG): <2 variant 0b10> <8 msec> <6 random>
// Actual Code: <2 variant 0b10> <2 zero> <12 msec 0..0x3E7>
$tmp = hexdec(substr($uuid,16,4));
 
$var = ($tmp >> 14) & 0b11;
$zero = ($tmp >> 12) & 0b11;
$milliseconds = $tmp & 0xFFF;
 
$rnd2 = substr($uuid,20,12);
 
$utc_time =
str_pad("$year",4,'0',STR_PAD_LEFT).'-'.
str_pad("$month",2,'0',STR_PAD_LEFT).'-'.
str_pad("$day",2,'0',STR_PAD_LEFT).' '.
str_pad("$hours",2,'0',STR_PAD_LEFT).':'.
str_pad("$minutes",2,'0',STR_PAD_LEFT).':'.
str_pad("$seconds",2,'0',STR_PAD_LEFT)."'".
str_pad("$milliseconds",3/*ms*/,'0',STR_PAD_LEFT);
 
$date_valid = checkdate($month, $day, $year);
$time_valid = ($hours >= 0) && ($hours <= 23) &&
($minutes >= 0) && ($minutes <= 59) &&
($seconds >= 0) && ($seconds <= 59) &&
($milliseconds >= 0) && ($milliseconds <= 999); /**@phpstan-ignore-line*/
 
if (($ver == 8) && ($var == 2) && ($zero == 0) && $date_valid && $time_valid) {
echo "\n<u>Interpretation of <a href=\"https://github.com/hayageek/uuid-v8\">hayageek UUIDv8</a></u>\n\n";
 
echo sprintf("%-32s %s\n", "Date/Time:", "$utc_time UTC");
echo sprintf("%-32s %s\n", "Random Data:", "0x$rnd1$rnd2");
echo sprintf("%-32s %s\n", "Year:", sprintf("[0x%04x] %d", $year, $year));
echo sprintf("%-32s %s\n", "Month:", sprintf("[0x%02x] %d", $month, $month));
echo sprintf("%-32s %s\n", "Day:", sprintf("[0x%02x] %d", $day, $day));
echo sprintf("%-32s %s\n", "Hours:", sprintf("[0x%02x] %d", $hours, $hours));
echo sprintf("%-32s %s\n", "Minutes:", sprintf("[0x%02x] %d", $minutes, $minutes));
echo sprintf("%-32s %s\n", "Random 1:", sprintf("[0x%s]", $rnd1));
echo sprintf("%-32s %s\n", "Seconds:", sprintf("[0x%02x] %d", $seconds, $seconds));
echo sprintf("%-32s %s\n", "Milliseconds:", sprintf("[0x%03x] %d", $milliseconds, $milliseconds));
echo sprintf("%-32s %s\n", "Random 2:", sprintf("[0x%s]", $rnd2));
}
 
// END: hayageek UUIDv8 Interpretation
 
break;
default:
echo sprintf("%-32s %s\n", "Version:", "[0x".dechex($version)."] Unknown");
865,8 → 921,8
str_pad("$hours",2,'0',STR_PAD_LEFT).':'.
str_pad("$minutes",2,'0',STR_PAD_LEFT).':'.
str_pad("$seconds",2,'0',STR_PAD_LEFT)."'".
str_pad("$milliseconds",2,'0',STR_PAD_LEFT);
if (strpos($utc_time,'X') === false) {
str_pad("$milliseconds",3/*ms*/,'0',STR_PAD_LEFT);
if (checkdate($month, $day, $year) && (strpos($utc_time,'X') === false)) {
$deviation = "(deviation -2ms..2ms)";
echo "\n<u>Interpretation of <a href=\"https://gist.github.com/danielmarschall/7fafd270a3bc107d38e8449ce7420c25\">HickelSOFT \"SQL Server Sortable Custom UUID\", Version 2</a></u>\n\n";
echo sprintf("%-32s %s\n", "Random 16 bits:", "[0x$rnd16bits] 0b".str_pad("".base_convert($rnd16bits, 16, 2), 16, '0', STR_PAD_LEFT));
910,8 → 966,8
str_pad("$hours",2,'0',STR_PAD_LEFT).':'.
str_pad("$minutes",2,'0',STR_PAD_LEFT).':'.
str_pad("$seconds",2,'0',STR_PAD_LEFT)."'".
str_pad("$milliseconds",2,'0',STR_PAD_LEFT);
if (strpos($local_time,'X') === false) {
str_pad("$milliseconds",3/*ms*/,'0',STR_PAD_LEFT);
if (checkdate($month, $day, $year) && (strpos($local_time,'X') === false)) {
$deviation = "(deviation -4ms..0ms)";
echo "\n<u>Interpretation of <a href=\"https://gist.github.com/danielmarschall/7fafd270a3bc107d38e8449ce7420c25\">HickelSOFT \"SQL Server Sortable Custom UUID\", Version 1</a></u>\n\n";
echo sprintf("%-32s %s\n", "Random 16 bits:", "[0x$rnd16bits] 0b".str_pad(base_convert($rnd16bits, 16, 2), 16, '0', STR_PAD_LEFT));
1566,6 → 1622,7
// The sorting in SQL Server is like this:
 
if ($dt == null) $dt = new DateTime();
if ($hickelUuidVersion >= 2) $dt->setTimeZone(new DateTimeZone("UTC"));
 
// First Sort block 5, nibbles from left to right (i.e. 000000000001 < 000000000010 < ... < 010000000000 < 100000000000)
if ($hickelUuidVersion == 1) {
1598,9 → 1655,9
 
// Then: Sort block 2, bytes from right to left
if ($hickelUuidVersion == 1) {
$block2 = $dt->format('ih');
$block2 = $dt->format('iH');
} else {
$minuteOfDay = (intval($dt->format('i')) + intval($dt->format('h')) * 60) + 1; // 1..1440
$minuteOfDay = (intval($dt->format('i')) + intval($dt->format('H')) * 60) + 1; // 1..1440
$block2 = sprintf('%04x', $minuteOfDay);
}
 
/trunk/vendor/licenses
16,8 → 16,8
danielmarschall/php-sha3 dev-master 5605bd5 MIT
danielmarschall/php_utils 9999999-dev 3f42fc2 Apache-2.0
danielmarschall/php_utils dev-master 3f42fc2 Apache-2.0
danielmarschall/uuid_mac_utils 9999999-dev 4936898 Apache-2.0
danielmarschall/uuid_mac_utils dev-master 4936898 Apache-2.0
danielmarschall/uuid_mac_utils 9999999-dev ad30e67 Apache-2.0
danielmarschall/uuid_mac_utils dev-master ad30e67 Apache-2.0
danielmarschall/vnag 9999999-dev ba9c0ed Apache-2.0
danielmarschall/vnag dev-master ba9c0ed Apache-2.0
dcodeio/bcrypt.js master master BSD-3-Clause, MIT
24,7 → 24,7
emn178/js-sha3 master master MIT
firebase/php-jwt v5.5.1 BSD-3-Clause
gedmarc/layout master master GPL-3.0-or-later, MIT
matthiasmullie/minify 1.3.72 MIT
matthiasmullie/minify 1.3.73 MIT
matthiasmullie/path-converter 1.1.3 MIT
paragonie/constant_time_encoding v2.6.3 MIT
paragonie/random_compat v9.99.100 MIT
/trunk/vendor/matthiasmullie/minify/src/CSS.php
583,12 → 583,13
*/
 
// convert legacy color syntax
$content = preg_replace('/(rgb|hsl)a?\(([^,\s]+)\s*,\s*([^,\s]+)\s*,\s*([^,\s]+)\s*,\s*([^\s\)]+)\)/i', '$1($2 $3 $4 / $5)', $content);
$content = preg_replace('/(rgb|hsl)a?\(([^,\s]+)\s*,\s*([^,\s]+)\s*,\s*([^,\s]+)\)/i', '$1($2 $3 $4)', $content);
$content = preg_replace('/(rgb)a?\(\s*([0-9]{1,3}%?)\s*,\s*([0-9]{1,3}%?)\s*,\s*([0-9]{1,3}%?)\s*,\s*([0,1]?(?:\.[0-9]*)?)\s*\)/i', '$1($2 $3 $4 / $5)', $content);
$content = preg_replace('/(rgb)a?\(\s*([0-9]{1,3}%?)\s*,\s*([0-9]{1,3}%?)\s*,\s*([0-9]{1,3}%?)\s*\)/i', '$1($2 $3 $4)', $content);
$content = preg_replace('/(hsl)a?\(\s*([0-9]+(?:deg|grad|rad|turn)?)\s*,\s*([0-9]{1,3}%)\s*,\s*([0-9]{1,3}%)\s*,\s*([0,1]?(?:\.[0-9]*)?)\s*\)/i', '$1($2 $3 $4 / $5)', $content);
$content = preg_replace('/(hsl)a?\(\s*([0-9]+(?:deg|grad|rad|turn)?)\s*,\s*([0-9]{1,3}%)\s*,\s*([0-9]{1,3}%)\s*\)/i', '$1($2 $3 $4)', $content);
 
// convert `rgb` to `hex`
$dec = '([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])'; // [000-255] THX @ https://www.regular-expressions.info/numericranges.html
 
$dec = '([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])';
return preg_replace_callback(
"/rgb\($dec $dec $dec\)/i",
function ($match) {
620,10 → 621,10
$tag = '(rgb|hsl|hwb|(?:(?:ok)?(?:lch|lab)))';
 
// remove alpha channel if it's pointless ..
$content = preg_replace('/' . $tag . '\(([^\s]+)\s+([^\s]+)\s+([^\s]+)\s+\/\s+1(?:[\.\d]*|00%)?\)/i', '$1($2 $3 $4)', $content);
$content = preg_replace('/' . $tag . '\(\s*([^\s]+)\s+([^\s]+)\s+([^\s]+)\s+\/\s+1(?:(?:\.\d?)*|00%)?\s*\)/i', '$1($2 $3 $4)', $content);
 
// replace `transparent` with shortcut ..
$content = preg_replace('/' . $tag . '\([^\s]+\s+[^\s]+\s+[^\s]+\s+\/\s+0(?:[\.0%]*)?\)/i', '#fff0', $content);
$content = preg_replace('/' . $tag . '\(\s*[^\s]+\s+[^\s]+\s+[^\s]+\s+\/\s+0(?:[\.0%]*)?\s*\)/i', '#fff0', $content);
 
return $content;
}