Skip to content

Commit 9a55944

Browse files
makaomakao
authored
Merge pull request #17 from LPawinsky/fix/lpawinski/session-build-error
Fix phpcs build error on graphql disable session error
2 parents efb02e0 + ccd7901 commit 9a55944

14 files changed

Lines changed: 154 additions & 82 deletions

‎.github/workflows/ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ jobs:
88
fail-fast: false
99
matrix:
1010
php:
11-
- "7.4"
1211
- "8.1"
12+
- "8.2"
1313
steps:
1414
- name: "Checkout"
1515
uses: "actions/checkout@v3"

‎Helper/Injector.php‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99

1010
class Injector
1111
{
12+
private const TEMPLATE_TOOLBAR = 'ClawRock_Debug::profiler/toolbar/js.phtml';
13+
private const TEMPLATE_BLOCK = 'ClawRock_Debug::profiler/js.phtml';
14+
1215
private \Magento\Framework\View\LayoutInterface $layout;
1316
private \ClawRock\Debug\Model\View\Toolbar $viewModel;
1417

@@ -27,16 +30,29 @@ public function inject(Request $request, Response $response, ?string $token = nu
2730

2831
if (false !== $pos) {
2932
/** @var \Magento\Framework\View\Element\Template $toolbarBlock */
30-
$toolbarBlock = $this->layout->createBlock(Template::class, 'debug.toolbar');
31-
$toolbarBlock->setTemplate('ClawRock_Debug::profiler/toolbar/js.phtml')->setData([
32-
'view_model' => $this->viewModel,
33-
'token' => $token,
34-
'request' => $request,
35-
]);
33+
$toolbarBlock = $this->layout->createBlock(
34+
Template::class,
35+
'debug.toolbar',
36+
[
37+
'data' => [
38+
'template' => self::TEMPLATE_TOOLBAR,
39+
'view_model' => $this->viewModel,
40+
'token' => $token,
41+
'request' => $request,
42+
],
43+
]
44+
);
3645

3746
/** @var \Magento\Framework\View\Element\Template $jsBlock */
38-
$jsBlock = $this->layout->createBlock(Template::class, 'debug.profiler.js');
39-
$jsBlock->setTemplate('ClawRock_Debug::profiler/js.phtml');
47+
$jsBlock = $this->layout->createBlock(
48+
Template::class,
49+
'debug.profiler.js',
50+
[
51+
'data' => [
52+
'template' => self::TEMPLATE_BLOCK,
53+
],
54+
]
55+
);
4056

4157
$toolbarBlock->setChild('debug_profiler_js', $jsBlock);
4258

‎Model/Info/RequestInfo.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public function getStatusCode(): int
134134
*/
135135
public function getSessionAttributes(): array
136136
{
137-
return session_status() ? $_SESSION : []; // phpcs:ignore Magento2.Security.Superglobal.SuperglobalUsageError
137+
return $_SESSION ?? []; // phpcs:ignore Magento2.Security.Superglobal.SuperglobalUsageError
138138
}
139139

140140
public function getPathInfo(): string

‎Model/View/Renderer/LayoutGraphRenderer.php‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,19 @@ public function __construct(
3434
public function render(): string
3535
{
3636
/** @var \Magento\Framework\View\Element\Template $block */
37-
$block = $this->layout->createBlock(Template::class);
37+
$block = $this->layout->createBlock(
38+
Template::class,
39+
'clawrock_layout_graph_renderer',
40+
[
41+
'data' => [
42+
'template' => self::TEMPLATE,
43+
'nodes' => $this->createNodes(),
44+
'layout_node_renderer' => $this->layoutNodeRendererFactory,
45+
],
46+
]
47+
);
3848

39-
return $block->setTemplate(self::TEMPLATE)
40-
->setData([
41-
'nodes' => $this->createNodes(),
42-
'layout_node_renderer' => $this->layoutNodeRendererFactory,
43-
])
44-
->toHtml();
49+
return $block->toHtml();
4550
}
4651

4752
private function createNodes(): array

‎Model/View/Renderer/LayoutNodeRenderer.php‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,19 @@ public function __construct(
2929
public function render(): string
3030
{
3131
/** @var \Magento\Framework\View\Element\Template $block */
32-
$block = $this->layout->createBlock(Template::class);
32+
$block = $this->layout->createBlock(
33+
Template::class,
34+
'',
35+
[
36+
'data' => [
37+
'template' => self::TEMPLATE,
38+
'node' => $this->node,
39+
'formatter' => $this->formatter,
40+
'layout_node_renderer' => $this->layoutNodeRendererFactory,
41+
],
42+
]
43+
);
3344

34-
return $block->setTemplate(self::TEMPLATE)
35-
->setData([
36-
'node' => $this->node,
37-
'formatter' => $this->formatter,
38-
'layout_node_renderer' => $this->layoutNodeRendererFactory,
39-
])
40-
->toHtml();
45+
return $block->toHtml();
4146
}
4247
}

‎Model/View/Renderer/ParametersRenderer.php‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,18 @@ public function __construct(
2626
public function render(): string
2727
{
2828
/** @var \Magento\Framework\View\Element\Template $block */
29-
$block = $this->layout->createBlock(Template::class);
29+
$block = $this->layout->createBlock(
30+
Template::class,
31+
'',
32+
[
33+
'data' => [
34+
'template' => self::TEMPLATE,
35+
'parameters' => $this->parameters,
36+
'var_renderer' => $this->varRenderer,
37+
],
38+
]
39+
);
3040

31-
return $block->setTemplate(self::TEMPLATE)
32-
->setData('parameters', $this->parameters)
33-
->setData('var_renderer', $this->varRenderer)
34-
->toHtml();
41+
return $block->toHtml();
3542
}
3643
}

‎Model/View/Renderer/QueryListRenderer.php‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,20 @@ public function __construct(
3333
public function render(): string
3434
{
3535
/** @var \Magento\Framework\View\Element\Template $block */
36-
$block = $this->layout->createBlock(Template::class);
36+
$block = $this->layout->createBlock(
37+
Template::class,
38+
'',
39+
[
40+
'data' => [
41+
'template' => self::TEMPLATE,
42+
'queries' => $this->queries,
43+
'query_renderer' => $this->queryRendererFactory,
44+
'prefix' => $this->mathRandom->getUniqueHash(),
45+
'formatter' => $this->formatter,
46+
],
47+
]
48+
);
3749

38-
return $block->setTemplate(self::TEMPLATE)
39-
->setData([
40-
'queries' => $this->queries,
41-
'query_renderer' => $this->queryRendererFactory,
42-
'prefix' => $this->mathRandom->getUniqueHash(),
43-
'formatter' => $this->formatter,
44-
])
45-
->toHtml();
50+
return $block->toHtml();
4651
}
4752
}

‎Model/View/Renderer/QueryRenderer.php‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,27 @@ public function __construct(
3232
public function render(): string
3333
{
3434
/** @var \Magento\Framework\View\Element\Template $block */
35-
$block = $this->layout->createBlock(Template::class);
35+
$block = $this->layout->createBlock(
36+
Template::class,
37+
'',
38+
[
39+
'data' => [
40+
'template' => self::TEMPLATE,
41+
'query' => $this->query,
42+
'highlighted_query' => $this->databaseHelper->highlightQuery($this->query->getQuery()),
43+
'formatted_query' => $this->databaseHelper->formatQuery($this->query->getQuery()),
44+
'runnable_query' => $this->databaseHelper->highlightQuery(
45+
$this->databaseHelper->replaceQueryParameters(
46+
$this->query->getQuery(),
47+
$this->query->getQueryParams()
48+
)
49+
),
50+
'var_renderer' => $this->varRenderer,
51+
'uniq_id' => $this->mathRandom->getUniqueHash(),
52+
],
53+
]
54+
);
3655

37-
return $block->setTemplate(self::TEMPLATE)
38-
->setData([
39-
'query' => $this->query,
40-
'highlighted_query' => $this->databaseHelper->highlightQuery($this->query->getQuery()),
41-
'formatted_query' => $this->databaseHelper->formatQuery($this->query->getQuery()),
42-
'runnable_query' => $this->databaseHelper->highlightQuery(
43-
$this->databaseHelper->replaceQueryParameters(
44-
$this->query->getQuery(),
45-
$this->query->getQueryParams()
46-
)
47-
),
48-
'var_renderer' => $this->varRenderer,
49-
'uniq_id' => $this->mathRandom->getUniqueHash(),
50-
])
51-
->toHtml();
56+
return $block->toHtml();
5257
}
5358
}

‎Model/View/Renderer/RedirectRenderer.php‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,17 @@ public function __construct(
3737
public function render(): string
3838
{
3939
/** @var \Magento\Framework\View\Element\Template $block */
40-
$block = $this->layout->createBlock(Template::class);
41-
42-
return $block->setTemplate(self::TEMPLATE)
43-
->setProfilerUrl($this->url->getProfilerUrl($this->redirect->getToken()))
40+
$block = $this->layout->createBlock(
41+
Template::class,
42+
'',
43+
[
44+
'data' => [
45+
'template' => self::TEMPLATE,
46+
],
47+
]
48+
);
49+
50+
return $block->setProfilerUrl($this->url->getProfilerUrl($this->redirect->getToken()))
4451
->setRedirect($this->redirect)
4552
->toHtml();
4653
}

‎Model/View/Renderer/TableRenderer.php‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,21 @@ public function __construct(
2929
public function render(): string
3030
{
3131
/** @var \Magento\Framework\View\Element\Template $block */
32-
$block = $this->layout->createBlock(Template::class);
32+
$block = $this->layout->createBlock(
33+
Template::class,
34+
'',
35+
[
36+
'data' => [
37+
'template' => self::TEMPLATE,
38+
'items' => $this->items,
39+
'labels' => $this->labels,
40+
'var_renderer' => $this->varRenderer,
41+
'key_label' => $this->labels[0] ?? 'Key',
42+
'value_label' => $this->labels[1] ?? 'Value',
43+
],
44+
]
45+
);
3346

34-
return $block->setTemplate(self::TEMPLATE)
35-
->setData('items', $this->items)
36-
->setData('labels', $this->labels)
37-
->setData('var_renderer', $this->varRenderer)
38-
->setData('key_label', $this->labels[0] ?? 'Key')
39-
->setData('value_label', $this->labels[1] ?? 'Value')
40-
->toHtml();
47+
return $block->toHtml();
4148
}
4249
}

0 commit comments

Comments
 (0)