friendica/friendica-addons
7
2
Fork 14
Code Issues 3 Pull requests 3 Releases 16 Wiki Activity

Merge pull request #1296 from nupplaphil/bug/monolog_psr4

Browse source 
[monolog] Remove non-compliant PSR4 config
This commit is contained in:
Hypolite Petovan 2022-10-21 08:37:11 -04:00 committed by GitHub
parent 05fed0bd6f 6d2b7459b5
commit 99e33145db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 3 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
monolog/composer.json
View file

@ -10,11 +10,6 @@
"role": "Developer" "role": "Developer"
} }
], ],
"autoload": {
"psr-4": {
"Friendica\\Addon\\Monolog\\": "src/"
}
},
"require": { "require": {
"php": ">=7.0", "php": ">=7.0",
"monolog/monolog": "^3.2" "monolog/monolog": "^3.2"

2
monolog/monolog.php
View file

@ -8,7 +8,7 @@
use Friendica\App; use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Addon\Monolog\IntrospectionProcessor; use Friendica\Addon\monolog\src\IntrospectionProcessor;
use Friendica\DI; use Friendica\DI;
use Psr\Log\LogLevel; use Psr\Log\LogLevel;

2
monolog/src/DevelopHandler.php
View file

@ -19,7 +19,7 @@
* *
*/ */
namespace Friendica\Addon\Monolog; namespace Friendica\Addon\monolog\src;
use Friendica\App\Request; use Friendica\App\Request;
use Monolog\Handler; use Monolog\Handler;

2
monolog/src/IntrospectionProcessor.php
View file

@ -19,7 +19,7 @@
* *
*/ */
namespace Friendica\Addon\Monolog; namespace Friendica\Addon\monolog\src;
use Friendica\Core\Logger\Util\Introspection; use Friendica\Core\Logger\Util\Introspection;
use Monolog\Logger; use Monolog\Logger;

2
monolog/vendor/composer/autoload_classmap.php vendored
View file

@ -6,8 +6,6 @@ $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir); $baseDir = dirname($vendorDir);
return array( 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\\Attribute\\AsMonologProcessor' => $vendorDir . '/monolog/monolog/src/Monolog/Attribute/AsMonologProcessor.php',
'Monolog\\DateTimeImmutable' => $vendorDir . '/monolog/monolog/src/Monolog/DateTimeImmutable.php', 'Monolog\\DateTimeImmutable' => $vendorDir . '/monolog/monolog/src/Monolog/DateTimeImmutable.php',
'Monolog\\ErrorHandler' => $vendorDir . '/monolog/monolog/src/Monolog/ErrorHandler.php', 'Monolog\\ErrorHandler' => $vendorDir . '/monolog/monolog/src/Monolog/ErrorHandler.php',

1
monolog/vendor/composer/autoload_psr4.php vendored
View file

@ -8,5 +8,4 @@ $baseDir = dirname($vendorDir);
return array( return array(
'Psr\\Log\\' => array($vendorDir . '/psr/log/src'), 'Psr\\Log\\' => array($vendorDir . '/psr/log/src'),
'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'), 'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
'Friendica\\Addon\\Monolog\\' => array($baseDir . '/src'),
); );

10
monolog/vendor/composer/autoload_static.php vendored
View file

@ -15,10 +15,6 @@ class ComposerStaticInitMonologAddon
array ( array (
'Monolog\\' => 8, 'Monolog\\' => 8,
), ),
'F' =>
array (
'Friendica\\Addon\\Monolog\\' => 24,
),
); );
public static $prefixDirsPsr4 = array ( public static $prefixDirsPsr4 = array (
@ -30,15 +26,9 @@ class ComposerStaticInitMonologAddon
array ( array (
0 => __DIR__ . '/..' . '/monolog/monolog/src/Monolog', 0 => __DIR__ . '/..' . '/monolog/monolog/src/Monolog',
), ),
'Friendica\\Addon\\Monolog\\' =>
array (
0 => __DIR__ . '/../..' . '/src',
),
); );
public static $classMap = array ( 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\\Attribute\\AsMonologProcessor' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Attribute/AsMonologProcessor.php',
'Monolog\\DateTimeImmutable' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/DateTimeImmutable.php', 'Monolog\\DateTimeImmutable' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/DateTimeImmutable.php',
'Monolog\\ErrorHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/ErrorHandler.php', 'Monolog\\ErrorHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/ErrorHandler.php',