mirror of
https://git.friendi.ca/friendica/friendica-addons.git
synced 2024-11-02 13:31:10 +00:00
Merge pull request #1296 from nupplaphil/bug/monolog_psr4
[monolog] Remove non-compliant PSR4 config
This commit is contained in:
commit
99e33145db
7 changed files with 3 additions and 21 deletions
|
@ -10,11 +10,6 @@
|
|||
"role": "Developer"
|
||||
}
|
||||
],
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Friendica\\Addon\\Monolog\\": "src/"
|
||||
}
|
||||
},
|
||||
"require": {
|
||||
"php": ">=7.0",
|
||||
"monolog/monolog": "^3.2"
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
namespace Friendica\Addon\Monolog;
|
||||
namespace Friendica\Addon\monolog\src;
|
||||
|
||||
use Friendica\App\Request;
|
||||
use Monolog\Handler;
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
namespace Friendica\Addon\Monolog;
|
||||
namespace Friendica\Addon\monolog\src;
|
||||
|
||||
use Friendica\Core\Logger\Util\Introspection;
|
||||
use Monolog\Logger;
|
||||
|
|
|
@ -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',
|
||||
|
|
1
monolog/vendor/composer/autoload_psr4.php
vendored
1
monolog/vendor/composer/autoload_psr4.php
vendored
|
@ -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'),
|
||||
);
|
||||
|
|
10
monolog/vendor/composer/autoload_static.php
vendored
10
monolog/vendor/composer/autoload_static.php
vendored
|
@ -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',
|
||||
|
|
Loading…
Reference in a new issue