AS1024
/
Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move SimpleLogger lib into app source tree

This commit is contained in:
Frédéric Guillot 2018-03-05 12:04:28 -08:00
parent a991758e98
commit 299198f718
16 changed files with 99 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vendor/fguillot/simpleLogger/src/SimpleLogger/Base.php → app/Core/Log/Base.php
View File

@ -1,6 +1,6 @@
<?php
namespace SimpleLogger;
namespace Kanboard\Core\Log;
use Psr\Log\AbstractLogger;
use Psr\Log\LogLevel;
@ -8,7 +8,7 @@ use Psr\Log\LogLevel;
/**
* Base class for loggers
*
* @package SimpleLogger
* @package Kanboard\Core\Log
* @author Frédéric Guillot
*/
abstract class Base extends AbstractLogger

6
vendor/fguillot/simpleLogger/src/SimpleLogger/File.php → app/Core/Log/File.php
View File

@ -1,13 +1,13 @@
<?php
namespace SimpleLogger;
namespace Kanboard\Core\Log;
use RuntimeException;
/**
* File logger
* File Logger
*
* @package SimpleLogger
* @package Kanboard\Core\Log
* @author Frédéric Guillot
*/
class File extends Base

4
vendor/fguillot/simpleLogger/src/SimpleLogger/Logger.php → app/Core/Log/Logger.php
View File

@ -1,6 +1,6 @@
<?php
namespace SimpleLogger;
namespace Kanboard\Core\Log;
use Psr\Log\AbstractLogger;
use Psr\Log\LoggerAwareInterface;
@ -10,7 +10,7 @@ use Psr\Log\LogLevel;
/**
* Handler for multiple loggers
*
* @package SimpleLogger
* @package Kanboard\Core\Log
* @author Frédéric Guillot
*/
class Logger extends AbstractLogger implements LoggerAwareInterface

4
vendor/fguillot/simpleLogger/src/SimpleLogger/Stderr.php → app/Core/Log/Stderr.php
View File

@ -1,11 +1,11 @@
<?php
namespace SimpleLogger;
namespace Kanboard\Core\Log;
/**
* Stderr logger
*
* @package SimpleLogger
* @package Kanboard\Core\Log
* @author Frédéric Guillot
*/
class Stderr extends Base

4
vendor/fguillot/simpleLogger/src/SimpleLogger/Stdout.php → app/Core/Log/Stdout.php
View File

@ -1,11 +1,11 @@
<?php
namespace SimpleLogger;
namespace Kanboard\Core\Log;
/**
* Stdout logger
*
* @package SimpleLogger
* @package Kanboard\Core\Log
* @author Frédéric Guillot
*/
class Stdout extends Base

4
vendor/fguillot/simpleLogger/src/SimpleLogger/Syslog.php → app/Core/Log/Syslog.php
View File

@ -1,6 +1,6 @@
<?php
namespace SimpleLogger;
namespace Kanboard\Core\Log;
use RuntimeException;
use Psr\Log\LogLevel;
@ -8,7 +8,7 @@ use Psr\Log\LogLevel;
/**
* Syslog Logger
*
* @package SimpleLogger
* @package Kanboard\Core\Log
* @author Frédéric Guillot
*/
class Syslog extends Base

12
app/ServiceProvider/LoggingProvider.php
View File

