Skip to content

Commit 1fc93ac

Browse files
makaomakao
authored
Merge pull request #25 from clawrock/deps-update
Magento 2.4.8 dependencies update
2 parents 9a55944 + 05d26d9 commit 1fc93ac

89 files changed

Lines changed: 307 additions & 852 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ jobs:
1010
php:
1111
- "8.1"
1212
- "8.2"
13+
- "8.3"
1314
steps:
1415
- name: "Checkout"
1516
uses: "actions/checkout@v3"
@@ -23,7 +24,7 @@ jobs:
2324
tools: composer:v2
2425

2526
- name: "Cache Composer dependencies"
26-
uses: "actions/cache@v2"
27+
uses: "actions/cache@v4"
2728
with:
2829
path: "/tmp/composer-cache"
2930
key: php${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}

‎Console/Command/DatabaseProfilerDisableCommand.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,10 @@
1010

1111
class DatabaseProfilerDisableCommand extends Command
1212
{
13-
private \ClawRock\Debug\Model\Config\Database\ProfilerWriter $profilerWriter;
14-
1513
public function __construct(
16-
\ClawRock\Debug\Model\Config\Database\ProfilerWriter $profilerWriter
14+
private \ClawRock\Debug\Model\Config\Database\ProfilerWriter $profilerWriter
1715
) {
1816
parent::__construct('debug:db-profiler:disable');
19-
20-
$this->profilerWriter = $profilerWriter;
2117
}
2218

2319
protected function configure(): void

‎Console/Command/DatabaseProfilerEnableCommand.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,10 @@
1010

1111
class DatabaseProfilerEnableCommand extends Command
1212
{
13-
private \ClawRock\Debug\Model\Config\Database\ProfilerWriter $profilerWriter;
14-
1513
public function __construct(
16-
\ClawRock\Debug\Model\Config\Database\ProfilerWriter $profilerWriter
14+
private \ClawRock\Debug\Model\Config\Database\ProfilerWriter $profilerWriter
1715
) {
1816
parent::__construct('debug:db-profiler:enable');
19-
20-
$this->profilerWriter = $profilerWriter;
2117
}
2218

2319
protected function configure(): void

‎Controller/Cache.php‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,10 @@
77

88
abstract class Cache implements HttpGetActionInterface
99
{
10-
protected \Magento\Framework\Controller\ResultFactory $resultFactory;
11-
protected \Magento\Framework\App\RequestInterface $request;
12-
protected \Magento\Framework\App\Cache\Manager $cacheManager;
13-
1410
public function __construct(
15-
\Magento\Framework\Controller\ResultFactory $resultFactory,
16-
\Magento\Framework\App\RequestInterface $request,
17-
\Magento\Framework\App\Cache\Manager $cacheManager
11+
protected \Magento\Framework\Controller\ResultFactory $resultFactory,
12+
protected \Magento\Framework\App\RequestInterface $request,
13+
protected \Magento\Framework\App\Cache\Manager $cacheManager
1814
) {
19-
$this->resultFactory = $resultFactory;
20-
$this->request = $request;
21-
$this->cacheManager = $cacheManager;
2215
}
2316
}

‎Controller/Profiler/Info.php‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,13 @@
1111

1212
class Info implements HttpGetActionInterface
1313
{
14-
private \Magento\Framework\View\LayoutInterface $layout;
15-
private \ClawRock\Debug\Api\ProfileRepositoryInterface $profileRepository;
16-
private \ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage;
17-
private \Magento\Framework\Controller\ResultFactory $resultFactory;
18-
private \Magento\Framework\App\RequestInterface $request;
19-
2014
public function __construct(
21-
\Magento\Framework\Controller\ResultFactory $resultFactory,
22-
\Magento\Framework\App\RequestInterface $request,
23-
\Magento\Framework\View\LayoutInterface $layout,
24-
\ClawRock\Debug\Api\ProfileRepositoryInterface $profileRepository,
25-
\ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage
15+
private \Magento\Framework\Controller\ResultFactory $resultFactory,
16+
private \Magento\Framework\App\RequestInterface $request,
17+
private \Magento\Framework\View\LayoutInterface $layout,
18+
private \ClawRock\Debug\Api\ProfileRepositoryInterface $profileRepository,
19+
private \ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage
2620
) {
27-
$this->resultFactory = $resultFactory;
28-
$this->request = $request;
29-
$this->layout = $layout;
30-
$this->profileRepository = $profileRepository;
31-
$this->profileMemoryStorage = $profileMemoryStorage;
3221
}
3322

3423
public function execute(): ?ResultInterface

‎Controller/Profiler/PHPInfo.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,9 @@
99

1010
class PHPInfo implements HttpGetActionInterface
1111
{
12-
private \Magento\Framework\Controller\ResultFactory $resultFactory;
13-
1412
public function __construct(
15-
\Magento\Framework\Controller\ResultFactory $resultFactory
13+
private \Magento\Framework\Controller\ResultFactory $resultFactory
1614
) {
17-
$this->resultFactory = $resultFactory;
1815
}
1916

2017
public function execute(): ?ResultInterface

‎Controller/Profiler/Purge.php‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,12 @@
1010

1111
class Purge implements HttpGetActionInterface
1212
{
13-
private \ClawRock\Debug\Model\Storage\ProfileFileStorage $profileFileStorage;
14-
private \ClawRock\Debug\Logger\Logger $logger;
15-
private \Magento\Framework\Controller\ResultFactory $resultFactory;
16-
private \Magento\Framework\App\Response\RedirectInterface $redirect;
17-
1813
public function __construct(
19-
\Magento\Framework\Controller\ResultFactory $resultFactory,
20-
\Magento\Framework\App\Response\RedirectInterface $redirect,
21-
\ClawRock\Debug\Model\Storage\ProfileFileStorage $profileFileStorage,
22-
\ClawRock\Debug\Logger\Logger $logger
14+
private \Magento\Framework\Controller\ResultFactory $resultFactory,
15+
private \Magento\Framework\App\Response\RedirectInterface $redirect,
16+
private \ClawRock\Debug\Model\Storage\ProfileFileStorage $profileFileStorage,
17+
private \Psr\Log\LoggerInterface $logger
2318
) {
24-
$this->resultFactory = $resultFactory;
25-
$this->redirect = $redirect;
26-
$this->profileFileStorage = $profileFileStorage;
27-
$this->logger = $logger;
2819
}
2920

3021
public function execute(): ?ResultInterface

‎Controller/Profiler/Search.php‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,12 @@
1111

1212
class Search implements HttpGetActionInterface
1313
{
14-
private \Magento\Framework\Controller\ResultFactory $resultFactory;
15-
private \Magento\Framework\App\RequestInterface $request;
16-
private \Magento\Framework\View\LayoutInterface $layout;
17-
private \ClawRock\Debug\Api\ProfileRepositoryInterface $profileRepository;
18-
1914
public function __construct(
20-
\Magento\Framework\Controller\ResultFactory $resultFactory,
21-
\Magento\Framework\App\RequestInterface $request,
22-
\Magento\Framework\View\LayoutInterface $layout,
23-
\ClawRock\Debug\Api\ProfileRepositoryInterface $profileRepository
15+
private \Magento\Framework\Controller\ResultFactory $resultFactory,
16+
private \Magento\Framework\App\RequestInterface $request,
17+
private \Magento\Framework\View\LayoutInterface $layout,
18+
private \ClawRock\Debug\Api\ProfileRepositoryInterface $profileRepository
2419
) {
25-
$this->resultFactory = $resultFactory;
26-
$this->request = $request;
27-
$this->layout = $layout;
28-
$this->profileRepository = $profileRepository;
2920
}
3021

3122
public function execute(): ?ResultInterface

‎Controller/Profiler/Toolbar.php‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,12 @@
99

1010
class Toolbar implements HttpGetActionInterface
1111
{
12-
private \ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage;
13-
private \ClawRock\Debug\Api\ProfileRepositoryInterface $profileRepository;
14-
private \Magento\Framework\Controller\ResultFactory $resultFactory;
15-
private \Magento\Framework\App\RequestInterface $request;
16-
1712
public function __construct(
18-
\Magento\Framework\Controller\ResultFactory $resultFactory,
19-
\Magento\Framework\App\RequestInterface $request,
20-
\ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage,
21-
\ClawRock\Debug\Api\ProfileRepositoryInterface $profileRepository
13+
private \Magento\Framework\Controller\ResultFactory $resultFactory,
14+
private \Magento\Framework\App\RequestInterface $request,
15+
private \ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage,
16+
private \ClawRock\Debug\Api\ProfileRepositoryInterface $profileRepository
2217
) {
23-
$this->resultFactory = $resultFactory;
24-
$this->request = $request;
25-
$this->profileMemoryStorage = $profileMemoryStorage;
26-
$this->profileRepository = $profileRepository;
2718
}
2819

2920
public function execute(): ?\Magento\Framework\Controller\ResultInterface

‎Helper/Config.php‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,24 +34,13 @@ class Config
3434
public const CONFIG_COLLECTOR_TRANSLATION = 'clawrock_debug/collector/translation';
3535
public const COLLECTORS = 'clawrock_debug/profiler/collectors';
3636

37-
private \Magento\Framework\PhraseFactory $phraseFactory;
38-
private \Magento\Framework\App\State $appState;
39-
private \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig;
40-
private \Magento\Framework\App\DeploymentConfig $deploymentConfig;
41-
private \ClawRock\Debug\Model\Storage\HttpStorage $httpStorage;
42-
4337
public function __construct(
44-
\Magento\Framework\PhraseFactory $phraseFactory,
45-
\Magento\Framework\App\State $appState,
46-
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
47-
\Magento\Framework\App\DeploymentConfig $deploymentConfig,
48-
\ClawRock\Debug\Model\Storage\HttpStorage $httpStorage
38+
private \Magento\Framework\PhraseFactory $phraseFactory,
39+
private \Magento\Framework\App\State $appState,
40+
private \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
41+
private \Magento\Framework\App\DeploymentConfig $deploymentConfig,
42+
private \ClawRock\Debug\Model\Storage\HttpStorage $httpStorage
4943
) {
50-
$this->phraseFactory = $phraseFactory;
51-
$this->appState = $appState;
52-
$this->scopeConfig = $scopeConfig;
53-
$this->deploymentConfig = $deploymentConfig;
54-
$this->httpStorage = $httpStorage;
5544
}
5645

5746
public function getErrorHandler(): string

0 commit comments

Comments
 (0)