Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependency monolog/monolog to v3 #35

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"atk4/schema": "*",
"codacy/coverage": "dev-master",
"friendsofphp/php-cs-fixer": "dev-master@dev",
"monolog/monolog": "^2.0@dev",
"monolog/monolog": "3.0.0",
"phpmd/phpmd": "2.8.2",
"phpmetrics/phpmetrics": "dev-master@dev",
"phpstan/phpstan": "0.12.14",
Expand Down
1 change: 0 additions & 1 deletion demos/example-ajax.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
require_once 'bootstrap.php';

use atk4\ui\App;
use ATK4PHPDebugBar\DebugBar;

class User extends \atk4\data\Model
{
Expand Down
1 change: 0 additions & 1 deletion demos/example-logger.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
require_once 'bootstrap.php';

use atk4\ui\App;
use ATK4PHPDebugBar\DebugBar;
use Monolog\Handler\StreamHandler;
use Monolog\Logger;

Expand Down
1 change: 0 additions & 1 deletion demos/example-persistence.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
require_once 'bootstrap.php';

use atk4\ui\App;
use ATK4PHPDebugBar\DebugBar;

class User extends \atk4\data\Model
{
Expand Down
17 changes: 7 additions & 10 deletions src/DebugBar.php
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public function init(): void
}

/**
* @param DataCollectorInterface $dataCollector
* @param DataCollectorInterface $dataCollector
*
* @throws DebugBarException
*/
Expand Down Expand Up @@ -226,19 +226,18 @@ public function getDebugBar(): \DebugBar\DebugBar
}

/**
* @param string $name
* @param string $name
* @return DataCollectorInterface
*
* @throws DebugBarException
* @return DataCollectorInterface
*/
public function getCollector(string $name): DataCollectorInterface
{
return $this->debugBar->getCollector($name);
}

/**
* @param string $name
*
* @param string $name
* @return bool
*/
public function hasCollector(string $name): bool
Expand All @@ -247,8 +246,7 @@ public function hasCollector(string $name): bool
}

/**
* @param string $url
*
* @param string $url
* @return $this
*/
public function setAssetsResourcesUrl(string $url)
Expand All @@ -259,8 +257,7 @@ public function setAssetsResourcesUrl(string $url)
}

/**
* @param string $path
*
* @param string $path
* @return $this
*/
public function setAssetsResourcesPath(string $path)
Expand Down Expand Up @@ -294,7 +291,7 @@ public function addATK4LoggerCollector(): void
}

/**
* @param Persistence\SQL|null $persistence
* @param Persistence\SQL|null $persistence
*
* @throws DebugBarException
*/
Expand Down
1 change: 1 addition & 0 deletions tests/DebugBarTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public function testGetDebugBar_AppDynamicMethods()

/**
* Only for increase coverage, cover 1 line of code.
*
* @runInSeparateProcess
*/
public function testSendMessagesViaHeaders()
Expand Down