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

Fix WebProfiler when dev mode is active #33990

Merged
merged 1 commit into from
Sep 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions phpstan-baseline.neon
Original file line number Diff line number Diff line change
Expand Up @@ -1410,6 +1410,11 @@ parameters:
count: 1
path: src/PrestaShopBundle/Controller/Api/TranslationController.php

-
message: "#^Class PrestaShopBundle\\\\DataCollector\\\\ConfigDataCollector extends @final class Symfony\\\\Component\\\\HttpKernel\\\\DataCollector\\\\ConfigDataCollector\\.$#"
count: 1
path: src/PrestaShopBundle/DataCollector/ConfigDataCollector.php

-
message: "#^Namespace Tools is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
count: 2
Expand Down
71 changes: 71 additions & 0 deletions src/PrestaShopBundle/DataCollector/ConfigDataCollector.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<?php
/**
* Copyright since 2007 PrestaShop SA and Contributors
* PrestaShop is an International Registered Trademark & Property of PrestaShop SA
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.md.
* It is also available through the world-wide-web at this URL:
* https://opensource.org/licenses/OSL-3.0
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to https://devdocs.prestashop.com/ for more information.
*
* @author PrestaShop SA and Contributors <contact@prestashop.com>
* @copyright Since 2007 PrestaShop SA and Contributors
* @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
*/

namespace PrestaShopBundle\DataCollector;

use PrestaShop\PrestaShop\Core\Foundation\Version;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\DataCollector\ConfigDataCollector as SymfonyDataCollector;

/**
* Class ConfigDataCollector.
* This class is used to collect some data for the WebProfiler.
*/
class ConfigDataCollector extends SymfonyDataCollector
{
public function __construct(
private readonly string $name,
private readonly Version $version
) {
}

/**
* {@inheritdoc}
*/
public function collect(Request $request, Response $response, \Throwable $exception = null)
{
parent::collect($request, $response, $exception);
$this->data['app_name'] = $this->name;
$this->data['app_version'] = $this->version->getSemVersion();
}

/**
* Get the application name.
*/
public function getApplicationName(): string
{
return $this->data['app_name'];
}

/**
* Get the application version.
*/
public function getApplicationVersion(): string
{
return $this->data['app_version'];
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ services:

# Web Profiler Bundle
data_collector.config:
class: Symfony\Component\HttpKernel\DataCollector\ConfigDataCollector
arguments: [ "PrestaShop", "@=service('prestashop.core.foundation.version').getSemVersion()" ]
class: PrestaShopBundle\DataCollector\ConfigDataCollector
arguments:
- 'PrestaShop'
- '@PrestaShop\PrestaShop\Core\Foundation\Version'
public: false
calls:
- [ "setKernel", [ "@kernel" ] ]
Expand Down