@ -5,11 +5,11 @@ namespace Kanboard\ServiceProvider;
use Psr\Log\LogLevel;
use Pimple\Container;
use Pimple\ServiceProviderInterface;
use SimpleLogger\Logger;
use SimpleLogger\Stderr;
use SimpleLogger\Stdout;
use SimpleLogger\Syslog;
use SimpleLogger\File;
use Kanboard\Core\Log\Logger;
use Kanboard\Core\Log\Stderr;
use Kanboard\Core\Log\Stdout;
use Kanboard\Core\Log\Syslog;
use Kanboard\Core\Log\File;
/**
* Class LoggingProvider
@ -21,7 +21,7 @@ class LoggingProvider implements ServiceProviderInterface
{
public function register(Container $container)
{
$logger = new Logger;
$logger = new Logger();
$driver = null;
switch (LOG_DRIVER) {

2
composer.json
View File

@ -31,11 +31,11 @@
"erusev/parsedown" : "1.6.0",
"fguillot/json-rpc" : "1.2.1",
"fguillot/picodb" : "1.0.17",
"fguillot/simpleLogger" : "1.0.1",
"fguillot/simple-validator" : "1.0.1",
"fguillot/simple-queue" : "1.0.1",
"paragonie/random_compat": "2.0.11",
"pimple/pimple" : "3.2.2",
"psr/log": "~1.0",
"swiftmailer/swiftmailer" : "5.4.8",
"symfony/console" : "3.4.2",
"symfony/event-dispatcher" : "3.4.2",

59
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"content-hash": "6d59b34b5598ac4a46c73dce19772b9b",
"content-hash": "a1a8ea1e7b369d6eeb6c97085da64faf",
"packages": [
{
"name": "aferrandini/phpqrcode",
@ -411,43 +411,6 @@
"homepage": "https://github.com/fguillot/simpleValidator",
"time": "2016-06-26T15:09:26+00:00"
},
{
"name": "fguillot/simpleLogger",
"version": "v1.0.1",
"source": {
"type": "git",
"url": "https://github.com/fguillot/simpleLogger.git",
"reference": "c6831841193bb265b7900ecc8b6a8918371a7c98"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fguillot/simpleLogger/zipball/c6831841193bb265b7900ecc8b6a8918371a7c98",
"reference": "c6831841193bb265b7900ecc8b6a8918371a7c98",
"shasum": ""
},
"require": {
"php": ">=5.3.0",
"psr/log": "~1.0"
},
"type": "library",
"autoload": {
"psr-0": {
"SimpleLogger": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Frédéric Guillot"
}
],
"description": "PHP library to write logs (compatible with PSR-3)",
"homepage": "https://github.com/fguillot/simpleLogger",
"time": "2016-05-07T18:01:57+00:00"
},
{
"name": "gregwar/captcha",
"version": "v1.1.4",
@ -939,16 +902,16 @@
},
{
"name": "symfony/finder",
"version": "v3.4.4",
"version": "v3.4.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "613e26310776f49a1773b6737c6bd554b8bc8c6f"
"reference": "6a615613745cef820d807443f32076bb9f5d0a38"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/613e26310776f49a1773b6737c6bd554b8bc8c6f",
"reference": "613e26310776f49a1773b6737c6bd554b8bc8c6f",
"url": "https://api.github.com/repos/symfony/finder/zipball/6a615613745cef820d807443f32076bb9f5d0a38",
"reference": "6a615613745cef820d807443f32076bb9f5d0a38",
"shasum": ""
},
"require": {
@ -984,7 +947,7 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
"time": "2018-01-03T07:37:34+00:00"
"time": "2018-02-11T17:15:12+00:00"
},
{
"name": "symfony/polyfill-mbstring",
@ -1294,16 +1257,16 @@
},
{
"name": "phpspec/prophecy",
"version": "1.7.4",
"version": "1.7.5",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
"reference": "9f901e29c93dae4aa77c0bb161df4276f9c9a1be"
"reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/9f901e29c93dae4aa77c0bb161df4276f9c9a1be",
"reference": "9f901e29c93dae4aa77c0bb161df4276f9c9a1be",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/dfd6be44111a7c41c2e884a336cc4f461b3b2401",
"reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401",
"shasum": ""
},
"require": {
@ -1353,7 +1316,7 @@
"spy",
"stub"
],
"time": "2018-02-11T18:49:29+00:00"
"time": "2018-02-19T10:16:54+00:00"
},
{
"name": "phpunit/php-code-coverage",

2
tests/units/Base.php
View File

@ -7,7 +7,7 @@ use Composer\Autoload\ClassLoader;
use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcher;
use Symfony\Component\Stopwatch\Stopwatch;
use SimpleLogger\Logger;
use Kanboard\Core\Log\Logger;
use Kanboard\Core\Session\FlashMessage;
use Kanboard\ServiceProvider\ActionProvider;

12
vendor/composer/autoload_classmap.php vendored
View File

@ -314,6 +314,12 @@ return array(
'Kanboard\\Core\\Ldap\\Group' => $baseDir . '/app/Core/Ldap/Group.php',
'Kanboard\\Core\\Ldap\\Query' => $baseDir . '/app/Core/Ldap/Query.php',
'Kanboard\\Core\\Ldap\\User' => $baseDir . '/app/Core/Ldap/User.php',
'Kanboard\\Core\\Log\\Base' => $baseDir . '/app/Core/Log/Base.php',
'Kanboard\\Core\\Log\\File' => $baseDir . '/app/Core/Log/File.php',
'Kanboard\\Core\\Log\\Logger' => $baseDir . '/app/Core/Log/Logger.php',
'Kanboard\\Core\\Log\\Stderr' => $baseDir . '/app/Core/Log/Stderr.php',
'Kanboard\\Core\\Log\\Stdout' => $baseDir . '/app/Core/Log/Stdout.php',
'Kanboard\\Core\\Log\\Syslog' => $baseDir . '/app/Core/Log/Syslog.php',
'Kanboard\\Core\\Mail\\Client' => $baseDir . '/app/Core/Mail/Client.php',
'Kanboard\\Core\\Mail\\ClientInterface' => $baseDir . '/app/Core/Mail/ClientInterface.php',
'Kanboard\\Core\\Mail\\Transport\\Mail' => $baseDir . '/app/Core/Mail/Transport/Mail.php',
@ -734,12 +740,6 @@ return array(
'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php',
'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
'SimpleLogger\\Base' => $vendorDir . '/fguillot/simpleLogger/src/SimpleLogger/Base.php',
'SimpleLogger\\File' => $vendorDir . '/fguillot/simpleLogger/src/SimpleLogger/File.php',
'SimpleLogger\\Logger' => $vendorDir . '/fguillot/simpleLogger/src/SimpleLogger/Logger.php',
'SimpleLogger\\Stderr' => $vendorDir . '/fguillot/simpleLogger/src/SimpleLogger/Stderr.php',
'SimpleLogger\\Stdout' => $vendorDir . '/fguillot/simpleLogger/src/SimpleLogger/Stdout.php',
'SimpleLogger\\Syslog' => $vendorDir . '/fguillot/simpleLogger/src/SimpleLogger/Syslog.php',
'SimpleQueue\\Adapter\\AmqpQueueAdapter' => $vendorDir . '/fguillot/simple-queue/src/Adapter/AmqpQueueAdapter.php',
'SimpleQueue\\Adapter\\AwsSqsQueueAdapter' => $vendorDir . '/fguillot/simple-queue/src/Adapter/AwsSqsQueueAdapter.php',
'SimpleQueue\\Adapter\\BeanstalkQueueAdapter' => $vendorDir . '/fguillot/simple-queue/src/Adapter/BeanstalkQueueAdapter.php',

1
vendor/composer/autoload_namespaces.php vendored
View File

@ -7,7 +7,6 @@ $baseDir = dirname($vendorDir);
return array(
'SimpleValidator' => array($vendorDir . '/fguillot/simple-validator/src'),
'SimpleLogger' => array($vendorDir . '/fguillot/simpleLogger/src'),
'Pimple' => array($vendorDir . '/pimple/pimple/src'),
'PicoDb' => array($vendorDir . '/fguillot/picodb/lib'),
'Parsedown' => array($vendorDir . '/erusev/parsedown'),

16
vendor/composer/autoload_static.php vendored
View File

@ -96,10 +96,6 @@ class ComposerStaticInitbdc3716ceecc7570f8ff9a8407f0ca0e
array (
0 => __DIR__ . '/..' . '/fguillot/simple-validator/src',
),
'SimpleLogger' =>
array (
0 => __DIR__ . '/..' . '/fguillot/simpleLogger/src',
),
),
'P' =>
array (
@ -452,6 +448,12 @@ class ComposerStaticInitbdc3716ceecc7570f8ff9a8407f0ca0e
'Kanboard\\Core\\Ldap\\Group' => __DIR__ . '/../..' . '/app/Core/Ldap/Group.php',
'Kanboard\\Core\\Ldap\\Query' => __DIR__ . '/../..' . '/app/Core/Ldap/Query.php',
'Kanboard\\Core\\Ldap\\User' => __DIR__ . '/../..' . '/app/Core/Ldap/User.php',
'Kanboard\\Core\\Log\\Base' => __DIR__ . '/../..' . '/app/Core/Log/Base.php',
'Kanboard\\Core\\Log\\File' => __DIR__ . '/../..' . '/app/Core/Log/File.php',
'Kanboard\\Core\\Log\\Logger' => __DIR__ . '/../..' . '/app/Core/Log/Logger.php',
'Kanboard\\Core\\Log\\Stderr' => __DIR__ . '/../..' . '/app/Core/Log/Stderr.php',
'Kanboard\\Core\\Log\\Stdout' => __DIR__ . '/../..' . '/app/Core/Log/Stdout.php',
'Kanboard\\Core\\Log\\Syslog' => __DIR__ . '/../..' . '/app/Core/Log/Syslog.php',
'Kanboard\\Core\\Mail\\Client' => __DIR__ . '/../..' . '/app/Core/Mail/Client.php',
'Kanboard\\Core\\Mail\\ClientInterface' => __DIR__ . '/../..' . '/app/Core/Mail/ClientInterface.php',
'Kanboard\\Core\\Mail\\Transport\\Mail' => __DIR__ . '/../..' . '/app/Core/Mail/Transport/Mail.php',
@ -872,12 +874,6 @@ class ComposerStaticInitbdc3716ceecc7570f8ff9a8407f0ca0e
'Psr\\Log\\NullLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/NullLogger.php',
'Psr\\Log\\Test\\DummyTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
'Psr\\Log\\Test\\LoggerInterfaceTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
'SimpleLogger\\Base' => __DIR__ . '/..' . '/fguillot/simpleLogger/src/SimpleLogger/Base.php',
'SimpleLogger\\File' => __DIR__ . '/..' . '/fguillot/simpleLogger/src/SimpleLogger/File.php',
'SimpleLogger\\Logger' => __DIR__ . '/..' . '/fguillot/simpleLogger/src/SimpleLogger/Logger.php',
'SimpleLogger\\Stderr' => __DIR__ . '/..' . '/fguillot/simpleLogger/src/SimpleLogger/Stderr.php',
'SimpleLogger\\Stdout' => __DIR__ . '/..' . '/fguillot/simpleLogger/src/SimpleLogger/Stdout.php',
'SimpleLogger\\Syslog' => __DIR__ . '/..' . '/fguillot/simpleLogger/src/SimpleLogger/Syslog.php',
'SimpleQueue\\Adapter\\AmqpQueueAdapter' => __DIR__ . '/..' . '/fguillot/simple-queue/src/Adapter/AmqpQueueAdapter.php',
'SimpleQueue\\Adapter\\AwsSqsQueueAdapter' => __DIR__ . '/..' . '/fguillot/simple-queue/src/Adapter/AwsSqsQueueAdapter.php',
'SimpleQueue\\Adapter\\BeanstalkQueueAdapter' => __DIR__ . '/..' . '/fguillot/simple-queue/src/Adapter/BeanstalkQueueAdapter.php',

141
vendor/composer/installed.json vendored
View File

@ -429,96 +429,6 @@
"psr-3"
]
},
{
"name": "fguillot/simpleLogger",
"version": "v1.0.1",
"version_normalized": "1.0.1.0",
"source": {
"type": "git",
"url": "https://github.com/fguillot/simpleLogger.git",
"reference": "c6831841193bb265b7900ecc8b6a8918371a7c98"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fguillot/simpleLogger/zipball/c6831841193bb265b7900ecc8b6a8918371a7c98",
"reference": "c6831841193bb265b7900ecc8b6a8918371a7c98",
"shasum": ""
},
"require": {
"php": ">=5.3.0",
"psr/log": "~1.0"
},
"time": "2016-05-07T18:01:57+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
"psr-0": {
"SimpleLogger": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Frédéric Guillot"
}
],
"description": "PHP library to write logs (compatible with PSR-3)",
"homepage": "https://github.com/fguillot/simpleLogger"
},
{
"name": "symfony/finder",
"version": "v3.4.4",
"version_normalized": "3.4.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "613e26310776f49a1773b6737c6bd554b8bc8c6f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/613e26310776f49a1773b6737c6bd554b8bc8c6f",
"reference": "613e26310776f49a1773b6737c6bd554b8bc8c6f",
"shasum": ""
},
"require": {
"php": "^5.5.9|>=7.0.8"
},
"time": "2018-01-03T07:37:34+00:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.4-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
"Symfony\\Component\\Finder\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com"
},
{
"name": "gregwar/captcha",
"version": "v1.1.4",
@ -1079,5 +989,56 @@
],
"description": "Minimalist database query builder",
"homepage": "https://github.com/fguillot/picoDb"
},
{
"name": "symfony/finder",
"version": "v3.4.5",
"version_normalized": "3.4.5.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "6a615613745cef820d807443f32076bb9f5d0a38"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/6a615613745cef820d807443f32076bb9f5d0a38",
"reference": "6a615613745cef820d807443f32076bb9f5d0a38",
"shasum": ""
},
"require": {
"php": "^5.5.9|>=7.0.8"
},
"time": "2018-02-11T17:15:12+00:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.4-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
"Symfony\\Component\\Finder\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com"
}
]

21
vendor/fguillot/simpleLogger/LICENSE vendored
View File

@ -1,21 +0,0 @@
The MIT License (MIT)
Copyright (c) 2015 Frederic Guillot
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

4
vendor/symfony/finder/Finder.php vendored
View File

@ -313,6 +313,8 @@ class Finder implements \IteratorAggregate, \Countable
/**
* Excludes "hidden" directories and files (starting with a dot).
*
* This option is enabled by default.
*
* @param bool $ignoreDotFiles Whether to exclude "hidden" files or not
*
* @return $this
@ -333,6 +335,8 @@ class Finder implements \IteratorAggregate, \Countable
/**
* Forces the finder to ignore version control directories.
*
* This option is enabled by default.
*
* @param bool $ignoreVCS Whether to exclude VCS files or not
*
* @return $this