From 16e6eec3fb2bfb5a34c9dc94d46232be8461a947 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 3 Jan 2024 11:09:22 +0000 Subject: composer add mmccook/php-json-canonicalization-scheme --- .../src/JsonCanonicalizator.php | 79 ++++++++++++++++++++++ .../src/JsonCanonicalizatorFactory.php | 13 ++++ .../src/JsonCanonicalizatorInterface.php | 10 +++ .../php-json-canonicalization-scheme/src/Utils.php | 52 ++++++++++++++ 4 files changed, 154 insertions(+) create mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php create mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php create mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorInterface.php create mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/Utils.php (limited to 'vendor/mmccook/php-json-canonicalization-scheme/src') diff --git a/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php b/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php new file mode 100644 index 000000000..6a3c82959 --- /dev/null +++ b/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php @@ -0,0 +1,79 @@ +serialize($data); + + $result = ob_get_clean(); + + return $asHex ? Utils::asHex($result) : $result; + } + + private function serialize($item) + { + if (is_float($item)) { + echo Utils::es6NumberFormat($item); + + return; + } + + if (null === $item || is_scalar($item)) { + echo json_encode($item, self::JSON_FLAGS); + + return; + } + + if (is_array($item) && ! Utils::isAssoc($item)) { + echo '['; + $next = false; + foreach ($item as $element) { + if ($next) { + echo ','; + } + $next = true; + $this->serialize($element); + } + echo ']'; + + return; + } + + if (is_object($item)) { + $item = (array)$item; + } + + uksort($item, function (string $a, string $b) { + $a = mb_convert_encoding($a, 'UTF-16BE'); + $b = mb_convert_encoding($b, 'UTF-16BE'); + + return strcmp($a, $b); + }); + + echo '{'; + $next = false; + foreach ($item as $key => $value) { + //var_dump($key, $value); + if ($next) { + echo ','; + } + $next = true; + $outKey = json_encode((string)$key, self::JSON_FLAGS); + echo $outKey, ':', $this->serialize($value); + } + echo '}'; + + } +} diff --git a/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php b/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php new file mode 100644 index 000000000..68b1c50c9 --- /dev/null +++ b/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php @@ -0,0 +1,13 @@ += 1e-6) { + $formatted = number_format($number, 7, '.', ''); + $formatted = rtrim($formatted, '.0'); + } else { + $formatted = sprintf('%e', $number); + $parts = explode('e', $formatted); + $parts[0] = rtrim($parts[0], '.0'); + $formatted = implode('e', $parts); + } + + return $sign . $formatted; + } +} -- cgit v1.2.3 From 6bf61dfa6b585db01b607a79bd64ec9c583a9c10 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 14 Mar 2024 09:35:09 +0000 Subject: composer update and use the fixed streams php-jcs library until the floats issue will be fixed upstream. see here for reference https://codeberg.org/streams/streams/issues/151 --- .../src/JsonCanonicalizator.php | 79 ---------------------- .../src/JsonCanonicalizatorFactory.php | 13 ---- .../src/JsonCanonicalizatorInterface.php | 10 --- .../php-json-canonicalization-scheme/src/Utils.php | 52 -------------- 4 files changed, 154 deletions(-) delete mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php delete mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php delete mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorInterface.php delete mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/Utils.php (limited to 'vendor/mmccook/php-json-canonicalization-scheme/src') diff --git a/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php b/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php deleted file mode 100644 index 6a3c82959..000000000 --- a/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php +++ /dev/null @@ -1,79 +0,0 @@ -serialize($data); - - $result = ob_get_clean(); - - return $asHex ? Utils::asHex($result) : $result; - } - - private function serialize($item) - { - if (is_float($item)) { - echo Utils::es6NumberFormat($item); - - return; - } - - if (null === $item || is_scalar($item)) { - echo json_encode($item, self::JSON_FLAGS); - - return; - } - - if (is_array($item) && ! Utils::isAssoc($item)) { - echo '['; - $next = false; - foreach ($item as $element) { - if ($next) { - echo ','; - } - $next = true; - $this->serialize($element); - } - echo ']'; - - return; - } - - if (is_object($item)) { - $item = (array)$item; - } - - uksort($item, function (string $a, string $b) { - $a = mb_convert_encoding($a, 'UTF-16BE'); - $b = mb_convert_encoding($b, 'UTF-16BE'); - - return strcmp($a, $b); - }); - - echo '{'; - $next = false; - foreach ($item as $key => $value) { - //var_dump($key, $value); - if ($next) { - echo ','; - } - $next = true; - $outKey = json_encode((string)$key, self::JSON_FLAGS); - echo $outKey, ':', $this->serialize($value); - } - echo '}'; - - } -} diff --git a/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php b/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php deleted file mode 100644 index 68b1c50c9..000000000 --- a/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php +++ /dev/null @@ -1,13 +0,0 @@ -= 1e-6) { - $formatted = number_format($number, 7, '.', ''); - $formatted = rtrim($formatted, '.0'); - } else { - $formatted = sprintf('%e', $number); - $parts = explode('e', $formatted); - $parts[0] = rtrim($parts[0], '.0'); - $formatted = implode('e', $parts); - } - - return $sign . $formatted; - } -} -- cgit v1.2.3 From 55097c47c5534d4453f7494f8a1542f7beb4d588 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 14 Mar 2024 10:13:22 +0000 Subject: Revert "composer update and use the fixed streams php-jcs library until the floats issue will be fixed upstream. see here for reference https://codeberg.org/streams/streams/issues/151" This reverts commit 6bf61dfa6b585db01b607a79bd64ec9c583a9c10. --- .../src/JsonCanonicalizator.php | 79 ++++++++++++++++++++++ .../src/JsonCanonicalizatorFactory.php | 13 ++++ .../src/JsonCanonicalizatorInterface.php | 10 +++ .../php-json-canonicalization-scheme/src/Utils.php | 52 ++++++++++++++ 4 files changed, 154 insertions(+) create mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php create mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php create mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorInterface.php create mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/Utils.php (limited to 'vendor/mmccook/php-json-canonicalization-scheme/src') diff --git a/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php b/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php new file mode 100644 index 000000000..6a3c82959 --- /dev/null +++ b/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php @@ -0,0 +1,79 @@ +serialize($data); + + $result = ob_get_clean(); + + return $asHex ? Utils::asHex($result) : $result; + } + + private function serialize($item) + { + if (is_float($item)) { + echo Utils::es6NumberFormat($item); + + return; + } + + if (null === $item || is_scalar($item)) { + echo json_encode($item, self::JSON_FLAGS); + + return; + } + + if (is_array($item) && ! Utils::isAssoc($item)) { + echo '['; + $next = false; + foreach ($item as $element) { + if ($next) { + echo ','; + } + $next = true; + $this->serialize($element); + } + echo ']'; + + return; + } + + if (is_object($item)) { + $item = (array)$item; + } + + uksort($item, function (string $a, string $b) { + $a = mb_convert_encoding($a, 'UTF-16BE'); + $b = mb_convert_encoding($b, 'UTF-16BE'); + + return strcmp($a, $b); + }); + + echo '{'; + $next = false; + foreach ($item as $key => $value) { + //var_dump($key, $value); + if ($next) { + echo ','; + } + $next = true; + $outKey = json_encode((string)$key, self::JSON_FLAGS); + echo $outKey, ':', $this->serialize($value); + } + echo '}'; + + } +} diff --git a/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php b/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php new file mode 100644 index 000000000..68b1c50c9 --- /dev/null +++ b/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php @@ -0,0 +1,13 @@ += 1e-6) { + $formatted = number_format($number, 7, '.', ''); + $formatted = rtrim($formatted, '.0'); + } else { + $formatted = sprintf('%e', $number); + $parts = explode('e', $formatted); + $parts[0] = rtrim($parts[0], '.0'); + $formatted = implode('e', $parts); + } + + return $sign . $formatted; + } +} -- cgit v1.2.3 From 81ce67df942d4bf378814677268fe03a29ecc028 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 14 Mar 2024 10:18:51 +0000 Subject: use the streams php-jcs library until the floats issue will be fixed upstream. see here for reference https://codeberg.org/streams/streams/issues/151 --- .../src/JsonCanonicalizator.php | 79 ---------------------- .../src/JsonCanonicalizatorFactory.php | 13 ---- .../src/JsonCanonicalizatorInterface.php | 10 --- .../php-json-canonicalization-scheme/src/Utils.php | 52 -------------- 4 files changed, 154 deletions(-) delete mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php delete mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php delete mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorInterface.php delete mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/Utils.php (limited to 'vendor/mmccook/php-json-canonicalization-scheme/src') diff --git a/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php b/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php deleted file mode 100644 index 6a3c82959..000000000 --- a/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php +++ /dev/null @@ -1,79 +0,0 @@ -serialize($data); - - $result = ob_get_clean(); - - return $asHex ? Utils::asHex($result) : $result; - } - - private function serialize($item) - { - if (is_float($item)) { - echo Utils::es6NumberFormat($item); - - return; - } - - if (null === $item || is_scalar($item)) { - echo json_encode($item, self::JSON_FLAGS); - - return; - } - - if (is_array($item) && ! Utils::isAssoc($item)) { - echo '['; - $next = false; - foreach ($item as $element) { - if ($next) { - echo ','; - } - $next = true; - $this->serialize($element); - } - echo ']'; - - return; - } - - if (is_object($item)) { - $item = (array)$item; - } - - uksort($item, function (string $a, string $b) { - $a = mb_convert_encoding($a, 'UTF-16BE'); - $b = mb_convert_encoding($b, 'UTF-16BE'); - - return strcmp($a, $b); - }); - - echo '{'; - $next = false; - foreach ($item as $key => $value) { - //var_dump($key, $value); - if ($next) { - echo ','; - } - $next = true; - $outKey = json_encode((string)$key, self::JSON_FLAGS); - echo $outKey, ':', $this->serialize($value); - } - echo '}'; - - } -} diff --git a/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php b/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php deleted file mode 100644 index 68b1c50c9..000000000 --- a/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php +++ /dev/null @@ -1,13 +0,0 @@ -= 1e-6) { - $formatted = number_format($number, 7, '.', ''); - $formatted = rtrim($formatted, '.0'); - } else { - $formatted = sprintf('%e', $number); - $parts = explode('e', $formatted); - $parts[0] = rtrim($parts[0], '.0'); - $formatted = implode('e', $parts); - } - - return $sign . $formatted; - } -} -- cgit v1.2.3 From 6315757967245d82227d3886844b9a7567de2c2c Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 14 Mar 2024 11:02:31 +0000 Subject: Revert "use the streams php-jcs library until the floats issue will be fixed upstream. see here for reference https://codeberg.org/streams/streams/issues/151" This reverts commit 81ce67df942d4bf378814677268fe03a29ecc028. --- .../src/JsonCanonicalizator.php | 79 ++++++++++++++++++++++ .../src/JsonCanonicalizatorFactory.php | 13 ++++ .../src/JsonCanonicalizatorInterface.php | 10 +++ .../php-json-canonicalization-scheme/src/Utils.php | 52 ++++++++++++++ 4 files changed, 154 insertions(+) create mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php create mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php create mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorInterface.php create mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/Utils.php (limited to 'vendor/mmccook/php-json-canonicalization-scheme/src') diff --git a/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php b/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php new file mode 100644 index 000000000..6a3c82959 --- /dev/null +++ b/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php @@ -0,0 +1,79 @@ +serialize($data); + + $result = ob_get_clean(); + + return $asHex ? Utils::asHex($result) : $result; + } + + private function serialize($item) + { + if (is_float($item)) { + echo Utils::es6NumberFormat($item); + + return; + } + + if (null === $item || is_scalar($item)) { + echo json_encode($item, self::JSON_FLAGS); + + return; + } + + if (is_array($item) && ! Utils::isAssoc($item)) { + echo '['; + $next = false; + foreach ($item as $element) { + if ($next) { + echo ','; + } + $next = true; + $this->serialize($element); + } + echo ']'; + + return; + } + + if (is_object($item)) { + $item = (array)$item; + } + + uksort($item, function (string $a, string $b) { + $a = mb_convert_encoding($a, 'UTF-16BE'); + $b = mb_convert_encoding($b, 'UTF-16BE'); + + return strcmp($a, $b); + }); + + echo '{'; + $next = false; + foreach ($item as $key => $value) { + //var_dump($key, $value); + if ($next) { + echo ','; + } + $next = true; + $outKey = json_encode((string)$key, self::JSON_FLAGS); + echo $outKey, ':', $this->serialize($value); + } + echo '}'; + + } +} diff --git a/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php b/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php new file mode 100644 index 000000000..68b1c50c9 --- /dev/null +++ b/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php @@ -0,0 +1,13 @@ += 1e-6) { + $formatted = number_format($number, 7, '.', ''); + $formatted = rtrim($formatted, '.0'); + } else { + $formatted = sprintf('%e', $number); + $parts = explode('e', $formatted); + $parts[0] = rtrim($parts[0], '.0'); + $formatted = implode('e', $parts); + } + + return $sign . $formatted; + } +} -- cgit v1.2.3 From 70dfce356b949dce00dba534536be994b1d7761d Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 14 Mar 2024 11:15:20 +0000 Subject: next try to use the streams php-jcs library until the floats issue will be fixed upstream. see here for reference https://codeberg.org/streams/streams/issues/151 --- .../src/JsonCanonicalizator.php | 79 ---------------------- .../src/JsonCanonicalizatorFactory.php | 13 ---- .../src/JsonCanonicalizatorInterface.php | 10 --- .../php-json-canonicalization-scheme/src/Utils.php | 52 -------------- 4 files changed, 154 deletions(-) delete mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php delete mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php delete mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorInterface.php delete mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/Utils.php (limited to 'vendor/mmccook/php-json-canonicalization-scheme/src') diff --git a/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php b/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php deleted file mode 100644 index 6a3c82959..000000000 --- a/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php +++ /dev/null @@ -1,79 +0,0 @@ -serialize($data); - - $result = ob_get_clean(); - - return $asHex ? Utils::asHex($result) : $result; - } - - private function serialize($item) - { - if (is_float($item)) { - echo Utils::es6NumberFormat($item); - - return; - } - - if (null === $item || is_scalar($item)) { - echo json_encode($item, self::JSON_FLAGS); - - return; - } - - if (is_array($item) && ! Utils::isAssoc($item)) { - echo '['; - $next = false; - foreach ($item as $element) { - if ($next) { - echo ','; - } - $next = true; - $this->serialize($element); - } - echo ']'; - - return; - } - - if (is_object($item)) { - $item = (array)$item; - } - - uksort($item, function (string $a, string $b) { - $a = mb_convert_encoding($a, 'UTF-16BE'); - $b = mb_convert_encoding($b, 'UTF-16BE'); - - return strcmp($a, $b); - }); - - echo '{'; - $next = false; - foreach ($item as $key => $value) { - //var_dump($key, $value); - if ($next) { - echo ','; - } - $next = true; - $outKey = json_encode((string)$key, self::JSON_FLAGS); - echo $outKey, ':', $this->serialize($value); - } - echo '}'; - - } -} diff --git a/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php b/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php deleted file mode 100644 index 68b1c50c9..000000000 --- a/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php +++ /dev/null @@ -1,13 +0,0 @@ -= 1e-6) { - $formatted = number_format($number, 7, '.', ''); - $formatted = rtrim($formatted, '.0'); - } else { - $formatted = sprintf('%e', $number); - $parts = explode('e', $formatted); - $parts[0] = rtrim($parts[0], '.0'); - $formatted = implode('e', $parts); - } - - return $sign . $formatted; - } -} -- cgit v1.2.3 From a9d4adaf2360f7d02dace4434e4e62d6ce072327 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 14 Mar 2024 12:30:05 +0000 Subject: Revert "next try to use the streams php-jcs library until the floats issue will be fixed upstream. see here for reference https://codeberg.org/streams/streams/issues/151" This reverts commit 70dfce356b949dce00dba534536be994b1d7761d. --- .../src/JsonCanonicalizator.php | 79 ++++++++++++++++++++++ .../src/JsonCanonicalizatorFactory.php | 13 ++++ .../src/JsonCanonicalizatorInterface.php | 10 +++ .../php-json-canonicalization-scheme/src/Utils.php | 52 ++++++++++++++ 4 files changed, 154 insertions(+) create mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php create mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php create mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorInterface.php create mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/Utils.php (limited to 'vendor/mmccook/php-json-canonicalization-scheme/src') diff --git a/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php b/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php new file mode 100644 index 000000000..6a3c82959 --- /dev/null +++ b/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php @@ -0,0 +1,79 @@ +serialize($data); + + $result = ob_get_clean(); + + return $asHex ? Utils::asHex($result) : $result; + } + + private function serialize($item) + { + if (is_float($item)) { + echo Utils::es6NumberFormat($item); + + return; + } + + if (null === $item || is_scalar($item)) { + echo json_encode($item, self::JSON_FLAGS); + + return; + } + + if (is_array($item) && ! Utils::isAssoc($item)) { + echo '['; + $next = false; + foreach ($item as $element) { + if ($next) { + echo ','; + } + $next = true; + $this->serialize($element); + } + echo ']'; + + return; + } + + if (is_object($item)) { + $item = (array)$item; + } + + uksort($item, function (string $a, string $b) { + $a = mb_convert_encoding($a, 'UTF-16BE'); + $b = mb_convert_encoding($b, 'UTF-16BE'); + + return strcmp($a, $b); + }); + + echo '{'; + $next = false; + foreach ($item as $key => $value) { + //var_dump($key, $value); + if ($next) { + echo ','; + } + $next = true; + $outKey = json_encode((string)$key, self::JSON_FLAGS); + echo $outKey, ':', $this->serialize($value); + } + echo '}'; + + } +} diff --git a/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php b/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php new file mode 100644 index 000000000..68b1c50c9 --- /dev/null +++ b/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php @@ -0,0 +1,13 @@ += 1e-6) { + $formatted = number_format($number, 7, '.', ''); + $formatted = rtrim($formatted, '.0'); + } else { + $formatted = sprintf('%e', $number); + $parts = explode('e', $formatted); + $parts[0] = rtrim($parts[0], '.0'); + $formatted = implode('e', $parts); + } + + return $sign . $formatted; + } +} -- cgit v1.2.3 From 5af3c3577843a6f65c402c27607edca98233c08e Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 15 Mar 2024 17:14:31 +0100 Subject: another attmpt to install streams/php-jcs via composer --- .../src/JsonCanonicalizator.php | 79 ---------------------- .../src/JsonCanonicalizatorFactory.php | 13 ---- .../src/JsonCanonicalizatorInterface.php | 10 --- .../php-json-canonicalization-scheme/src/Utils.php | 52 -------------- 4 files changed, 154 deletions(-) delete mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php delete mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php delete mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorInterface.php delete mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/Utils.php (limited to 'vendor/mmccook/php-json-canonicalization-scheme/src') diff --git a/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php b/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php deleted file mode 100644 index 6a3c82959..000000000 --- a/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php +++ /dev/null @@ -1,79 +0,0 @@ -serialize($data); - - $result = ob_get_clean(); - - return $asHex ? Utils::asHex($result) : $result; - } - - private function serialize($item) - { - if (is_float($item)) { - echo Utils::es6NumberFormat($item); - - return; - } - - if (null === $item || is_scalar($item)) { - echo json_encode($item, self::JSON_FLAGS); - - return; - } - - if (is_array($item) && ! Utils::isAssoc($item)) { - echo '['; - $next = false; - foreach ($item as $element) { - if ($next) { - echo ','; - } - $next = true; - $this->serialize($element); - } - echo ']'; - - return; - } - - if (is_object($item)) { - $item = (array)$item; - } - - uksort($item, function (string $a, string $b) { - $a = mb_convert_encoding($a, 'UTF-16BE'); - $b = mb_convert_encoding($b, 'UTF-16BE'); - - return strcmp($a, $b); - }); - - echo '{'; - $next = false; - foreach ($item as $key => $value) { - //var_dump($key, $value); - if ($next) { - echo ','; - } - $next = true; - $outKey = json_encode((string)$key, self::JSON_FLAGS); - echo $outKey, ':', $this->serialize($value); - } - echo '}'; - - } -} diff --git a/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php b/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php deleted file mode 100644 index 68b1c50c9..000000000 --- a/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php +++ /dev/null @@ -1,13 +0,0 @@ -= 1e-6) { - $formatted = number_format($number, 7, '.', ''); - $formatted = rtrim($formatted, '.0'); - } else { - $formatted = sprintf('%e', $number); - $parts = explode('e', $formatted); - $parts[0] = rtrim($parts[0], '.0'); - $formatted = implode('e', $parts); - } - - return $sign . $formatted; - } -} -- cgit v1.2.3 From 8fc0210428d267df4d0e80c18ad35858202b538b Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 16 Mar 2024 11:54:45 +0000 Subject: Revert "another attmpt to install streams/php-jcs via composer" This reverts commit 5af3c3577843a6f65c402c27607edca98233c08e --- .../src/JsonCanonicalizator.php | 79 ++++++++++++++++++++++ .../src/JsonCanonicalizatorFactory.php | 13 ++++ .../src/JsonCanonicalizatorInterface.php | 10 +++ .../php-json-canonicalization-scheme/src/Utils.php | 52 ++++++++++++++ 4 files changed, 154 insertions(+) create mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php create mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php create mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorInterface.php create mode 100644 vendor/mmccook/php-json-canonicalization-scheme/src/Utils.php (limited to 'vendor/mmccook/php-json-canonicalization-scheme/src') diff --git a/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php b/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php new file mode 100644 index 000000000..6a3c82959 --- /dev/null +++ b/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizator.php @@ -0,0 +1,79 @@ +serialize($data); + + $result = ob_get_clean(); + + return $asHex ? Utils::asHex($result) : $result; + } + + private function serialize($item) + { + if (is_float($item)) { + echo Utils::es6NumberFormat($item); + + return; + } + + if (null === $item || is_scalar($item)) { + echo json_encode($item, self::JSON_FLAGS); + + return; + } + + if (is_array($item) && ! Utils::isAssoc($item)) { + echo '['; + $next = false; + foreach ($item as $element) { + if ($next) { + echo ','; + } + $next = true; + $this->serialize($element); + } + echo ']'; + + return; + } + + if (is_object($item)) { + $item = (array)$item; + } + + uksort($item, function (string $a, string $b) { + $a = mb_convert_encoding($a, 'UTF-16BE'); + $b = mb_convert_encoding($b, 'UTF-16BE'); + + return strcmp($a, $b); + }); + + echo '{'; + $next = false; + foreach ($item as $key => $value) { + //var_dump($key, $value); + if ($next) { + echo ','; + } + $next = true; + $outKey = json_encode((string)$key, self::JSON_FLAGS); + echo $outKey, ':', $this->serialize($value); + } + echo '}'; + + } +} diff --git a/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php b/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php new file mode 100644 index 000000000..68b1c50c9 --- /dev/null +++ b/vendor/mmccook/php-json-canonicalization-scheme/src/JsonCanonicalizatorFactory.php @@ -0,0 +1,13 @@ += 1e-6) { + $formatted = number_format($number, 7, '.', ''); + $formatted = rtrim($formatted, '.0'); + } else { + $formatted = sprintf('%e', $number); + $parts = explode('e', $formatted); + $parts[0] = rtrim($parts[0], '.0'); + $formatted = implode('e', $parts); + } + + return $sign . $formatted; + } +} -- cgit v1.2.3 From 42b0205ad0a4566b35057563c4dcf378f0d390ac Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 16 Mar 2024 15:47:25 +0000 Subject: apply the streams fixes manually until the addition of the streams library is sorted --- vendor/mmccook/php-json-canonicalization-scheme/src/Utils.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'vendor/mmccook/php-json-canonicalization-scheme/src') diff --git a/vendor/mmccook/php-json-canonicalization-scheme/src/Utils.php b/vendor/mmccook/php-json-canonicalization-scheme/src/Utils.php index 57079df3b..755ba3320 100644 --- a/vendor/mmccook/php-json-canonicalization-scheme/src/Utils.php +++ b/vendor/mmccook/php-json-canonicalization-scheme/src/Utils.php @@ -38,12 +38,14 @@ class Utils } if ($number < 1e+21 && $number >= 1e-6) { - $formatted = number_format($number, 7, '.', ''); - $formatted = rtrim($formatted, '.0'); + $formatted = sprintf('%F', $number); + $formatted = rtrim($formatted, '0'); // first remove all zeros at the end + $formatted = rtrim($formatted, '.'); // If the string now ends with a decimal point, then remove it, too. } else { $formatted = sprintf('%e', $number); $parts = explode('e', $formatted); - $parts[0] = rtrim($parts[0], '.0'); + $parts[0] = rtrim($parts[0], '0'); + $parts[0] = rtrim($parts[0], '.'); $formatted = implode('e', $parts); } -- cgit v1.2.3