Skip to content

[stable20] Replace abandoned log normalizer with our fork #543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChristophWurst merged 1 commit into from
Dec 3, 2020
Merged

[stable20] Replace abandoned log normalizer with our fork #543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
111 changes: 57 additions & 54 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion composer/autoload_classmap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion composer/autoload_psr4.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down
15 changes: 9 additions & 6 deletions composer/autoload_static.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,10 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
array (
'OpenStack\\' => 10,
),
'N' =>
array (
'Nextcloud\\LogNormalizer\\' => 24,
),
'M' =>
array (
'MicrosoftAzure\\Storage\\Common\\' => 30,
Expand All @@ -126,7 +130,6 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
),
'I' =>
array (
'InterfaSys\\LogNormalizer\\' => 25,
'Icewind\\Streams\\Tests\\' => 22,
'Icewind\\Streams\\' => 16,
'ID3Parser\\' => 10,
Expand Down Expand Up @@ -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',
Expand All @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down
113 changes: 58 additions & 55 deletions composer/installed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "[email protected]",
"homepage": "http://www.interfasys.ch",
"role": "Developer"
},
{
"name": "Jordi Boggiano",
"email": "[email protected]",
"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",
Expand Down Expand Up @@ -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": "[email protected]"
},
{
"name": "Olivier Paroz",
"email": "[email protected]",
"homepage": "http://www.interfasys.ch",
"role": "Developer"
},
{
"name": "Jordi Boggiano",
"email": "[email protected]",
"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",
Expand Down
10 changes: 0 additions & 10 deletions interfasys/lognormalizer/AUTHORS.md
View file
Open in desktop

This file was deleted.

0 interfasys/lognormalizer/COPYING → nextcloud/lognormalizer/COPYING
View file
Open in desktop
File renamed without changes.
Loading