diff --git a/.gitignore b/.gitignore index dc13ce55a..355342838 100644 --- a/.gitignore +++ b/.gitignore @@ -211,14 +211,13 @@ nikic/php-parser/grammar/tokens.y nikic/php-parser/phpunit.xml.dist -interfasys/lognormalizer/.gitignore -interfasys/lognormalizer/.travis.yml -interfasys/lognormalizer/.scrutinizer.yml -interfasys/lognormalizer/CHANGELOG.md -interfasys/lognormalizer/README.md -interfasys/lognormalizer/composer.json -interfasys/lognormalizer/phpunit.xml -interfasys/lognormalizer/tests +nextcloud/lognormalizer/.gitignore +nextcloud/lognormalizer/.travis.yml +nextcloud/lognormalizer/CHANGELOG.md +nextcloud/lognormalizer/README.md +nextcloud/lognormalizer/composer.json +nextcloud/lognormalizer/phpunit.xml +nextcloud/lognormalizer/tests deepdiver1975/tarstreamer/.gitignore deepdiver1975/tarstreamer/.travis.yml diff --git a/composer.json b/composer.json index 793dd5a9c..084b854ec 100644 --- a/composer.json +++ b/composer.json @@ -22,10 +22,10 @@ "guzzlehttp/guzzle": "6.5.2", "icewind/searchdav": "^2.0.0", "icewind/streams": "v0.7.1", - "interfasys/lognormalizer": "^v1.0", "jeremeamia/superclosure": "^2.4", "league/flysystem": "^1.0", "microsoft/azure-storage-blob": "1.5.0", + "nextcloud/lognormalizer": "^1.0", "nikic/php-parser": "^4.2", "patchwork/jsqueeze": "^2.0", "patchwork/utf8": "1.3.1", diff --git a/composer.lock b/composer.lock index 8cf146008..a5290c911 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b4764fd6a98b2b95475d06d646177637", + "content-hash": "57dab65713c8431b9d8f67cd6eddca77", "packages": [ { "name": "aws/aws-sdk-php", @@ -1608,59 +1608,6 @@ "description": "A set of generic stream wrappers", "time": "2019-02-15T12:57:29+00:00" }, - { - "name": "interfasys/lognormalizer", - "version": "v1.0", - "source": { - "type": "git", - "url": "https://github.com/interfasys/lognormalizer.git", - "reference": "d5e4c95e0b0ecc886b78aafda3773b3bcf2ec116" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/interfasys/lognormalizer/zipball/d5e4c95e0b0ecc886b78aafda3773b3bcf2ec116", - "reference": "d5e4c95e0b0ecc886b78aafda3773b3bcf2ec116", - "shasum": "" - }, - "require": { - "php": ">=5.4.0" - }, - "require-dev": { - "codacy/coverage": "dev-master", - "codeclimate/php-test-reporter": "dev-master", - "phpunit/phpunit": "4.*" - }, - "type": "library", - "autoload": { - "psr-4": { - "InterfaSys\\LogNormalizer\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "AGPL-3.0" - ], - "authors": [ - { - "name": "Olivier Paroz", - "email": "dev-lognormalizer@interfasys.ch", - "homepage": "http://www.interfasys.ch", - "role": "Developer" - }, - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "role": "Developer" - } - ], - "description": "Parses variables and converts them to string so that they can be logged", - "homepage": "https://github.com/interfasys/lognormalizer", - "keywords": [ - "log", - "normalizer" - ], - "time": "2015-08-01T16:27:37+00:00" - }, { "name": "jeremeamia/SuperClosure", "version": "2.4.0", @@ -2233,6 +2180,62 @@ ], "time": "2019-12-30T18:03:34+00:00" }, + { + "name": "nextcloud/lognormalizer", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/nextcloud/lognormalizer.git", + "reference": "87445d69225c247aaff64643b1fc83c6d6df741f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nextcloud/lognormalizer/zipball/87445d69225c247aaff64643b1fc83c6d6df741f", + "reference": "87445d69225c247aaff64643b1fc83c6d6df741f", + "shasum": "" + }, + "require": { + "ext-json": "*", + "php": ">=7.2.0" + }, + "require-dev": { + "phpunit/phpunit": "8.*" + }, + "type": "library", + "autoload": { + "psr-4": { + "Nextcloud\\LogNormalizer\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "AGPL-3.0" + ], + "authors": [ + { + "name": "Christoph Wurst", + "email": "christoph@winzerhof-wurst.at" + }, + { + "name": "Olivier Paroz", + "email": "dev-lognormalizer@interfasys.ch", + "homepage": "http://www.interfasys.ch", + "role": "Developer" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "role": "Developer" + } + ], + "description": "Parses variables and converts them to string so that they can be logged", + "homepage": "https://github.com/interfasys/lognormalizer", + "keywords": [ + "log", + "normalizer" + ], + "time": "2020-12-02T09:34:47+00:00" + }, { "name": "nikic/php-parser", "version": "v4.3.0", diff --git a/composer/autoload_classmap.php b/composer/autoload_classmap.php index 584d3e2af..9bc05e7a6 100644 --- a/composer/autoload_classmap.php +++ b/composer/autoload_classmap.php @@ -1387,7 +1387,6 @@ 'Icewind\\Streams\\Url' => $vendorDir . '/icewind/streams/src/Url.php', 'Icewind\\Streams\\UrlCallback' => $vendorDir . '/icewind/streams/src/UrlCallBack.php', 'Icewind\\Streams\\Wrapper' => $vendorDir . '/icewind/streams/src/Wrapper.php', - 'InterfaSys\\LogNormalizer\\Normalizer' => $vendorDir . '/interfasys/lognormalizer/src/Normalizer.php', 'JmesPath\\AstRuntime' => $vendorDir . '/mtdowling/jmespath.php/src/AstRuntime.php', 'JmesPath\\CompilerRuntime' => $vendorDir . '/mtdowling/jmespath.php/src/CompilerRuntime.php', 'JmesPath\\DebugRuntime' => $vendorDir . '/mtdowling/jmespath.php/src/DebugRuntime.php', @@ -1648,6 +1647,7 @@ 'MicrosoftAzure\\Storage\\Common\\Models\\SignedIdentifier' => $vendorDir . '/microsoft/azure-storage-common/src/Common/Models/SignedIdentifier.php', 'MicrosoftAzure\\Storage\\Common\\Models\\TransactionalMD5Trait' => $vendorDir . '/microsoft/azure-storage-common/src/Common/Models/TransactionalMD5Trait.php', 'MicrosoftAzure\\Storage\\Common\\SharedAccessSignatureHelper' => $vendorDir . '/microsoft/azure-storage-common/src/Common/SharedAccessSignatureHelper.php', + 'Nextcloud\\LogNormalizer\\Normalizer' => $vendorDir . '/nextcloud/lognormalizer/src/Normalizer.php', 'Normalizer' => $vendorDir . '/patchwork/utf8/src/Normalizer.php', 'OS_Guess' => $vendorDir . '/pear/pear-core-minimal/src/OS/Guess.php', 'OpenStack\\BlockStorage\\v2\\Api' => $vendorDir . '/php-opencloud/openstack/src/BlockStorage/v2/Api.php', diff --git a/composer/autoload_psr4.php b/composer/autoload_psr4.php index ee17287ea..3029be0fd 100644 --- a/composer/autoload_psr4.php +++ b/composer/autoload_psr4.php @@ -52,13 +52,13 @@ 'PhpParser\\' => array($vendorDir . '/nikic/php-parser/lib/PhpParser'), 'Patchwork\\' => array($vendorDir . '/patchwork/jsqueeze/src', $vendorDir . '/patchwork/utf8/src/Patchwork'), 'OpenStack\\' => array($vendorDir . '/php-opencloud/openstack/src'), + 'Nextcloud\\LogNormalizer\\' => array($vendorDir . '/nextcloud/lognormalizer/src'), 'MicrosoftAzure\\Storage\\Common\\' => array($vendorDir . '/microsoft/azure-storage-common/src/Common'), 'MicrosoftAzure\\Storage\\Blob\\' => array($vendorDir . '/microsoft/azure-storage-blob/src/Blob'), 'League\\Uri\\' => array($vendorDir . '/league/uri/src', $vendorDir . '/league/uri-components/src', $vendorDir . '/league/uri-interfaces/src'), 'League\\Flysystem\\' => array($vendorDir . '/league/flysystem/src'), 'JsonSchema\\' => array($vendorDir . '/justinrainbow/json-schema/src/JsonSchema'), 'JmesPath\\' => array($vendorDir . '/mtdowling/jmespath.php/src'), - 'InterfaSys\\LogNormalizer\\' => array($vendorDir . '/interfasys/lognormalizer/src'), 'Icewind\\Streams\\Tests\\' => array($vendorDir . '/icewind/streams/tests'), 'Icewind\\Streams\\' => array($vendorDir . '/icewind/streams/src'), 'ID3Parser\\' => array($vendorDir . '/christophwurst/id3parser/src'), diff --git a/composer/autoload_static.php b/composer/autoload_static.php index f81d8e3a7..965d47166 100644 --- a/composer/autoload_static.php +++ b/composer/autoload_static.php @@ -109,6 +109,10 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652 array ( 'OpenStack\\' => 10, ), + 'N' => + array ( + 'Nextcloud\\LogNormalizer\\' => 24, + ), 'M' => array ( 'MicrosoftAzure\\Storage\\Common\\' => 30, @@ -126,7 +130,6 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652 ), 'I' => array ( - 'InterfaSys\\LogNormalizer\\' => 25, 'Icewind\\Streams\\Tests\\' => 22, 'Icewind\\Streams\\' => 16, 'ID3Parser\\' => 10, @@ -365,6 +368,10 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652 array ( 0 => __DIR__ . '/..' . '/php-opencloud/openstack/src', ), + 'Nextcloud\\LogNormalizer\\' => + array ( + 0 => __DIR__ . '/..' . '/nextcloud/lognormalizer/src', + ), 'MicrosoftAzure\\Storage\\Common\\' => array ( 0 => __DIR__ . '/..' . '/microsoft/azure-storage-common/src/Common', @@ -391,10 +398,6 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652 array ( 0 => __DIR__ . '/..' . '/mtdowling/jmespath.php/src', ), - 'InterfaSys\\LogNormalizer\\' => - array ( - 0 => __DIR__ . '/..' . '/interfasys/lognormalizer/src', - ), 'Icewind\\Streams\\Tests\\' => array ( 0 => __DIR__ . '/..' . '/icewind/streams/tests', @@ -1913,7 +1916,6 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652 'Icewind\\Streams\\Url' => __DIR__ . '/..' . '/icewind/streams/src/Url.php', 'Icewind\\Streams\\UrlCallback' => __DIR__ . '/..' . '/icewind/streams/src/UrlCallBack.php', 'Icewind\\Streams\\Wrapper' => __DIR__ . '/..' . '/icewind/streams/src/Wrapper.php', - 'InterfaSys\\LogNormalizer\\Normalizer' => __DIR__ . '/..' . '/interfasys/lognormalizer/src/Normalizer.php', 'JmesPath\\AstRuntime' => __DIR__ . '/..' . '/mtdowling/jmespath.php/src/AstRuntime.php', 'JmesPath\\CompilerRuntime' => __DIR__ . '/..' . '/mtdowling/jmespath.php/src/CompilerRuntime.php', 'JmesPath\\DebugRuntime' => __DIR__ . '/..' . '/mtdowling/jmespath.php/src/DebugRuntime.php', @@ -2174,6 +2176,7 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652 'MicrosoftAzure\\Storage\\Common\\Models\\SignedIdentifier' => __DIR__ . '/..' . '/microsoft/azure-storage-common/src/Common/Models/SignedIdentifier.php', 'MicrosoftAzure\\Storage\\Common\\Models\\TransactionalMD5Trait' => __DIR__ . '/..' . '/microsoft/azure-storage-common/src/Common/Models/TransactionalMD5Trait.php', 'MicrosoftAzure\\Storage\\Common\\SharedAccessSignatureHelper' => __DIR__ . '/..' . '/microsoft/azure-storage-common/src/Common/SharedAccessSignatureHelper.php', + 'Nextcloud\\LogNormalizer\\Normalizer' => __DIR__ . '/..' . '/nextcloud/lognormalizer/src/Normalizer.php', 'Normalizer' => __DIR__ . '/..' . '/patchwork/utf8/src/Normalizer.php', 'OS_Guess' => __DIR__ . '/..' . '/pear/pear-core-minimal/src/OS/Guess.php', 'OpenStack\\BlockStorage\\v2\\Api' => __DIR__ . '/..' . '/php-opencloud/openstack/src/BlockStorage/v2/Api.php', diff --git a/composer/installed.json b/composer/installed.json index bd290c199..2b5b8828a 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -1651,61 +1651,6 @@ ], "description": "A set of generic stream wrappers" }, - { - "name": "interfasys/lognormalizer", - "version": "v1.0", - "version_normalized": "1.0.0.0", - "source": { - "type": "git", - "url": "https://github.com/interfasys/lognormalizer.git", - "reference": "d5e4c95e0b0ecc886b78aafda3773b3bcf2ec116" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/interfasys/lognormalizer/zipball/d5e4c95e0b0ecc886b78aafda3773b3bcf2ec116", - "reference": "d5e4c95e0b0ecc886b78aafda3773b3bcf2ec116", - "shasum": "" - }, - "require": { - "php": ">=5.4.0" - }, - "require-dev": { - "codacy/coverage": "dev-master", - "codeclimate/php-test-reporter": "dev-master", - "phpunit/phpunit": "4.*" - }, - "time": "2015-08-01T16:27:37+00:00", - "type": "library", - "installation-source": "dist", - "autoload": { - "psr-4": { - "InterfaSys\\LogNormalizer\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "AGPL-3.0" - ], - "authors": [ - { - "name": "Olivier Paroz", - "email": "dev-lognormalizer@interfasys.ch", - "homepage": "http://www.interfasys.ch", - "role": "Developer" - }, - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "role": "Developer" - } - ], - "description": "Parses variables and converts them to string so that they can be logged", - "homepage": "https://github.com/interfasys/lognormalizer", - "keywords": [ - "log", - "normalizer" - ] - }, { "name": "jeremeamia/SuperClosure", "version": "2.4.0", @@ -2296,6 +2241,64 @@ "jsonpath" ] }, + { + "name": "nextcloud/lognormalizer", + "version": "v1.0.0", + "version_normalized": "1.0.0.0", + "source": { + "type": "git", + "url": "https://github.com/nextcloud/lognormalizer.git", + "reference": "87445d69225c247aaff64643b1fc83c6d6df741f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nextcloud/lognormalizer/zipball/87445d69225c247aaff64643b1fc83c6d6df741f", + "reference": "87445d69225c247aaff64643b1fc83c6d6df741f", + "shasum": "" + }, + "require": { + "ext-json": "*", + "php": ">=7.2.0" + }, + "require-dev": { + "phpunit/phpunit": "8.*" + }, + "time": "2020-12-02T09:34:47+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-4": { + "Nextcloud\\LogNormalizer\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "AGPL-3.0" + ], + "authors": [ + { + "name": "Christoph Wurst", + "email": "christoph@winzerhof-wurst.at" + }, + { + "name": "Olivier Paroz", + "email": "dev-lognormalizer@interfasys.ch", + "homepage": "http://www.interfasys.ch", + "role": "Developer" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "role": "Developer" + } + ], + "description": "Parses variables and converts them to string so that they can be logged", + "homepage": "https://github.com/interfasys/lognormalizer", + "keywords": [ + "log", + "normalizer" + ] + }, { "name": "nikic/php-parser", "version": "v4.3.0", diff --git a/interfasys/lognormalizer/AUTHORS.md b/interfasys/lognormalizer/AUTHORS.md deleted file mode 100644 index a00940ecb..000000000 --- a/interfasys/lognormalizer/AUTHORS.md +++ /dev/null @@ -1,10 +0,0 @@ -# Authors - -## Current - -* Olivier Paroz: - -## Original author - -* Jordi Boggiano - diff --git a/interfasys/lognormalizer/COPYING b/nextcloud/lognormalizer/COPYING similarity index 100% rename from interfasys/lognormalizer/COPYING rename to nextcloud/lognormalizer/COPYING diff --git a/interfasys/lognormalizer/src/Normalizer.php b/nextcloud/lognormalizer/src/Normalizer.php similarity index 90% rename from interfasys/lognormalizer/src/Normalizer.php rename to nextcloud/lognormalizer/src/Normalizer.php index 9f6381fee..a0bb87255 100644 --- a/interfasys/lognormalizer/src/Normalizer.php +++ b/nextcloud/lognormalizer/src/Normalizer.php @@ -12,12 +12,14 @@ * @copyright Jordi Boggiano 2014-2015 */ -namespace InterfaSys\LogNormalizer; +namespace Nextcloud\LogNormalizer; + +use Throwable; /** * Converts any variable to a String * - * @package InterfaSys\LogNormalizer + * @package Nextcloud\LogNormalizer */ class Normalizer { @@ -74,10 +76,10 @@ public function format(&$data) { /** * Converts Objects, Arrays, Dates and Exceptions to a String or an Array * - * @uses InterfaSys\LogNormalizer\Normalizer::normalizeTraversable - * @uses InterfaSys\LogNormalizer\Normalizer::normalizeDate - * @uses InterfaSys\LogNormalizer\Normalizer::normalizeObject - * @uses InterfaSys\LogNormalizer\Normalizer::normalizeResource + * @uses Nextcloud\LogNormalizer\Normalizer::normalizeTraversable + * @uses Nextcloud\LogNormalizer\Normalizer::normalizeDate + * @uses Nextcloud\LogNormalizer\Normalizer::normalizeObject + * @uses Nextcloud\LogNormalizer\Normalizer::normalizeResource * * @param $data * @param int $depth @@ -177,7 +179,7 @@ private function normalizeFloat($data) { /** * Returns an array containing normalized elements * - * @used-by InterfaSys\LogNormalizer\Normalizer::normalize + * @used-by Nextcloud\LogNormalizer\Normalizer::normalize * * @param $data * @param int $depth @@ -224,7 +226,7 @@ private function normalizeTraversableElement($data, $depth) { /** * Converts a date to String * - * @used-by InterfaSys\LogNormalizer\Normalizer::normalize + * @used-by Nextcloud\LogNormalizer\Normalizer::normalize * * @param mixed $data * @@ -243,7 +245,7 @@ private function normalizeDate($data) { * * We don't convert to json here as we would double encode them * - * @used-by InterfaSys\LogNormalizer\Normalizer::normalize + * @used-by Nextcloud\LogNormalizer\Normalizer::normalize * * @param mixed $data * @param int $depth @@ -252,7 +254,7 @@ private function normalizeDate($data) { */ private function normalizeObject($data, $depth) { if (is_object($data)) { - if ($data instanceof \Exception) { + if ($data instanceof Throwable) { return $this->normalizeException($data); } // We don't need to go too deep in the recursion @@ -275,11 +277,11 @@ private function normalizeObject($data, $depth) { /** * Converts an Exception to String * - * @param \Exception $exception + * @param Throwable $exception * * @return string[] */ - private function normalizeException(\Exception $exception) { + private function normalizeException(Throwable $exception) { $data = [ 'class' => get_class($exception), 'message' => $exception->getMessage(), @@ -311,7 +313,7 @@ private function getObjetName($object) { /** * Converts a resource to a String * - * @used-by InterfaSys\LogNormalizer\Normalizer::normalize + * @used-by Nextcloud\LogNormalizer\Normalizer::normalize * * @param $data *