From 101a22c0cd501b90792784471a0266f83eaeece8 Mon Sep 17 00:00:00 2001 From: Philipp Date: Mon, 17 Oct 2022 22:38:08 +0200 Subject: [PATCH] Adhere feedback --- monolog/composer.json | 7 ++++++- 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, 22 insertions(+), 4 deletions(-) diff --git a/monolog/composer.json b/monolog/composer.json index d87f551f..d4614bb4 100644 --- a/monolog/composer.json +++ b/monolog/composer.json @@ -10,8 +10,13 @@ "role": "Developer" } ], + "autoload": { + "psr-4": { + "Friendica\\Addon\\Monolog\\": "src/" + } + }, "require": { - "php": ">=7.0", + "php": ">=7.0", "monolog/monolog": "^3.2" }, "license": "3-clause BSD license", diff --git a/monolog/monolog.php b/monolog/monolog.php index a0e88596..b2a1667f 100644 --- a/monolog/monolog.php +++ b/monolog/monolog.php @@ -8,7 +8,7 @@ use Friendica\App; use Friendica\Core\Hook; -use Friendica\Addon\monolog\src\IntrospectionProcessor; +use Friendica\Addon\Monolog\IntrospectionProcessor; use Friendica\DI; use Psr\Log\LogLevel; diff --git a/monolog/src/DevelopHandler.php b/monolog/src/DevelopHandler.php index 1c6f0bf1..cab297ae 100644 --- a/monolog/src/DevelopHandler.php +++ b/monolog/src/DevelopHandler.php @@ -19,7 +19,7 @@ * */ -namespace Friendica\Addon\monolog\src; +namespace Friendica\Addon\Monolog; use Friendica\App\Request; use Monolog\Handler; diff --git a/monolog/src/IntrospectionProcessor.php b/monolog/src/IntrospectionProcessor.php index bb5428af..b82bd67a 100644 --- a/monolog/src/IntrospectionProcessor.php +++ b/monolog/src/IntrospectionProcessor.php @@ -19,7 +19,7 @@ * */ -namespace Friendica\Addon\monolog\src; +namespace Friendica\Addon\Monolog; 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 70609203..6a85d4b5 100644 --- a/monolog/vendor/composer/autoload_classmap.php +++ b/monolog/vendor/composer/autoload_classmap.php @@ -6,6 +6,8 @@ $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 afcfb31e..551ee81e 100644 --- a/monolog/vendor/composer/autoload_psr4.php +++ b/monolog/vendor/composer/autoload_psr4.php @@ -8,4 +8,5 @@ $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 85bd86fd..e871958a 100644 --- a/monolog/vendor/composer/autoload_static.php +++ b/monolog/vendor/composer/autoload_static.php @@ -15,6 +15,10 @@ class ComposerStaticInitMonologAddon array ( 'Monolog\\' => 8, ), + 'F' => + array ( + 'Friendica\\Addon\\Monolog\\' => 24, + ), ); public static $prefixDirsPsr4 = array ( @@ -26,9 +30,15 @@ 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',