From f884a70aa88cc42cdde485fa56fa5d6596f5b100 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 1 Oct 2023 14:00:19 +0000 Subject: [PATCH 1/2] Update dependency atk4/ui to v5 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d4d8e28..a4dde31 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "require": { "php": ">=7.2.0", "ext-pdo": "*", - "atk4/ui": "2.0.2", + "atk4/ui": "5.0.0", "maximebf/debugbar": "1.15.1" }, "require-dev":{ From a87b2b91f160cc81dc8df54365c243927f8cf800 Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Sun, 1 Oct 2023 14:00:28 +0000 Subject: [PATCH 2/2] Apply fixes from StyleCI --- demos/example-ajax.php | 1 - demos/example-logger.php | 1 - demos/example-persistence.php | 3 +-- src/DebugBar.php | 17 +++++++---------- tests/DebugBarTest.php | 1 + tests/DemosTest.php | 1 + 6 files changed, 10 insertions(+), 14 deletions(-) diff --git a/demos/example-ajax.php b/demos/example-ajax.php index 611f702..7b794cc 100644 --- a/demos/example-ajax.php +++ b/demos/example-ajax.php @@ -3,7 +3,6 @@ require_once 'bootstrap.php'; use atk4\ui\App; -use ATK4PHPDebugBar\DebugBar; class User extends \atk4\data\Model { diff --git a/demos/example-logger.php b/demos/example-logger.php index 32e5dc9..07a939a 100644 --- a/demos/example-logger.php +++ b/demos/example-logger.php @@ -3,7 +3,6 @@ require_once 'bootstrap.php'; use atk4\ui\App; -use ATK4PHPDebugBar\DebugBar; use Monolog\Handler\StreamHandler; use Monolog\Logger; diff --git a/demos/example-persistence.php b/demos/example-persistence.php index f27e59b..ba195c2 100644 --- a/demos/example-persistence.php +++ b/demos/example-persistence.php @@ -3,7 +3,6 @@ require_once 'bootstrap.php'; use atk4\ui\App; -use ATK4PHPDebugBar\DebugBar; class User extends \atk4\data\Model { @@ -34,7 +33,7 @@ public function init() $model_user = new User($app->db); // Migration : if not exists table create it -(\atk4\schema\Migration::getMigration($model_user))->migrate(); +\atk4\schema\Migration::getMigration($model_user)->migrate(); $model_user->insert(['name'=>'test 1', 'email'=>'test1@test.it']); $model_user->insert(['name'=>'test 2', 'email'=>'test2@test.it']); diff --git a/src/DebugBar.php b/src/DebugBar.php index 3f2f56e..a6d4891 100644 --- a/src/DebugBar.php +++ b/src/DebugBar.php @@ -119,7 +119,7 @@ public function init(): void } /** - * @param DataCollectorInterface $dataCollector + * @param DataCollectorInterface $dataCollector * * @throws DebugBarException */ @@ -226,10 +226,10 @@ public function getDebugBar(): \DebugBar\DebugBar } /** - * @param string $name + * @param string $name + * @return DataCollectorInterface * * @throws DebugBarException - * @return DataCollectorInterface */ public function getCollector(string $name): DataCollectorInterface { @@ -237,8 +237,7 @@ public function getCollector(string $name): DataCollectorInterface } /** - * @param string $name - * + * @param string $name * @return bool */ public function hasCollector(string $name): bool @@ -247,8 +246,7 @@ public function hasCollector(string $name): bool } /** - * @param string $url - * + * @param string $url * @return $this */ public function setAssetsResourcesUrl(string $url) @@ -259,8 +257,7 @@ public function setAssetsResourcesUrl(string $url) } /** - * @param string $path - * + * @param string $path * @return $this */ public function setAssetsResourcesPath(string $path) @@ -294,7 +291,7 @@ public function addATK4LoggerCollector(): void } /** - * @param Persistence\SQL|null $persistence + * @param Persistence\SQL|null $persistence * * @throws DebugBarException */ diff --git a/tests/DebugBarTest.php b/tests/DebugBarTest.php index ebd60a5..13af12f 100644 --- a/tests/DebugBarTest.php +++ b/tests/DebugBarTest.php @@ -42,6 +42,7 @@ public function testGetDebugBar_AppDynamicMethods() /** * Only for increase coverage, cover 1 line of code. + * * @runInSeparateProcess */ public function testSendMessagesViaHeaders() diff --git a/tests/DemosTest.php b/tests/DemosTest.php index aac7b9e..9f5ce25 100755 --- a/tests/DemosTest.php +++ b/tests/DemosTest.php @@ -16,6 +16,7 @@ public function tearDown(): void /** * @runInSeparateProcess + * * @dataProvider dataProviderTestDemos */ public function testDemos($file)