[monolog] Remove non-compliant PSR4 config

diff --git a/monolog/composer.json b/monolog/composer.json
index f9d8d4b30f769212ff7d8fb6b5ce6459a610f48b..9c7f32c3e39255f5ee93ec82948c39979df15e7d 100644 (file)
--- 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 0df9ac0b5a36459be73afce921e018e7e8e8592a..f89feafe1ebe858de696153208493cee8266077d 100644 (file)
--- 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 cab297ae480682cab916d3f887725f819ec8d6a1..1c6f0bf1ce82b89c4776b2c5c80585b09403c06a 100644 (file)
--- 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 b82bd67a1d923b8873de6381437655c09e58efe4..bb5428afaab6f3506853392bd9f3fd0836e0b080 100644 (file)
--- 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 6a85d4b5a83379b5851f152d3e5809522212f02a..706092031f63c55d984b3f1d339dce6525ae75bb 100644 (file)
--- 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 551ee81ecb74cf3ef2fd06a7267360eb7db6eacc..afcfb31e10bb30e8116dbde09edf3e2794da87e8 100644 (file)
--- 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 e871958aeef56cc85b8b45cc3dbf471281a9ac91..85bd86fdeb4c7528b4f75cf1bff16edb87e3dcdb 100644 (file)
--- 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',