Adhere feedback

diff --git a/monolog/composer.json b/monolog/composer.json
index d87f551fbc95fdbf7fdc0bb7b7056923d217554e..d4614bb44d60a960c4aac3f589670b2b57611524 100644 (file)
--- 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 a0e885966fee34a683b2506eeebc1437e6fca2c5..b2a1667f84f9ba3c6f9f2eb003d0d07d336fbd7a 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\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 1c6f0bf1ce82b89c4776b2c5c80585b09403c06a..cab297ae480682cab916d3f887725f819ec8d6a1 100644 (file)
--- 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 bb5428afaab6f3506853392bd9f3fd0836e0b080..b82bd67a1d923b8873de6381437655c09e58efe4 100644 (file)
--- 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 706092031f63c55d984b3f1d339dce6525ae75bb..6a85d4b5a83379b5851f152d3e5809522212f02a 100644 (file)
--- 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 afcfb31e10bb30e8116dbde09edf3e2794da87e8..551ee81ecb74cf3ef2fd06a7267360eb7db6eacc 100644 (file)
--- 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 85bd86fdeb4c7528b4f75cf1bff16edb87e3dcdb..e871958aeef56cc85b8b45cc3dbf471281a9ac91 100644 (file)
--- 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',