From 6d2b7459b5ab475da013d463f71e10cbb07ad0b6 Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Fri, 21 Oct 2022 00:05:52 +0200
Subject: [PATCH] [monolog] Remove non-compliant PSR4 config
---
monolog/composer.json | 5 -----
monolog/monolog.php | 2 +-
monolog/src/DevelopHandler.php | 2 +-
monolog/src/IntrospectionProcessor.php | 2 +-
monolog/vendor/composer/autoload_classmap.php | 2 --
monolog/vendor/composer/autoload_psr4.php | 1 -
monolog/vendor/composer/autoload_static.php | 10 ----------
7 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/monolog/composer.json b/monolog/composer.json
index f9d8d4b3..9c7f32c3 100644
--- a/monolog/composer.json
+++ b/monolog/composer.json
@@ -10,11 +10,6 @@
"role": "Developer"
}
],
- "autoload": {
- "psr-4": {
- "Friendica\\Addon\\Monolog\\": "src/"
- }
- },
"require": {
"php": ">=7.0",
"monolog/monolog": "^3.2"
diff --git a/monolog/monolog.php b/monolog/monolog.php
index 0df9ac0b..f89feafe 100644
--- a/monolog/monolog.php
+++ b/monolog/monolog.php
@@ -8,7 +8,7 @@
use Friendica\App;
use Friendica\Core\Hook;
-use Friendica\Addon\Monolog\IntrospectionProcessor;
+use Friendica\Addon\monolog\src\IntrospectionProcessor;
use Friendica\DI;
use Psr\Log\LogLevel;
diff --git a/monolog/src/DevelopHandler.php b/monolog/src/DevelopHandler.php
index cab297ae..1c6f0bf1 100644
--- a/monolog/src/DevelopHandler.php
+++ b/monolog/src/DevelopHandler.php
@@ -19,7 +19,7 @@
*
*/
-namespace Friendica\Addon\Monolog;
+namespace Friendica\Addon\monolog\src;
use Friendica\App\Request;
use Monolog\Handler;
diff --git a/monolog/src/IntrospectionProcessor.php b/monolog/src/IntrospectionProcessor.php
index b82bd67a..bb5428af 100644
--- a/monolog/src/IntrospectionProcessor.php
+++ b/monolog/src/IntrospectionProcessor.php
@@ -19,7 +19,7 @@
*
*/
-namespace Friendica\Addon\Monolog;
+namespace Friendica\Addon\monolog\src;
use Friendica\Core\Logger\Util\Introspection;
use Monolog\Logger;
diff --git a/monolog/vendor/composer/autoload_classmap.php b/monolog/vendor/composer/autoload_classmap.php
index 6a85d4b5..70609203 100644
--- a/monolog/vendor/composer/autoload_classmap.php
+++ b/monolog/vendor/composer/autoload_classmap.php
@@ -6,8 +6,6 @@ $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir);
return array(
- 'Friendica\\Addon\\Monolog\\DevelopHandler' => $baseDir . '/src/DevelopHandler.php',
- 'Friendica\\Addon\\Monolog\\IntrospectionProcessor' => $baseDir . '/src/IntrospectionProcessor.php',
'Monolog\\Attribute\\AsMonologProcessor' => $vendorDir . '/monolog/monolog/src/Monolog/Attribute/AsMonologProcessor.php',
'Monolog\\DateTimeImmutable' => $vendorDir . '/monolog/monolog/src/Monolog/DateTimeImmutable.php',
'Monolog\\ErrorHandler' => $vendorDir . '/monolog/monolog/src/Monolog/ErrorHandler.php',
diff --git a/monolog/vendor/composer/autoload_psr4.php b/monolog/vendor/composer/autoload_psr4.php
index 551ee81e..afcfb31e 100644
--- a/monolog/vendor/composer/autoload_psr4.php
+++ b/monolog/vendor/composer/autoload_psr4.php
@@ -8,5 +8,4 @@ $baseDir = dirname($vendorDir);
return array(
'Psr\\Log\\' => array($vendorDir . '/psr/log/src'),
'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
- 'Friendica\\Addon\\Monolog\\' => array($baseDir . '/src'),
);
diff --git a/monolog/vendor/composer/autoload_static.php b/monolog/vendor/composer/autoload_static.php
index e871958a..85bd86fd 100644
--- a/monolog/vendor/composer/autoload_static.php
+++ b/monolog/vendor/composer/autoload_static.php
@@ -15,10 +15,6 @@ class ComposerStaticInitMonologAddon
array (
'Monolog\\' => 8,
),
- 'F' =>
- array (
- 'Friendica\\Addon\\Monolog\\' => 24,
- ),
);
public static $prefixDirsPsr4 = array (
@@ -30,15 +26,9 @@ class ComposerStaticInitMonologAddon
array (
0 => __DIR__ . '/..' . '/monolog/monolog/src/Monolog',
),
- 'Friendica\\Addon\\Monolog\\' =>
- array (
- 0 => __DIR__ . '/../..' . '/src',
- ),
);
public static $classMap = array (
- 'Friendica\\Addon\\Monolog\\DevelopHandler' => __DIR__ . '/../..' . '/src/DevelopHandler.php',
- 'Friendica\\Addon\\Monolog\\IntrospectionProcessor' => __DIR__ . '/../..' . '/src/IntrospectionProcessor.php',
'Monolog\\Attribute\\AsMonologProcessor' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Attribute/AsMonologProcessor.php',
'Monolog\\DateTimeImmutable' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/DateTimeImmutable.php',
'Monolog\\ErrorHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/ErrorHandler.php',