diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d086353..5fa4f90 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -10,6 +10,7 @@ jobs: php: - "8.1" - "8.2" + - "8.3" steps: - name: "Checkout" uses: "actions/checkout@v3" @@ -23,7 +24,7 @@ jobs: tools: composer:v2 - name: "Cache Composer dependencies" - uses: "actions/cache@v2" + uses: "actions/cache@v4" with: path: "/tmp/composer-cache" key: php${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }} diff --git a/Console/Command/DatabaseProfilerDisableCommand.php b/Console/Command/DatabaseProfilerDisableCommand.php index 9e97e6a..fe8bc31 100644 --- a/Console/Command/DatabaseProfilerDisableCommand.php +++ b/Console/Command/DatabaseProfilerDisableCommand.php @@ -10,14 +10,10 @@ class DatabaseProfilerDisableCommand extends Command { - private \ClawRock\Debug\Model\Config\Database\ProfilerWriter $profilerWriter; - public function __construct( - \ClawRock\Debug\Model\Config\Database\ProfilerWriter $profilerWriter + private \ClawRock\Debug\Model\Config\Database\ProfilerWriter $profilerWriter ) { parent::__construct('debug:db-profiler:disable'); - - $this->profilerWriter = $profilerWriter; } protected function configure(): void diff --git a/Console/Command/DatabaseProfilerEnableCommand.php b/Console/Command/DatabaseProfilerEnableCommand.php index ebc44c1..2677f5b 100644 --- a/Console/Command/DatabaseProfilerEnableCommand.php +++ b/Console/Command/DatabaseProfilerEnableCommand.php @@ -10,14 +10,10 @@ class DatabaseProfilerEnableCommand extends Command { - private \ClawRock\Debug\Model\Config\Database\ProfilerWriter $profilerWriter; - public function __construct( - \ClawRock\Debug\Model\Config\Database\ProfilerWriter $profilerWriter + private \ClawRock\Debug\Model\Config\Database\ProfilerWriter $profilerWriter ) { parent::__construct('debug:db-profiler:enable'); - - $this->profilerWriter = $profilerWriter; } protected function configure(): void diff --git a/Controller/Cache.php b/Controller/Cache.php index 44034ba..9a5d22c 100644 --- a/Controller/Cache.php +++ b/Controller/Cache.php @@ -7,17 +7,10 @@ abstract class Cache implements HttpGetActionInterface { - protected \Magento\Framework\Controller\ResultFactory $resultFactory; - protected \Magento\Framework\App\RequestInterface $request; - protected \Magento\Framework\App\Cache\Manager $cacheManager; - public function __construct( - \Magento\Framework\Controller\ResultFactory $resultFactory, - \Magento\Framework\App\RequestInterface $request, - \Magento\Framework\App\Cache\Manager $cacheManager + protected \Magento\Framework\Controller\ResultFactory $resultFactory, + protected \Magento\Framework\App\RequestInterface $request, + protected \Magento\Framework\App\Cache\Manager $cacheManager ) { - $this->resultFactory = $resultFactory; - $this->request = $request; - $this->cacheManager = $cacheManager; } } diff --git a/Controller/Profiler/Info.php b/Controller/Profiler/Info.php index 48c385b..f3b5713 100644 --- a/Controller/Profiler/Info.php +++ b/Controller/Profiler/Info.php @@ -11,24 +11,13 @@ class Info implements HttpGetActionInterface { - private \Magento\Framework\View\LayoutInterface $layout; - private \ClawRock\Debug\Api\ProfileRepositoryInterface $profileRepository; - private \ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage; - private \Magento\Framework\Controller\ResultFactory $resultFactory; - private \Magento\Framework\App\RequestInterface $request; - public function __construct( - \Magento\Framework\Controller\ResultFactory $resultFactory, - \Magento\Framework\App\RequestInterface $request, - \Magento\Framework\View\LayoutInterface $layout, - \ClawRock\Debug\Api\ProfileRepositoryInterface $profileRepository, - \ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage + private \Magento\Framework\Controller\ResultFactory $resultFactory, + private \Magento\Framework\App\RequestInterface $request, + private \Magento\Framework\View\LayoutInterface $layout, + private \ClawRock\Debug\Api\ProfileRepositoryInterface $profileRepository, + private \ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage ) { - $this->resultFactory = $resultFactory; - $this->request = $request; - $this->layout = $layout; - $this->profileRepository = $profileRepository; - $this->profileMemoryStorage = $profileMemoryStorage; } public function execute(): ?ResultInterface diff --git a/Controller/Profiler/PHPInfo.php b/Controller/Profiler/PHPInfo.php index 0e64322..322fd96 100644 --- a/Controller/Profiler/PHPInfo.php +++ b/Controller/Profiler/PHPInfo.php @@ -9,12 +9,9 @@ class PHPInfo implements HttpGetActionInterface { - private \Magento\Framework\Controller\ResultFactory $resultFactory; - public function __construct( - \Magento\Framework\Controller\ResultFactory $resultFactory + private \Magento\Framework\Controller\ResultFactory $resultFactory ) { - $this->resultFactory = $resultFactory; } public function execute(): ?ResultInterface diff --git a/Controller/Profiler/Purge.php b/Controller/Profiler/Purge.php index ec1f3a2..04be517 100644 --- a/Controller/Profiler/Purge.php +++ b/Controller/Profiler/Purge.php @@ -10,21 +10,12 @@ class Purge implements HttpGetActionInterface { - private \ClawRock\Debug\Model\Storage\ProfileFileStorage $profileFileStorage; - private \ClawRock\Debug\Logger\Logger $logger; - private \Magento\Framework\Controller\ResultFactory $resultFactory; - private \Magento\Framework\App\Response\RedirectInterface $redirect; - public function __construct( - \Magento\Framework\Controller\ResultFactory $resultFactory, - \Magento\Framework\App\Response\RedirectInterface $redirect, - \ClawRock\Debug\Model\Storage\ProfileFileStorage $profileFileStorage, - \ClawRock\Debug\Logger\Logger $logger + private \Magento\Framework\Controller\ResultFactory $resultFactory, + private \Magento\Framework\App\Response\RedirectInterface $redirect, + private \ClawRock\Debug\Model\Storage\ProfileFileStorage $profileFileStorage, + private \Psr\Log\LoggerInterface $logger ) { - $this->resultFactory = $resultFactory; - $this->redirect = $redirect; - $this->profileFileStorage = $profileFileStorage; - $this->logger = $logger; } public function execute(): ?ResultInterface diff --git a/Controller/Profiler/Search.php b/Controller/Profiler/Search.php index ec4fd0b..c710edb 100644 --- a/Controller/Profiler/Search.php +++ b/Controller/Profiler/Search.php @@ -11,21 +11,12 @@ class Search implements HttpGetActionInterface { - private \Magento\Framework\Controller\ResultFactory $resultFactory; - private \Magento\Framework\App\RequestInterface $request; - private \Magento\Framework\View\LayoutInterface $layout; - private \ClawRock\Debug\Api\ProfileRepositoryInterface $profileRepository; - public function __construct( - \Magento\Framework\Controller\ResultFactory $resultFactory, - \Magento\Framework\App\RequestInterface $request, - \Magento\Framework\View\LayoutInterface $layout, - \ClawRock\Debug\Api\ProfileRepositoryInterface $profileRepository + private \Magento\Framework\Controller\ResultFactory $resultFactory, + private \Magento\Framework\App\RequestInterface $request, + private \Magento\Framework\View\LayoutInterface $layout, + private \ClawRock\Debug\Api\ProfileRepositoryInterface $profileRepository ) { - $this->resultFactory = $resultFactory; - $this->request = $request; - $this->layout = $layout; - $this->profileRepository = $profileRepository; } public function execute(): ?ResultInterface diff --git a/Controller/Profiler/Toolbar.php b/Controller/Profiler/Toolbar.php index 41b4af0..2fcb367 100644 --- a/Controller/Profiler/Toolbar.php +++ b/Controller/Profiler/Toolbar.php @@ -9,21 +9,12 @@ class Toolbar implements HttpGetActionInterface { - private \ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage; - private \ClawRock\Debug\Api\ProfileRepositoryInterface $profileRepository; - private \Magento\Framework\Controller\ResultFactory $resultFactory; - private \Magento\Framework\App\RequestInterface $request; - public function __construct( - \Magento\Framework\Controller\ResultFactory $resultFactory, - \Magento\Framework\App\RequestInterface $request, - \ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage, - \ClawRock\Debug\Api\ProfileRepositoryInterface $profileRepository + private \Magento\Framework\Controller\ResultFactory $resultFactory, + private \Magento\Framework\App\RequestInterface $request, + private \ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage, + private \ClawRock\Debug\Api\ProfileRepositoryInterface $profileRepository ) { - $this->resultFactory = $resultFactory; - $this->request = $request; - $this->profileMemoryStorage = $profileMemoryStorage; - $this->profileRepository = $profileRepository; } public function execute(): ?\Magento\Framework\Controller\ResultInterface diff --git a/Helper/Config.php b/Helper/Config.php index 8f437a7..3f7f037 100644 --- a/Helper/Config.php +++ b/Helper/Config.php @@ -34,24 +34,13 @@ class Config public const CONFIG_COLLECTOR_TRANSLATION = 'clawrock_debug/collector/translation'; public const COLLECTORS = 'clawrock_debug/profiler/collectors'; - private \Magento\Framework\PhraseFactory $phraseFactory; - private \Magento\Framework\App\State $appState; - private \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig; - private \Magento\Framework\App\DeploymentConfig $deploymentConfig; - private \ClawRock\Debug\Model\Storage\HttpStorage $httpStorage; - public function __construct( - \Magento\Framework\PhraseFactory $phraseFactory, - \Magento\Framework\App\State $appState, - \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig, - \Magento\Framework\App\DeploymentConfig $deploymentConfig, - \ClawRock\Debug\Model\Storage\HttpStorage $httpStorage + private \Magento\Framework\PhraseFactory $phraseFactory, + private \Magento\Framework\App\State $appState, + private \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig, + private \Magento\Framework\App\DeploymentConfig $deploymentConfig, + private \ClawRock\Debug\Model\Storage\HttpStorage $httpStorage ) { - $this->phraseFactory = $phraseFactory; - $this->appState = $appState; - $this->scopeConfig = $scopeConfig; - $this->deploymentConfig = $deploymentConfig; - $this->httpStorage = $httpStorage; } public function getErrorHandler(): string diff --git a/Helper/Database.php b/Helper/Database.php index 45ec9ef..40cfd73 100644 --- a/Helper/Database.php +++ b/Helper/Database.php @@ -7,13 +7,11 @@ class Database { - private \Magento\Framework\App\ResourceConnection $resourceConnection; private array $formatterCache = []; public function __construct( - \Magento\Framework\App\ResourceConnection $resourceConnection + private \Magento\Framework\App\ResourceConnection $resourceConnection ) { - $this->resourceConnection = $resourceConnection; } public function getQueryId(\Zend_Db_Profiler_Query $query): string diff --git a/Helper/File.php b/Helper/File.php index 48382df..3416812 100644 --- a/Helper/File.php +++ b/Helper/File.php @@ -5,10 +5,8 @@ class File { - private \Magento\Framework\App\Filesystem\DirectoryList $directoryList; - public function __construct( - \Magento\Framework\App\Filesystem\DirectoryList $directoryList + private \Magento\Framework\App\Filesystem\DirectoryList $directoryList ) { $this->directoryList = $directoryList; } diff --git a/Helper/Formatter.php b/Helper/Formatter.php index f510d9b..f1c1496 100644 --- a/Helper/Formatter.php +++ b/Helper/Formatter.php @@ -5,12 +5,9 @@ class Formatter { - private \ClawRock\Debug\Helper\Config $config; - public function __construct( - \ClawRock\Debug\Helper\Config $config + private \ClawRock\Debug\Helper\Config $config ) { - $this->config = $config; } public function microtime(float $value, ?int $precision = null): string diff --git a/Helper/Injector.php b/Helper/Injector.php index c54d249..41efd30 100644 --- a/Helper/Injector.php +++ b/Helper/Injector.php @@ -12,15 +12,10 @@ class Injector private const TEMPLATE_TOOLBAR = 'ClawRock_Debug::profiler/toolbar/js.phtml'; private const TEMPLATE_BLOCK = 'ClawRock_Debug::profiler/js.phtml'; - private \Magento\Framework\View\LayoutInterface $layout; - private \ClawRock\Debug\Model\View\Toolbar $viewModel; - public function __construct( - \Magento\Framework\View\LayoutInterface $layout, - \ClawRock\Debug\Model\View\Toolbar $viewModel + private \Magento\Framework\View\LayoutInterface $layout, + private \ClawRock\Debug\Model\View\Toolbar $viewModel ) { - $this->layout = $layout; - $this->viewModel = $viewModel; } public function inject(Request $request, Response $response, ?string $token = null): void diff --git a/Helper/Url.php b/Helper/Url.php index 8e6c827..ca3b537 100644 --- a/Helper/Url.php +++ b/Helper/Url.php @@ -12,15 +12,10 @@ class Url public const CONFIGURATION_URL_PATH = 'debug/profiler/config'; public const PROFILER_URL_PATH = '_debug/profiler/info'; - private \Magento\Framework\UrlInterface $url; - private \Magento\Backend\Model\UrlInterface $backendUrl; - public function __construct( - \Magento\Framework\Url $url, - \Magento\Backend\Model\UrlInterface $backendUrl + private \Magento\Framework\Url $url, + private \Magento\Backend\Model\UrlInterface $backendUrl ) { - $this->url = $url; - $this->backendUrl = $backendUrl; } public function getAdminUrl(): string diff --git a/Logger/Handler.php b/Logger/Handler.php deleted file mode 100644 index f1f77ab..0000000 --- a/Logger/Handler.php +++ /dev/null @@ -1,11 +0,0 @@ -config = $config; } public function collect(): CollectorInterface diff --git a/Model/Collector/CacheCollector.php b/Model/Collector/CacheCollector.php index 9395306..752bd77 100644 --- a/Model/Collector/CacheCollector.php +++ b/Model/Collector/CacheCollector.php @@ -19,24 +19,18 @@ class CacheCollector implements CollectorInterface, LoggerCollectorInterface public const TOTAL_TIME = 'total_time'; public const CACHE_STATUS = 'status'; - private \ClawRock\Debug\Helper\Config $config; private \ClawRock\Debug\Model\DataCollector $dataCollector; private \ClawRock\Debug\Logger\DataLogger $dataLogger; - private \ClawRock\Debug\Model\Info\CacheInfo $cacheInfo; - private \ClawRock\Debug\Helper\Formatter $formatter; public function __construct( - \ClawRock\Debug\Helper\Config $config, + private \ClawRock\Debug\Helper\Config $config, \ClawRock\Debug\Model\DataCollectorFactory $dataCollectorFactory, \ClawRock\Debug\Logger\DataLoggerFactory $dataLogger, - \ClawRock\Debug\Model\Info\CacheInfo $cacheInfo, - \ClawRock\Debug\Helper\Formatter $formatter + private \ClawRock\Debug\Model\Info\CacheInfo $cacheInfo, + private \ClawRock\Debug\Helper\Formatter $formatter ) { - $this->config = $config; $this->dataCollector = $dataCollectorFactory->create(); $this->dataLogger = $dataLogger->create(); - $this->cacheInfo = $cacheInfo; - $this->formatter = $formatter; } public function collect(): CollectorInterface diff --git a/Model/Collector/ConfigCollector.php b/Model/Collector/ConfigCollector.php index 2578ce9..7c9424b 100644 --- a/Model/Collector/ConfigCollector.php +++ b/Model/Collector/ConfigCollector.php @@ -26,30 +26,18 @@ class ConfigCollector implements CollectorInterface public const WINCACHE_ENABLED = 'wincache_enabled'; public const OPCACHE_ENABLED = 'zend_opcache_enabled'; - private \Magento\Store\Model\StoreManagerInterface $storeManager; - private \ClawRock\Debug\Helper\Config $config; - private \ClawRock\Debug\Helper\Url $url; private \ClawRock\Debug\Model\DataCollector $dataCollector; - private \ClawRock\Debug\Model\Info\MagentoInfo $magentoInfo; - private \ClawRock\Debug\Model\Info\ExtensionInfo $extensionInfo; - private \ClawRock\Debug\Model\Storage\HttpStorage $httpStorage; public function __construct( - \Magento\Store\Model\StoreManagerInterface $storeManager, - \ClawRock\Debug\Helper\Config $config, - \ClawRock\Debug\Helper\Url $url, + private \Magento\Store\Model\StoreManagerInterface $storeManager, + private \ClawRock\Debug\Helper\Config $config, + private \ClawRock\Debug\Helper\Url $url, \ClawRock\Debug\Model\DataCollectorFactory $dataCollectorFactory, - \ClawRock\Debug\Model\Info\MagentoInfo $magentoInfo, - \ClawRock\Debug\Model\Info\ExtensionInfo $extensionInfo, - \ClawRock\Debug\Model\Storage\HttpStorage $httpStorage + private \ClawRock\Debug\Model\Info\MagentoInfo $magentoInfo, + private \ClawRock\Debug\Model\Info\ExtensionInfo $extensionInfo, + private \ClawRock\Debug\Model\Storage\HttpStorage $httpStorage ) { - $this->storeManager = $storeManager; - $this->config = $config; $this->dataCollector = $dataCollectorFactory->create(); - $this->magentoInfo = $magentoInfo; - $this->extensionInfo = $extensionInfo; - $this->httpStorage = $httpStorage; - $this->url = $url; } public function collect(): CollectorInterface diff --git a/Model/Collector/CustomerCollector.php b/Model/Collector/CustomerCollector.php index 6800839..cf94ac7 100644 --- a/Model/Collector/CustomerCollector.php +++ b/Model/Collector/CustomerCollector.php @@ -15,18 +15,14 @@ class CustomerCollector implements CollectorInterface public const CUSTOMER_TAX_CLASS_ID = 'customer_tax_class_id'; public const CUSTOMER_TAX_CLASS_NAME = 'customer_tax_class_name'; - private \ClawRock\Debug\Helper\Config $config; private \ClawRock\Debug\Model\DataCollector $dataCollector; - private \ClawRock\Debug\Model\Info\CustomerInfo $customerInfo; public function __construct( - \ClawRock\Debug\Helper\Config $config, + private \ClawRock\Debug\Helper\Config $config, \ClawRock\Debug\Model\DataCollectorFactory $dataCollectorFactory, - \ClawRock\Debug\Model\Info\CustomerInfo $customerInfo + private \ClawRock\Debug\Model\Info\CustomerInfo $customerInfo ) { - $this->config = $config; $this->dataCollector = $dataCollectorFactory->create(); - $this->customerInfo = $customerInfo; } public function collect(): CollectorInterface diff --git a/Model/Collector/DatabaseCollector.php b/Model/Collector/DatabaseCollector.php index 88cbd64..c381fba 100644 --- a/Model/Collector/DatabaseCollector.php +++ b/Model/Collector/DatabaseCollector.php @@ -12,21 +12,15 @@ class DatabaseCollector implements CollectorInterface public const QUERY_COUNT = 'query_count'; public const QUERIES = 'queries'; - private \ClawRock\Debug\Helper\Config $config; private \ClawRock\Debug\Model\DataCollector $dataCollector; - private \ClawRock\Debug\Model\Info\DatabaseInfo $databaseInfo; - private \ClawRock\Debug\Helper\Formatter $formatter; public function __construct( - \ClawRock\Debug\Helper\Config $config, + private \ClawRock\Debug\Helper\Config $config, \ClawRock\Debug\Model\DataCollectorFactory $dataCollectorFactory, - DatabaseInfo $databaseInfo, - \ClawRock\Debug\Helper\Formatter $formatter + private DatabaseInfo $databaseInfo, + private \ClawRock\Debug\Helper\Formatter $formatter ) { - $this->config = $config; $this->dataCollector = $dataCollectorFactory->create(); - $this->databaseInfo = $databaseInfo; - $this->formatter = $formatter; } public function collect(): CollectorInterface diff --git a/Model/Collector/EventCollector.php b/Model/Collector/EventCollector.php index 2ffc503..1a3d3e9 100644 --- a/Model/Collector/EventCollector.php +++ b/Model/Collector/EventCollector.php @@ -14,24 +14,18 @@ class EventCollector implements CollectorInterface, LateCollectorInterface, Logg public const OBSERVERS_COUNT = 'observers_count'; public const DISPATCH_COUNT = 'events_count'; - private \ClawRock\Debug\Helper\Config $config; private \ClawRock\Debug\Model\DataCollector $dataCollector; private \ClawRock\Debug\Logger\DataLogger $dataLogger; - private \ClawRock\Debug\Helper\Formatter $formatter; - private \ClawRock\Debug\Helper\Debug $debug; public function __construct( - \ClawRock\Debug\Helper\Config $config, + private \ClawRock\Debug\Helper\Config $config, \ClawRock\Debug\Model\DataCollectorFactory $dataCollectorFactory, \ClawRock\Debug\Logger\DataLoggerFactory $dataLoggerFactory, - \ClawRock\Debug\Helper\Formatter $formatter, - \ClawRock\Debug\Helper\Debug $debug + private \ClawRock\Debug\Helper\Formatter $formatter, + private \ClawRock\Debug\Helper\Debug $debug ) { - $this->config = $config; $this->dataCollector = $dataCollectorFactory->create(); $this->dataLogger = $dataLoggerFactory->create(); - $this->formatter = $formatter; - $this->debug = $debug; } public function collect(): CollectorInterface diff --git a/Model/Collector/LayoutCollector.php b/Model/Collector/LayoutCollector.php index 9ac0c83..79661ec 100644 --- a/Model/Collector/LayoutCollector.php +++ b/Model/Collector/LayoutCollector.php @@ -22,24 +22,18 @@ class LayoutCollector implements CollectorInterface, LoggerCollectorInterface public const TOTAL_RENDER_TIME = 'total_render_time'; public const RENDER_TIME = 'render_time'; - private \ClawRock\Debug\Helper\Config $config; private \ClawRock\Debug\Model\DataCollector $dataCollector; private \ClawRock\Debug\Logger\DataLogger $dataLogger; - private \ClawRock\Debug\Model\Info\LayoutInfo $layoutInfo; - private \ClawRock\Debug\Helper\Formatter $formatter; public function __construct( - \ClawRock\Debug\Helper\Config $config, + private \ClawRock\Debug\Helper\Config $config, \ClawRock\Debug\Model\DataCollectorFactory $dataCollectorFactory, \ClawRock\Debug\Logger\DataLoggerFactory $dataLogger, - \ClawRock\Debug\Model\Info\LayoutInfo $layoutInfo, - \ClawRock\Debug\Helper\Formatter $formatter + private \ClawRock\Debug\Model\Info\LayoutInfo $layoutInfo, + private \ClawRock\Debug\Helper\Formatter $formatter ) { - $this->config = $config; $this->dataCollector = $dataCollectorFactory->create(); $this->dataLogger = $dataLogger->create(); - $this->layoutInfo = $layoutInfo; - $this->formatter = $formatter; } public function collect(): CollectorInterface diff --git a/Model/Collector/MemoryCollector.php b/Model/Collector/MemoryCollector.php index 4953baf..69367fd 100644 --- a/Model/Collector/MemoryCollector.php +++ b/Model/Collector/MemoryCollector.php @@ -9,21 +9,15 @@ class MemoryCollector implements CollectorInterface, LateCollectorInterface public const MEMORY_USAGE = 'memory_usage'; public const MEMORY_LIMIT = 'memory_limit'; - private \ClawRock\Debug\Helper\Config $config; private \ClawRock\Debug\Model\DataCollector $dataCollector; - private \ClawRock\Debug\Model\Info\MemoryInfo $memoryInfo; - private \ClawRock\Debug\Helper\Formatter $formatter; public function __construct( - \ClawRock\Debug\Helper\Config $config, + private \ClawRock\Debug\Helper\Config $config, \ClawRock\Debug\Model\DataCollectorFactory $dataCollectorFactory, - \ClawRock\Debug\Model\Info\MemoryInfo $memoryInfo, - \ClawRock\Debug\Helper\Formatter $formatter + private \ClawRock\Debug\Model\Info\MemoryInfo $memoryInfo, + private \ClawRock\Debug\Helper\Formatter $formatter ) { - $this->config = $config; $this->dataCollector = $dataCollectorFactory->create(); - $this->memoryInfo = $memoryInfo; - $this->formatter = $formatter; } public function collect(): CollectorInterface diff --git a/Model/Collector/ModelCollector.php b/Model/Collector/ModelCollector.php index 761626d..ae8160e 100644 --- a/Model/Collector/ModelCollector.php +++ b/Model/Collector/ModelCollector.php @@ -16,16 +16,14 @@ class ModelCollector implements CollectorInterface, LoggerCollectorInterface public const LOG = 'log'; public const LOAD_LOOPS = 'load_loops'; - private \ClawRock\Debug\Helper\Config $config; private \ClawRock\Debug\Model\DataCollector $dataCollector; private \ClawRock\Debug\Logger\DataLogger $dataLogger; public function __construct( - \ClawRock\Debug\Helper\Config $config, + private \ClawRock\Debug\Helper\Config $config, \ClawRock\Debug\Model\DataCollectorFactory $dataCollectorFactory, \ClawRock\Debug\Logger\DataLoggerFactory $dataLoggerFactory ) { - $this->config = $config; $this->dataCollector = $dataCollectorFactory->create(); $this->dataLogger = $dataLoggerFactory->create(); } diff --git a/Model/Collector/PluginCollector.php b/Model/Collector/PluginCollector.php index 59eedfa..7ab4068 100644 --- a/Model/Collector/PluginCollector.php +++ b/Model/Collector/PluginCollector.php @@ -10,18 +10,14 @@ class PluginCollector implements CollectorInterface, LateCollectorInterface public const AROUND = 'around'; public const AFTER = 'after'; - private \ClawRock\Debug\Helper\Config $config; private \ClawRock\Debug\Model\DataCollector $dataCollector; - private \ClawRock\Debug\Model\Info\PluginInfo $pluginInfo; public function __construct( - \ClawRock\Debug\Helper\Config $config, + private \ClawRock\Debug\Helper\Config $config, \ClawRock\Debug\Model\DataCollectorFactory $dataCollectorFactory, - \ClawRock\Debug\Model\Info\PluginInfo $pluginInfo + private \ClawRock\Debug\Model\Info\PluginInfo $pluginInfo ) { - $this->config = $config; $this->dataCollector = $dataCollectorFactory->create(); - $this->pluginInfo = $pluginInfo; } public function collect(): CollectorInterface diff --git a/Model/Collector/RequestCollector.php b/Model/Collector/RequestCollector.php index b3ce6c3..d95ebc9 100644 --- a/Model/Collector/RequestCollector.php +++ b/Model/Collector/RequestCollector.php @@ -32,14 +32,12 @@ class RequestCollector implements CollectorInterface public const FULL_ACTION_NAME = 'full_action_name'; private \ClawRock\Debug\Model\DataCollector $dataCollector; - private \ClawRock\Debug\Model\Info\RequestInfo $requestInfo; public function __construct( \ClawRock\Debug\Model\DataCollectorFactory $dataCollectorFactory, - \ClawRock\Debug\Model\Info\RequestInfo $requestInfo + private \ClawRock\Debug\Model\Info\RequestInfo $requestInfo ) { $this->dataCollector = $dataCollectorFactory->create(); - $this->requestInfo = $requestInfo; } public function collect(): CollectorInterface diff --git a/Model/Collector/TimeCollector.php b/Model/Collector/TimeCollector.php index 959e18e..6ce68fc 100644 --- a/Model/Collector/TimeCollector.php +++ b/Model/Collector/TimeCollector.php @@ -28,27 +28,17 @@ class TimeCollector implements CollectorInterface, LateCollectorInterface public const ERROR_THRESHOLD = 2000; public const WARNING_THRESHOLD = 1000; - private \Magento\Framework\Serialize\SerializerInterface $serializer; - private \ClawRock\Debug\Helper\Config $config; private \ClawRock\Debug\Model\DataCollector $dataCollector; - private \ClawRock\Debug\Model\Profiler\Driver\StopwatchDriver $stopwatchDriver; - private \ClawRock\Debug\Helper\Formatter $formatter; - private \ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage; public function __construct( - \Magento\Framework\Serialize\SerializerInterface $serializer, - \ClawRock\Debug\Helper\Config $config, + private \Magento\Framework\Serialize\SerializerInterface $serializer, + private \ClawRock\Debug\Helper\Config $config, \ClawRock\Debug\Model\DataCollectorFactory $dataCollectorFactory, - \ClawRock\Debug\Model\Profiler\Driver\StopwatchDriver $stopwatchDriver, - \ClawRock\Debug\Helper\Formatter $formatter, - \ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage + private \ClawRock\Debug\Model\Profiler\Driver\StopwatchDriver $stopwatchDriver, + private \ClawRock\Debug\Helper\Formatter $formatter, + private \ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage ) { - $this->serializer = $serializer; - $this->config = $config; $this->dataCollector = $dataCollectorFactory->create(); - $this->stopwatchDriver = $stopwatchDriver; - $this->formatter = $formatter; - $this->profileMemoryStorage = $profileMemoryStorage; } /** diff --git a/Model/Collector/TranslationCollector.php b/Model/Collector/TranslationCollector.php index 4b6a75e..2dc2cae 100644 --- a/Model/Collector/TranslationCollector.php +++ b/Model/Collector/TranslationCollector.php @@ -12,16 +12,14 @@ class TranslationCollector implements CollectorInterface, LoggerCollectorInterfa public const DEFINED = 'defined'; public const MISSING = 'missing'; - private \ClawRock\Debug\Helper\Config $config; private \ClawRock\Debug\Model\DataCollector $dataCollector; private \ClawRock\Debug\Logger\DataLogger $dataLogger; public function __construct( - \ClawRock\Debug\Helper\Config $config, + private \ClawRock\Debug\Helper\Config $config, \ClawRock\Debug\Model\DataCollectorFactory $dataCollectorFactory, \ClawRock\Debug\Logger\DataLoggerFactory $dataLoggerFactory ) { - $this->config = $config; $this->dataCollector = $dataCollectorFactory->create(); $this->dataLogger = $dataLoggerFactory->create(); } diff --git a/Model/Config/Database/ProfilerWriter.php b/Model/Config/Database/ProfilerWriter.php index fae7040..3062c21 100644 --- a/Model/Config/Database/ProfilerWriter.php +++ b/Model/Config/Database/ProfilerWriter.php @@ -9,12 +9,9 @@ class ProfilerWriter { - private \Magento\Framework\App\DeploymentConfig\Writer $configWriter; - public function __construct( - \Magento\Framework\App\DeploymentConfig\Writer $configWriter + private \Magento\Framework\App\DeploymentConfig\Writer $configWriter ) { - $this->configWriter = $configWriter; } public function save(bool $flag): void diff --git a/Model/Indexer/ProfileIndexer.php b/Model/Indexer/ProfileIndexer.php index 53ccdb6..606ec10 100644 --- a/Model/Indexer/ProfileIndexer.php +++ b/Model/Indexer/ProfileIndexer.php @@ -7,21 +7,12 @@ class ProfileIndexer { - private \Magento\Framework\Filesystem\Driver\File $fileSystem; - private \Magento\Framework\Filesystem\File\WriteFactory $fileWriteFactory; - private \ClawRock\Debug\Logger\Logger $logger; - private \ClawRock\Debug\Helper\File $fileHelper; - public function __construct( - \Magento\Framework\Filesystem\Driver\File $fileSystem, - \Magento\Framework\Filesystem\File\WriteFactory $fileWriteFactory, - \ClawRock\Debug\Logger\Logger $logger, - \ClawRock\Debug\Helper\File $fileHelper + private \Magento\Framework\Filesystem\Driver\File $fileSystem, + private \Magento\Framework\Filesystem\File\WriteFactory $fileWriteFactory, + private \ClawRock\Debug\Helper\File $fileHelper, + private \Psr\Log\LoggerInterface $logger ) { - $this->fileSystem = $fileSystem; - $this->fileWriteFactory = $fileWriteFactory; - $this->logger = $logger; - $this->fileHelper = $fileHelper; } public function index(ProfileInterface $profile): void @@ -39,7 +30,7 @@ public function index(ProfileInterface $profile): void : ''; $this->fileSystem->filePutContents($this->fileHelper->getProfileIndex(), $index); - } catch (\Exception $e) { + } catch (\Throwable $e) { $this->logger->error('ClawRock_Debug: Error during profile indexation', ['exception' => $e]); } } diff --git a/Model/Info/CacheInfo.php b/Model/Info/CacheInfo.php index 57be2fa..1c99356 100644 --- a/Model/Info/CacheInfo.php +++ b/Model/Info/CacheInfo.php @@ -12,17 +12,13 @@ class CacheInfo public const STATS_MISS = 'stats_miss'; public const STATS_SAVE = 'stats_save'; - private \Magento\Framework\App\Cache $cache; - private \Magento\Framework\App\Cache\TypeListInterface $typeList; private ?array $stats = null; private ?float $totalTime = null; public function __construct( - \Magento\Framework\App\Cache $cache, - \Magento\Framework\App\Cache\TypeListInterface $typeList + private \Magento\Framework\App\Cache $cache, + private \Magento\Framework\App\Cache\TypeListInterface $typeList ) { - $this->cache = $cache; - $this->typeList = $typeList; } public function getBackendClass(): string diff --git a/Model/Info/CustomerInfo.php b/Model/Info/CustomerInfo.php index d67a038..79dc439 100644 --- a/Model/Info/CustomerInfo.php +++ b/Model/Info/CustomerInfo.php @@ -8,18 +8,11 @@ class CustomerInfo { - private \Magento\Customer\Model\Session $session; - private \Magento\Customer\Api\GroupRepositoryInterface $groupRepository; - private \Magento\Customer\Api\Data\GroupInterfaceFactory $groupInterfaceFactory; - public function __construct( - \Magento\Customer\Model\Session $session, - \Magento\Customer\Api\GroupRepositoryInterface $groupRepository, - \Magento\Customer\Api\Data\GroupInterfaceFactory $groupInterfaceFactory + private \Magento\Customer\Model\Session $session, + private \Magento\Customer\Api\GroupRepositoryInterface $groupRepository, + private \Magento\Customer\Api\Data\GroupInterfaceFactory $groupInterfaceFactory ) { - $this->session = $session; - $this->groupRepository = $groupRepository; - $this->groupInterfaceFactory = $groupInterfaceFactory; } public function isLoggedIn(): bool diff --git a/Model/Info/DatabaseInfo.php b/Model/Info/DatabaseInfo.php index c1d42fa..a10024e 100644 --- a/Model/Info/DatabaseInfo.php +++ b/Model/Info/DatabaseInfo.php @@ -9,16 +9,12 @@ class DatabaseInfo public const ALL_QUERIES = 'all'; public const DUPLICATED_QUERIES = 'duplicated'; - private \Magento\Framework\App\ResourceConnection $resourceConnection; private ?\Zend_Db_Profiler $profiler = null; - private \ClawRock\Debug\Helper\Database $databaseHelper; public function __construct( - \Magento\Framework\App\ResourceConnection $resourceConnection, - \ClawRock\Debug\Helper\Database $databaseHelper + private \Magento\Framework\App\ResourceConnection $resourceConnection, + private \ClawRock\Debug\Helper\Database $databaseHelper ) { - $this->resourceConnection = $resourceConnection; - $this->databaseHelper = $databaseHelper; } public function getQueries(): array diff --git a/Model/Info/LayoutInfo.php b/Model/Info/LayoutInfo.php index d89959d..408d20e 100644 --- a/Model/Info/LayoutInfo.php +++ b/Model/Info/LayoutInfo.php @@ -8,12 +8,9 @@ class LayoutInfo { - private \Magento\Framework\View\LayoutInterface $layout; - public function __construct( - \Magento\Framework\View\LayoutInterface $layout + private \Magento\Framework\View\LayoutInterface $layout ) { - $this->layout = $layout; } public function getHandles(): array diff --git a/Model/Info/MagentoInfo.php b/Model/Info/MagentoInfo.php index 0e6db9c..433b929 100644 --- a/Model/Info/MagentoInfo.php +++ b/Model/Info/MagentoInfo.php @@ -10,24 +10,13 @@ class MagentoInfo public const MODULES_CACHE_ID = 'ClawRock_Debug::modules'; public const VERSION_CACHE_ID = 'ClawRock_Debug::version'; - private \Magento\Framework\App\State $appState; - private \Magento\Framework\App\Cache\Type\Config $cache; - private \Magento\Framework\App\ProductMetadataInterface $productMetadata; - private \Magento\Framework\Module\ModuleListInterface $moduleList; - private \Magento\Framework\Serialize\SerializerInterface $serializer; - public function __construct( - \Magento\Framework\App\State $appState, - \Magento\Framework\App\Cache\Type\Config $cache, - \Magento\Framework\App\ProductMetadataInterface $productMetadata, - \Magento\Framework\Module\ModuleListInterface $moduleList, - \Magento\Framework\Serialize\SerializerInterface $serializer + private \Magento\Framework\App\State $appState, + private \Magento\Framework\App\Cache\Type\Config $cache, + private \Magento\Framework\App\ProductMetadataInterface $productMetadata, + private \Magento\Framework\Module\ModuleListInterface $moduleList, + private \Magento\Framework\Serialize\SerializerInterface $serializer ) { - $this->appState = $appState; - $this->cache = $cache; - $this->productMetadata = $productMetadata; - $this->moduleList = $moduleList; - $this->serializer = $serializer; } public function isDeveloperMode(): bool diff --git a/Model/Info/PluginInfo.php b/Model/Info/PluginInfo.php index a53210c..568205c 100644 --- a/Model/Info/PluginInfo.php +++ b/Model/Info/PluginInfo.php @@ -10,15 +10,11 @@ class PluginInfo { private ?array $plugins = null; - private \Magento\Framework\Interception\PluginList\PluginList $pluginList; - private \ClawRock\Debug\Helper\Debug $debug; public function __construct( - \Magento\Framework\Interception\PluginList\PluginList $pluginList, - \ClawRock\Debug\Helper\Debug $debug + private \Magento\Framework\Interception\PluginList\PluginList $pluginList, + private \ClawRock\Debug\Helper\Debug $debug ) { - $this->pluginList = $pluginList; - $this->debug = $debug; } public function getBeforePlugins(): array diff --git a/Model/Info/RequestInfo.php b/Model/Info/RequestInfo.php index 43ddb0c..fa2ac17 100644 --- a/Model/Info/RequestInfo.php +++ b/Model/Info/RequestInfo.php @@ -15,15 +15,10 @@ class RequestInfo public const PASSWORD_PLACEHOLDER = '******'; public const REDIRECT_PARAM = 'cdbg_redirect'; - private \ClawRock\Debug\Model\Storage\HttpStorage $httpStorage; - private \ClawRock\Debug\Model\Session $session; - public function __construct( - \ClawRock\Debug\Model\Storage\HttpStorage $httpStorage, - \ClawRock\Debug\Model\Session $session + private \ClawRock\Debug\Model\Storage\HttpStorage $httpStorage, + private \ClawRock\Debug\Model\Session $session ) { - $this->httpStorage = $httpStorage; - $this->session = $session; } public function getRequestGet(): ParametersInterface diff --git a/Model/Profile.php b/Model/Profile.php index b0f1ed8..595e8da 100644 --- a/Model/Profile.php +++ b/Model/Profile.php @@ -35,7 +35,6 @@ class Profile implements ProfileInterface 'requestTime', ]; - private string $token; private array $collectors = []; private string $ip; private string $method; @@ -50,10 +49,8 @@ class Profile implements ProfileInterface private int $fileSize; private string $requestTime = '0.0'; - public function __construct( - string $token - ) { - $this->token = $token; + public function __construct(private string $token) + { } public function getToken(): string diff --git a/Model/Profile/Criteria.php b/Model/Profile/Criteria.php index 3ad0db3..fdefad3 100644 --- a/Model/Profile/Criteria.php +++ b/Model/Profile/Criteria.php @@ -8,37 +8,22 @@ class Criteria { - private string $ip; - private string $url; - private int $limit; - private string $method; - private ?\DateTime $start; - private ?\DateTime $end; - private ?int $statusCode; - public function __construct( - string $ip = '', - string $url = '', - int $limit = 0, - string $method = '', - ?\DateTime $start = null, - ?\DateTime $end = null, - ?int $statusCode = null + private string $ip = '', + private string $url = '', + private int $limit = 0, + private string $method = '', + private ?\DateTime $start = null, + private ?\DateTime $end = null, + private ?int $statusCode = null ) { - $this->ip = $ip; - $this->url = $url; - $this->limit = $limit; - $this->method = $method; - $this->start = $start; - $this->end = $end; - $this->statusCode = $statusCode; } // phpcs:ignore Magento2.Functions.StaticFunction.StaticFunction public static function createFromRequest(RequestInterface $request): Criteria { return new Criteria( - (string) preg_replace('/[^:\d\.]/', '', $request->getParam('ip')), + (string) preg_replace('/[^:\d\.]/', '', $request->getParam('ip') ?? ''), (string) $request->getParam('url'), (int) $request->getParam('limit'), (string) $request->getParam('method'), diff --git a/Model/ProfileRepository.php b/Model/ProfileRepository.php index be3de01..bf24df5 100644 --- a/Model/ProfileRepository.php +++ b/Model/ProfileRepository.php @@ -13,15 +13,10 @@ class ProfileRepository implements ProfileRepositoryInterface { - private \ClawRock\Debug\Model\Storage\ProfileFileStorage $fileStorage; - private \ClawRock\Debug\Model\Profile\CriteriaFactory $criteriaFactory; - public function __construct( - \ClawRock\Debug\Model\Storage\ProfileFileStorage $fileStorage, - \ClawRock\Debug\Model\Profile\CriteriaFactory $criteriaFactory + private \ClawRock\Debug\Model\Storage\ProfileFileStorage $fileStorage, + private \ClawRock\Debug\Model\Profile\CriteriaFactory $criteriaFactory ) { - $this->fileStorage = $fileStorage; - $this->criteriaFactory = $criteriaFactory; } public function save(ProfileInterface $profile): void diff --git a/Model/Profiler.php b/Model/Profiler.php index 195d0e5..6671f66 100644 --- a/Model/Profiler.php +++ b/Model/Profiler.php @@ -20,36 +20,18 @@ class Profiler /** @var null|\ClawRock\Debug\Model\Collector\CollectorInterface[] */ private ?array $dataCollectors = null; - private \Magento\Framework\ObjectManagerInterface $objectManager; - private \ClawRock\Debug\Helper\Config $config; - private \ClawRock\Debug\Model\ProfileFactory $profileFactory; - private \ClawRock\Debug\Helper\Url $urlHelper; - private \ClawRock\Debug\Helper\Injector $injector; - private \ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage; - private \ClawRock\Debug\Api\ProfileRepositoryInterface $profileRepository; - private \ClawRock\Debug\Model\Storage\HttpStorage $httpStorage; - private \ClawRock\Debug\Logger\Logger $logger; public function __construct( - \Magento\Framework\ObjectManagerInterface $objectManager, - \ClawRock\Debug\Helper\Config $config, - \ClawRock\Debug\Model\ProfileFactory $profileFactory, - \ClawRock\Debug\Helper\Url $urlHelper, - \ClawRock\Debug\Helper\Injector $injector, - \ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage, - \ClawRock\Debug\Api\ProfileRepositoryInterface $profileRepository, - \ClawRock\Debug\Model\Storage\HttpStorage $httpStorage, - \ClawRock\Debug\Logger\Logger $logger + private \Magento\Framework\ObjectManagerInterface $objectManager, + private \ClawRock\Debug\Helper\Config $config, + private \ClawRock\Debug\Model\ProfileFactory $profileFactory, + private \ClawRock\Debug\Helper\Url $urlHelper, + private \ClawRock\Debug\Helper\Injector $injector, + private \ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage, + private \ClawRock\Debug\Api\ProfileRepositoryInterface $profileRepository, + private \ClawRock\Debug\Model\Storage\HttpStorage $httpStorage, + private \Psr\Log\LoggerInterface $logger ) { - $this->objectManager = $objectManager; - $this->config = $config; - $this->profileFactory = $profileFactory; - $this->urlHelper = $urlHelper; - $this->injector = $injector; - $this->profileMemoryStorage = $profileMemoryStorage; - $this->profileRepository = $profileRepository; - $this->httpStorage = $httpStorage; - $this->logger = $logger; } public function run(Request $request, Response $response): void @@ -61,7 +43,7 @@ public function run(Request $request, Response $response): void try { $profile = $this->collect($request, $response); $this->profileMemoryStorage->write($profile); - } catch (\Exception $e) { + } catch (\Throwable $e) { $this->logger->error($e->getMessage()); return; @@ -162,7 +144,7 @@ public function onTerminate(): void } $this->profileRepository->save($profile); - } catch (\Exception $e) { + } catch (\Throwable $e) { $this->logger->error('ClawRock_Debug: onTerminate error', ['exception' => $e]); } } diff --git a/Model/Serializer/CollectorSerializer.php b/Model/Serializer/CollectorSerializer.php index c2341a0..ee3649d 100644 --- a/Model/Serializer/CollectorSerializer.php +++ b/Model/Serializer/CollectorSerializer.php @@ -7,18 +7,11 @@ class CollectorSerializer { - private \Magento\Framework\ObjectManagerInterface $objectManager; - private \ClawRock\Debug\Logger\Logger $logger; - private \ClawRock\Debug\Helper\Config $config; - public function __construct( - \Magento\Framework\ObjectManagerInterface $objectManager, - \ClawRock\Debug\Logger\Logger $logger, - \ClawRock\Debug\Helper\Config $config + private \Magento\Framework\ObjectManagerInterface $objectManager, + private \ClawRock\Debug\Helper\Config $config, + private \Psr\Log\LoggerInterface $logger ) { - $this->objectManager = $objectManager; - $this->logger = $logger; - $this->config = $config; } /** diff --git a/Model/Serializer/ProfileSerializer.php b/Model/Serializer/ProfileSerializer.php index 8c9754a..4133d62 100644 --- a/Model/Serializer/ProfileSerializer.php +++ b/Model/Serializer/ProfileSerializer.php @@ -7,18 +7,11 @@ class ProfileSerializer { - private \ClawRock\Debug\Serializer\SerializerInterface $serializer; - private \ClawRock\Debug\Model\Serializer\CollectorSerializer $collectorSerializer; - private \ClawRock\Debug\Model\ProfileFactory $profileFactory; - public function __construct( - \ClawRock\Debug\Serializer\SerializerInterface $serializer, - \ClawRock\Debug\Model\Serializer\CollectorSerializer $collectorSerializer, - \ClawRock\Debug\Model\ProfileFactory $profileFactory + private \ClawRock\Debug\Serializer\SerializerInterface $serializer, + private \ClawRock\Debug\Model\Serializer\CollectorSerializer $collectorSerializer, + private \ClawRock\Debug\Model\ProfileFactory $profileFactory ) { - $this->serializer = $serializer; - $this->collectorSerializer = $collectorSerializer; - $this->profileFactory = $profileFactory; } public function serialize(ProfileInterface $profile): string diff --git a/Model/Storage/ProfileFileStorage.php b/Model/Storage/ProfileFileStorage.php index c7a458d..ef8ab09 100644 --- a/Model/Storage/ProfileFileStorage.php +++ b/Model/Storage/ProfileFileStorage.php @@ -10,30 +10,15 @@ class ProfileFileStorage { - private \Magento\Framework\Filesystem\Driver\File $fileSystem; - private \Magento\Framework\Filesystem\File\ReadFactory $fileReadFactory; - private \Magento\Framework\Filesystem\File\WriteFactory $fileWriteFactory; - private \ClawRock\Debug\Logger\Logger $logger; - private \ClawRock\Debug\Helper\File $fileHelper; - private \ClawRock\Debug\Model\Serializer\ProfileSerializer $profileSerializer; - private \ClawRock\Debug\Model\Indexer\ProfileIndexer $profileIndexer; - public function __construct( - \Magento\Framework\Filesystem\Driver\File $fileSystem, - \Magento\Framework\Filesystem\File\ReadFactory $fileReadFactory, - \Magento\Framework\Filesystem\File\WriteFactory $fileWriteFactory, - \ClawRock\Debug\Logger\Logger $logger, - \ClawRock\Debug\Helper\File $fileHelper, - \ClawRock\Debug\Model\Serializer\ProfileSerializer $profileSerializer, - \ClawRock\Debug\Model\Indexer\ProfileIndexer $profileIndexer + private \Magento\Framework\Filesystem\Driver\File $fileSystem, + private \Magento\Framework\Filesystem\File\ReadFactory $fileReadFactory, + private \Magento\Framework\Filesystem\File\WriteFactory $fileWriteFactory, + private \Psr\Log\LoggerInterface $logger, + private \ClawRock\Debug\Helper\File $fileHelper, + private \ClawRock\Debug\Model\Serializer\ProfileSerializer $profileSerializer, + private \ClawRock\Debug\Model\Indexer\ProfileIndexer $profileIndexer ) { - $this->fileSystem = $fileSystem; - $this->fileReadFactory = $fileReadFactory; - $this->fileWriteFactory = $fileWriteFactory; - $this->logger = $logger; - $this->fileHelper = $fileHelper; - $this->profileSerializer = $profileSerializer; - $this->profileIndexer = $profileIndexer; } public function find(Criteria $criteria): array diff --git a/Model/ValueObject/CacheAction.php b/Model/ValueObject/CacheAction.php index bf81097..4411445 100644 --- a/Model/ValueObject/CacheAction.php +++ b/Model/ValueObject/CacheAction.php @@ -19,17 +19,12 @@ class CacheAction implements LoggableInterface public const CACHE_ACTION = 'action'; public const CACHE_INFO = 'info'; - private string $id; - private string $name; - private float $time; - private array $info; - - public function __construct(string $id, string $name, float $time, array $info = []) - { - $this->id = $id; - $this->name = $name; - $this->time = $time; - $this->info = $info; + public function __construct( + private string $id, + private string $name, + private float $time, + private array $info = [] + ) { } public function getId(): string diff --git a/Model/ValueObject/EventObserver.php b/Model/ValueObject/EventObserver.php index 20a49d1..0542f67 100644 --- a/Model/ValueObject/EventObserver.php +++ b/Model/ValueObject/EventObserver.php @@ -8,22 +8,14 @@ class EventObserver implements LoggableInterface { private string $id; - private string $name; - private string $class; - private string $event; - private float $time; public function __construct( - string $name, - string $class, - string $event, - float $time + private string $name, + private string $class, + private string $event, + private float $time ) { $this->id = uniqid(); - $this->name = $name; - $this->class = $class; - $this->event = $event; - $this->time = $time; } public function getId(): string diff --git a/Model/ValueObject/LayoutNode.php b/Model/ValueObject/LayoutNode.php index 8786c92..1933d5a 100644 --- a/Model/ValueObject/LayoutNode.php +++ b/Model/ValueObject/LayoutNode.php @@ -5,21 +5,12 @@ class LayoutNode { - private \ClawRock\Debug\Model\ValueObject\Block $block; - private ?float $layoutRenderTime; - private ?string $prefix; - private array $children; - public function __construct( - \ClawRock\Debug\Model\ValueObject\Block $block, - ?float $layoutRenderTime = null, - ?string $prefix = null, - array $children = [] + private \ClawRock\Debug\Model\ValueObject\Block $block, + private ?float $layoutRenderTime = null, + private ?string $prefix = null, + private array $children = [] ) { - $this->block = $block; - $this->layoutRenderTime = $layoutRenderTime; - $this->prefix = $prefix; - $this->children = $children; } public function getName(): string diff --git a/Model/ValueObject/LoopModelAction.php b/Model/ValueObject/LoopModelAction.php index 76c454f..7c83da8 100644 --- a/Model/ValueObject/LoopModelAction.php +++ b/Model/ValueObject/LoopModelAction.php @@ -5,15 +5,11 @@ class LoopModelAction { - private \ClawRock\Debug\Model\ValueObject\ModelAction $modelAction; - private float $time; - private int $count; - - public function __construct(ModelAction $modelAction, float $time, int $count) - { - $this->modelAction = $modelAction; - $this->time = $time; - $this->count = $count; + public function __construct( + private ModelAction $modelAction, + private float $time, + private int $count + ) { } public function getModelAction(): ModelAction diff --git a/Model/ValueObject/ModelAction.php b/Model/ValueObject/ModelAction.php index 4186be1..0f8a752 100644 --- a/Model/ValueObject/ModelAction.php +++ b/Model/ValueObject/ModelAction.php @@ -13,18 +13,14 @@ class ModelAction implements LoggableInterface public const LOOP_LOAD = 'loop_load'; private string $id; - private string $name; - private string $model; - private float $time; - private array $trace; - public function __construct(string $name, string $model, float $time, array $trace = []) - { + public function __construct( + private string $name, + private string $model, + private float $time, + private array $trace = [] + ) { $this->id = uniqid(); - $this->name = $name; - $this->model = $model; - $this->time = $time; - $this->trace = $trace; } public function getId(): string diff --git a/Model/ValueObject/Plugin.php b/Model/ValueObject/Plugin.php index b2114e0..e11a41e 100644 --- a/Model/ValueObject/Plugin.php +++ b/Model/ValueObject/Plugin.php @@ -5,19 +5,13 @@ class Plugin { - private string $class; - private string $name; - private int $sortOrder; - private string $method; - private string $type; - - public function __construct(string $class, string $name, int $sortOrder, string $method, string $type) - { - $this->class = $class; - $this->name = $name; - $this->sortOrder = $sortOrder; - $this->method = $method; - $this->type = $type; + public function __construct( + private string $class, + private string $name, + private int $sortOrder, + private string $method, + private string $type + ) { } public function getClass(): string diff --git a/Model/ValueObject/Redirect.php b/Model/ValueObject/Redirect.php index a3857d4..1a3966d 100644 --- a/Model/ValueObject/Redirect.php +++ b/Model/ValueObject/Redirect.php @@ -11,24 +11,13 @@ class Redirect public const STATUS_CODE = 'status_code'; public const STATUS_TEXT = 'status_text'; - private string $token; - private string $action; - private string $method; - private int $statusCode; - private string $statusText; - public function __construct( - string $token = '', - string $action = '', - string $method = '', - int $statusCode = 0, - string $statusText = '' + private string $token = '', + private string $action = '', + private string $method = '', + private int $statusCode = 0, + private string $statusText = '' ) { - $this->token = $token; - $this->action = $action; - $this->method = $method; - $this->statusCode = $statusCode; - $this->statusText = $statusText; } // phpcs:ignore Magento2.Functions.StaticFunction.StaticFunction diff --git a/Model/ValueObject/SearchResult.php b/Model/ValueObject/SearchResult.php index ec1fb62..24a0a28 100644 --- a/Model/ValueObject/SearchResult.php +++ b/Model/ValueObject/SearchResult.php @@ -9,38 +9,20 @@ class SearchResult public const STATUS_WARNING = 'warning'; public const STATUS_ERROR = 'error'; - private string $token; - private string $ip; - private string $method; - private string $url; - private int $time; - private string $statusCode; - private string $fileSize; - private string $requestTime; - private ?string $parentToken; private \DateTime $datetime; public function __construct( - string $token, - string $ip, - string $method, - string $url, - int $time, - string $statusCode, - string $fileSize, - ?string $parentToken = null, - string $requestTime = '0' + private string $token, + private string $ip, + private string $method, + private string $url, + private int $time, + private string $statusCode, + private string $fileSize, + private ?string $parentToken = null, + private string $requestTime = '0' ) { - $this->token = $token; - $this->ip = $ip; - $this->method = $method; - $this->url = $url; - $this->time = $time; - $this->statusCode = $statusCode; - $this->parentToken = $parentToken; $this->datetime = (new \DateTime())->setTimestamp($time); - $this->fileSize = $fileSize; - $this->requestTime = $requestTime; } // phpcs:ignore Magento2.Functions.StaticFunction.StaticFunction diff --git a/Model/ValueObject/Translation.php b/Model/ValueObject/Translation.php index 1c644f6..b600f49 100644 --- a/Model/ValueObject/Translation.php +++ b/Model/ValueObject/Translation.php @@ -7,15 +7,11 @@ class Translation implements LoggableInterface { - private string $phrase; - private string $translation; - private bool $defined; - - public function __construct(string $phrase, string $translation, bool $defined) - { - $this->phrase = $phrase; - $this->translation = $translation; - $this->defined = $defined; + public function __construct( + private string $phrase, + private string $translation, + private bool $defined + ) { } public function getId(): string diff --git a/Model/View/Menu.php b/Model/View/Menu.php index 483b079..fd18ab4 100644 --- a/Model/View/Menu.php +++ b/Model/View/Menu.php @@ -9,29 +9,11 @@ class Menu implements ArgumentInterface { - /** - * @var \Magento\Framework\App\RequestInterface - */ - private $request; - - /** - * @var \ClawRock\Debug\Model\Storage\ProfileMemoryStorage - */ - private $profileMemoryStorage; - - /** - * @var \ClawRock\Debug\Helper\Url - */ - private $url; - public function __construct( - \Magento\Framework\App\RequestInterface $request, - \ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage, - \ClawRock\Debug\Helper\Url $url + private \Magento\Framework\App\RequestInterface $request, + private \ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage, + private \ClawRock\Debug\Helper\Url $url ) { - $this->request = $request; - $this->profileMemoryStorage = $profileMemoryStorage; - $this->url = $url; } public function isActive(string $collectorName): bool diff --git a/Model/View/Profiler.php b/Model/View/Profiler.php index 07e0a67..f47b99e 100644 --- a/Model/View/Profiler.php +++ b/Model/View/Profiler.php @@ -12,39 +12,18 @@ */ class Profiler implements ArgumentInterface { - private \ClawRock\Debug\Model\View\Renderer\TraceRendererFactory $traceRendererFactory; - private \ClawRock\Debug\Model\View\Renderer\LayoutGraphRendererFactory $layoutGraphRendererFactory; - private \ClawRock\Debug\Model\View\Renderer\ParametersRendererFactory $parametersRendererFactory; - private \ClawRock\Debug\Model\View\Renderer\QueryParametersRendererFactory $queryParametersRendererFactory; - private \ClawRock\Debug\Model\View\Renderer\QueryRendererFactory $queryRendererFactory; - private \ClawRock\Debug\Model\View\Renderer\QueryListRendererFactory $queryListRendererFactory; - private \ClawRock\Debug\Model\View\Renderer\TableRendererFactory $tableRendererFactory; - private \ClawRock\Debug\Model\View\Renderer\VarRenderer $varRenderer; - private \ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage; - private \ClawRock\Debug\Helper\Formatter $formatter; - public function __construct( - \ClawRock\Debug\Model\View\Renderer\TraceRendererFactory $traceRendererFactory, - \ClawRock\Debug\Model\View\Renderer\LayoutGraphRendererFactory $layoutGraphRendererFactory, - \ClawRock\Debug\Model\View\Renderer\ParametersRendererFactory $parametersRendererFactory, - \ClawRock\Debug\Model\View\Renderer\QueryParametersRendererFactory $queryParametersRendererFactory, - \ClawRock\Debug\Model\View\Renderer\QueryRendererFactory $queryRendererFactory, - \ClawRock\Debug\Model\View\Renderer\QueryListRendererFactory $queryListRendererFactory, - \ClawRock\Debug\Model\View\Renderer\TableRendererFactory $tableRendererFactory, - \ClawRock\Debug\Model\View\Renderer\VarRenderer $varRenderer, - \ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage, - \ClawRock\Debug\Helper\Formatter $formatter + private \ClawRock\Debug\Model\View\Renderer\TraceRendererFactory $traceRendererFactory, + private \ClawRock\Debug\Model\View\Renderer\LayoutGraphRendererFactory $layoutGraphRendererFactory, + private \ClawRock\Debug\Model\View\Renderer\ParametersRendererFactory $parametersRendererFactory, + private \ClawRock\Debug\Model\View\Renderer\QueryParametersRendererFactory $queryParametersRendererFactory, + private \ClawRock\Debug\Model\View\Renderer\QueryRendererFactory $queryRendererFactory, + private \ClawRock\Debug\Model\View\Renderer\QueryListRendererFactory $queryListRendererFactory, + private \ClawRock\Debug\Model\View\Renderer\TableRendererFactory $tableRendererFactory, + private \ClawRock\Debug\Model\View\Renderer\VarRenderer $varRenderer, + private \ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage, + private \ClawRock\Debug\Helper\Formatter $formatter ) { - $this->traceRendererFactory = $traceRendererFactory; - $this->layoutGraphRendererFactory = $layoutGraphRendererFactory; - $this->parametersRendererFactory = $parametersRendererFactory; - $this->queryParametersRendererFactory = $queryParametersRendererFactory; - $this->queryRendererFactory = $queryRendererFactory; - $this->queryListRendererFactory = $queryListRendererFactory; - $this->tableRendererFactory = $tableRendererFactory; - $this->varRenderer = $varRenderer; - $this->profileMemoryStorage = $profileMemoryStorage; - $this->formatter = $formatter; } public function renderLayoutGraph(array $blocks, string $totalTime): string diff --git a/Model/View/Renderer/LayoutGraphRenderer.php b/Model/View/Renderer/LayoutGraphRenderer.php index 2645d3a..c83dbb7 100644 --- a/Model/View/Renderer/LayoutGraphRenderer.php +++ b/Model/View/Renderer/LayoutGraphRenderer.php @@ -10,25 +10,17 @@ class LayoutGraphRenderer implements RendererInterface { private const TEMPLATE = 'ClawRock_Debug::renderer/layout/graph.phtml'; - private array $blocks; private float $totalRenderTime; - private \Magento\Framework\View\LayoutInterface $layout; - private \ClawRock\Debug\Model\ValueObject\LayoutNodeFactory $layoutNodeFactory; - private \ClawRock\Debug\Model\View\Renderer\LayoutNodeRendererFactory $layoutNodeRendererFactory; public function __construct( - array $blocks, + private array $blocks, string $totalRenderTime, - \Magento\Framework\View\LayoutInterface $layout, - \ClawRock\Debug\Model\ValueObject\LayoutNodeFactory $layoutNodeFactory, - \ClawRock\Debug\Model\View\Renderer\LayoutNodeRendererFactory $layoutNodeRendererFactory, + private \Magento\Framework\View\LayoutInterface $layout, + private \ClawRock\Debug\Model\ValueObject\LayoutNodeFactory $layoutNodeFactory, + private \ClawRock\Debug\Model\View\Renderer\LayoutNodeRendererFactory $layoutNodeRendererFactory, \ClawRock\Debug\Helper\Formatter $formatter ) { - $this->blocks = $blocks; $this->totalRenderTime = $formatter->revertMicrotime($totalRenderTime); - $this->layout = $layout; - $this->layoutNodeFactory = $layoutNodeFactory; - $this->layoutNodeRendererFactory = $layoutNodeRendererFactory; } public function render(): string diff --git a/Model/View/Renderer/LayoutNodeRenderer.php b/Model/View/Renderer/LayoutNodeRenderer.php index 0ed288f..1d80fdf 100644 --- a/Model/View/Renderer/LayoutNodeRenderer.php +++ b/Model/View/Renderer/LayoutNodeRenderer.php @@ -9,21 +9,12 @@ class LayoutNodeRenderer implements RendererInterface { private const TEMPLATE = 'ClawRock_Debug::renderer/layout/node.phtml'; - private \ClawRock\Debug\Model\ValueObject\LayoutNode $node; - private \Magento\Framework\View\LayoutInterface $layout; - private \ClawRock\Debug\Model\View\Renderer\LayoutNodeRendererFactory $layoutNodeRendererFactory; - private \ClawRock\Debug\Helper\Formatter $formatter; - public function __construct( - \ClawRock\Debug\Model\ValueObject\LayoutNode $node, - \Magento\Framework\View\LayoutInterface $layout, - \ClawRock\Debug\Model\View\Renderer\LayoutNodeRendererFactory $layoutNodeRendererFactory, - \ClawRock\Debug\Helper\Formatter $formatter + private \ClawRock\Debug\Model\ValueObject\LayoutNode $node, + private \Magento\Framework\View\LayoutInterface $layout, + private \ClawRock\Debug\Model\View\Renderer\LayoutNodeRendererFactory $layoutNodeRendererFactory, + private \ClawRock\Debug\Helper\Formatter $formatter ) { - $this->node = $node; - $this->layout = $layout; - $this->layoutNodeRendererFactory = $layoutNodeRendererFactory; - $this->formatter = $formatter; } public function render(): string diff --git a/Model/View/Renderer/ParametersRenderer.php b/Model/View/Renderer/ParametersRenderer.php index 8b14c65..0962735 100644 --- a/Model/View/Renderer/ParametersRenderer.php +++ b/Model/View/Renderer/ParametersRenderer.php @@ -9,18 +9,11 @@ class ParametersRenderer implements RendererInterface { private const TEMPLATE = 'ClawRock_Debug::renderer/parameters.phtml'; - private \Laminas\Stdlib\ParametersInterface $parameters; - private \Magento\Framework\View\LayoutInterface $layout; - private \ClawRock\Debug\Model\View\Renderer\VarRenderer $varRenderer; - public function __construct( - \Laminas\Stdlib\ParametersInterface $parameters, - \Magento\Framework\View\LayoutInterface $layout, - \ClawRock\Debug\Model\View\Renderer\VarRenderer $varRenderer + private \Laminas\Stdlib\ParametersInterface $parameters, + private \Magento\Framework\View\LayoutInterface $layout, + private \ClawRock\Debug\Model\View\Renderer\VarRenderer $varRenderer ) { - $this->parameters = $parameters; - $this->layout = $layout; - $this->varRenderer = $varRenderer; } public function render(): string diff --git a/Model/View/Renderer/QueryListRenderer.php b/Model/View/Renderer/QueryListRenderer.php index b0d628b..3238f55 100644 --- a/Model/View/Renderer/QueryListRenderer.php +++ b/Model/View/Renderer/QueryListRenderer.php @@ -9,25 +9,13 @@ class QueryListRenderer implements RendererInterface { private const TEMPLATE = 'ClawRock_Debug::renderer/query/list.phtml'; - /** @var \Zend_Db_Profiler_Query[] */ - private array $queries; - private \Magento\Framework\View\LayoutInterface $layout; - private \Magento\Framework\Math\Random $mathRandom; - private \ClawRock\Debug\Model\View\Renderer\QueryRendererFactory $queryRendererFactory; - private \ClawRock\Debug\Helper\Formatter $formatter; - public function __construct( - array $queries, - \Magento\Framework\View\LayoutInterface $layout, - \Magento\Framework\Math\Random $mathRandom, - \ClawRock\Debug\Model\View\Renderer\QueryRendererFactory $queryRendererFactory, - \ClawRock\Debug\Helper\Formatter $formatter + private array $queries, + private \Magento\Framework\View\LayoutInterface $layout, + private \Magento\Framework\Math\Random $mathRandom, + private \ClawRock\Debug\Model\View\Renderer\QueryRendererFactory $queryRendererFactory, + private \ClawRock\Debug\Helper\Formatter $formatter ) { - $this->queries = $queries; - $this->layout = $layout; - $this->mathRandom = $mathRandom; - $this->queryRendererFactory = $queryRendererFactory; - $this->formatter = $formatter; } public function render(): string diff --git a/Model/View/Renderer/QueryParametersRenderer.php b/Model/View/Renderer/QueryParametersRenderer.php index a668aec..c42d296 100644 --- a/Model/View/Renderer/QueryParametersRenderer.php +++ b/Model/View/Renderer/QueryParametersRenderer.php @@ -5,18 +5,11 @@ class QueryParametersRenderer implements RendererInterface { - private string $query; - private array $parameters; - private \Magento\Framework\App\ResourceConnection $resource; - public function __construct( - string $query, - array $parameters, - \Magento\Framework\App\ResourceConnection $resource + private string $query, + private array $parameters, + private \Magento\Framework\App\ResourceConnection $resource ) { - $this->query = $query; - $this->parameters = $parameters; - $this->resource = $resource; } public function render(): string diff --git a/Model/View/Renderer/QueryRenderer.php b/Model/View/Renderer/QueryRenderer.php index c88809f..89fc936 100644 --- a/Model/View/Renderer/QueryRenderer.php +++ b/Model/View/Renderer/QueryRenderer.php @@ -9,24 +9,13 @@ class QueryRenderer implements RendererInterface { private const TEMPLATE = 'ClawRock_Debug::renderer/query.phtml'; - private \Zend_Db_Profiler_Query $query; - private \Magento\Framework\View\LayoutInterface $layout; - private \Magento\Framework\Math\Random $mathRandom; - private \ClawRock\Debug\Model\View\Renderer\VarRenderer $varRenderer; - private \ClawRock\Debug\Helper\Database $databaseHelper; - public function __construct( - \Zend_Db_Profiler_Query $query, - \Magento\Framework\View\LayoutInterface $layout, - \Magento\Framework\Math\Random $mathRandom, - \ClawRock\Debug\Model\View\Renderer\VarRenderer $varRenderer, - \ClawRock\Debug\Helper\Database $databaseHelper + private \Zend_Db_Profiler_Query $query, + private \Magento\Framework\View\LayoutInterface $layout, + private \Magento\Framework\Math\Random $mathRandom, + private \ClawRock\Debug\Model\View\Renderer\VarRenderer $varRenderer, + private \ClawRock\Debug\Helper\Database $databaseHelper ) { - $this->query = $query; - $this->layout = $layout; - $this->mathRandom = $mathRandom; - $this->varRenderer = $varRenderer; - $this->databaseHelper = $databaseHelper; } public function render(): string diff --git a/Model/View/Renderer/RedirectRenderer.php b/Model/View/Renderer/RedirectRenderer.php index deb0af7..63e8c0a 100644 --- a/Model/View/Renderer/RedirectRenderer.php +++ b/Model/View/Renderer/RedirectRenderer.php @@ -9,29 +9,11 @@ class RedirectRenderer implements RendererInterface { private const TEMPLATE = 'ClawRock_Debug::renderer/redirect.phtml'; - /** - * @var \ClawRock\Debug\Model\ValueObject\Redirect - */ - private $redirect; - - /** - * @var \Magento\Framework\View\LayoutInterface - */ - private $layout; - - /** - * @var \ClawRock\Debug\Helper\Url - */ - private $url; - public function __construct( - \ClawRock\Debug\Model\ValueObject\Redirect $redirect, - \Magento\Framework\View\LayoutInterface $layout, - \ClawRock\Debug\Helper\Url $url + private \ClawRock\Debug\Model\ValueObject\Redirect $redirect, + private \Magento\Framework\View\LayoutInterface $layout, + private \ClawRock\Debug\Helper\Url $url ) { - $this->redirect = $redirect; - $this->layout = $layout; - $this->url = $url; } public function render(): string diff --git a/Model/View/Renderer/TableRenderer.php b/Model/View/Renderer/TableRenderer.php index 0070392..4b9869d 100644 --- a/Model/View/Renderer/TableRenderer.php +++ b/Model/View/Renderer/TableRenderer.php @@ -9,21 +9,12 @@ class TableRenderer implements RendererInterface { private const TEMPLATE = 'ClawRock_Debug::renderer/table.phtml'; - private array $items; - private \Magento\Framework\View\LayoutInterface $layout; - private \ClawRock\Debug\Model\View\Renderer\VarRenderer $varRenderer; - private array $labels; - public function __construct( - array $items, - \Magento\Framework\View\LayoutInterface $layout, - \ClawRock\Debug\Model\View\Renderer\VarRenderer $varRenderer, - array $labels = [] + private array $items, + private \Magento\Framework\View\LayoutInterface $layout, + private \ClawRock\Debug\Model\View\Renderer\VarRenderer $varRenderer, + private array $labels = [] ) { - $this->items = $items; - $this->layout = $layout; - $this->varRenderer = $varRenderer; - $this->labels = $labels; } public function render(): string diff --git a/Model/View/Renderer/TraceCallRenderer.php b/Model/View/Renderer/TraceCallRenderer.php index bba3fc3..8003326 100644 --- a/Model/View/Renderer/TraceCallRenderer.php +++ b/Model/View/Renderer/TraceCallRenderer.php @@ -10,18 +10,11 @@ class TraceCallRenderer implements RendererInterface private const TEMPLATE = 'ClawRock_Debug::renderer/trace/call.phtml'; private const CALL_INFO = ['function', 'class', 'line', 'file']; - private array $call; - private \Magento\Framework\View\LayoutInterface $layout; - private \Magento\Framework\Filesystem\DirectoryList $directoryList; - public function __construct( - array $call, - \Magento\Framework\View\LayoutInterface $layout, - \Magento\Framework\Filesystem\DirectoryList $directoryList + private array $call, + private \Magento\Framework\View\LayoutInterface $layout, + private \Magento\Framework\Filesystem\DirectoryList $directoryList ) { - $this->call = $call; - $this->layout = $layout; - $this->directoryList = $directoryList; } public function render(): string diff --git a/Model/View/Renderer/TraceRenderer.php b/Model/View/Renderer/TraceRenderer.php index 1336ff1..0a76097 100644 --- a/Model/View/Renderer/TraceRenderer.php +++ b/Model/View/Renderer/TraceRenderer.php @@ -10,19 +10,13 @@ class TraceRenderer implements RendererInterface private const TEMPLATE = 'ClawRock_Debug::renderer/trace.phtml'; private string $id; - private array $trace; - private \Magento\Framework\View\LayoutInterface $layout; - private \ClawRock\Debug\Model\View\Renderer\TraceCallRendererFactory $traceCallRendererFactory; public function __construct( - array $trace, - \Magento\Framework\View\LayoutInterface $layout, - \ClawRock\Debug\Model\View\Renderer\TraceCallRendererFactory $traceCallRendererFactory + private array $trace, + private \Magento\Framework\View\LayoutInterface $layout, + private \ClawRock\Debug\Model\View\Renderer\TraceCallRendererFactory $traceCallRendererFactory ) { $this->id = uniqid(); - $this->trace = $trace; - $this->layout = $layout; - $this->traceCallRendererFactory = $traceCallRendererFactory; } public function render(): string diff --git a/Model/View/Search.php b/Model/View/Search.php index 22213cb..50bd461 100644 --- a/Model/View/Search.php +++ b/Model/View/Search.php @@ -8,22 +8,14 @@ class Search implements ArgumentInterface { - private \Magento\Framework\App\RequestInterface $request; - private \ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage; private ?string $token = null; - private \ClawRock\Debug\Helper\Formatter $formatter; - private \ClawRock\Debug\Helper\Url $url; public function __construct( - \Magento\Framework\App\RequestInterface $request, - \ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage, - \ClawRock\Debug\Helper\Formatter $formatter, - \ClawRock\Debug\Helper\Url $url + private \Magento\Framework\App\RequestInterface $request, + private \ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage, + private \ClawRock\Debug\Helper\Formatter $formatter, + private \ClawRock\Debug\Helper\Url $url ) { - $this->request = $request; - $this->profileMemoryStorage = $profileMemoryStorage; - $this->formatter = $formatter; - $this->url = $url; } public function isParamSelected(string $param, string $expected): bool diff --git a/Model/View/Summary.php b/Model/View/Summary.php index abfd066..91e6dcb 100644 --- a/Model/View/Summary.php +++ b/Model/View/Summary.php @@ -9,18 +9,11 @@ class Summary implements ArgumentInterface { - private \ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage; - private \ClawRock\Debug\Helper\Url $url; - private \ClawRock\Debug\Model\View\Renderer\RedirectRendererFactory $redirectRendererFactory; - public function __construct( - \ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage, - \ClawRock\Debug\Helper\Url $url, - \ClawRock\Debug\Model\View\Renderer\RedirectRendererFactory $redirectRendererFactory + private \ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage, + private \ClawRock\Debug\Helper\Url $url, + private \ClawRock\Debug\Model\View\Renderer\RedirectRendererFactory $redirectRendererFactory ) { - $this->profileMemoryStorage = $profileMemoryStorage; - $this->url = $url; - $this->redirectRendererFactory = $redirectRendererFactory; } public function getProfile(): ProfileInterface diff --git a/Model/View/Toolbar.php b/Model/View/Toolbar.php index 15cd49f..d764cbf 100644 --- a/Model/View/Toolbar.php +++ b/Model/View/Toolbar.php @@ -13,18 +13,12 @@ class Toolbar implements ArgumentInterface private ?\ClawRock\Debug\Api\Data\ProfileInterface $profile = null; /** @var \ClawRock\Debug\Model\Collector\CollectorInterface[]|null */ private ?array $collectors = null; - private \Magento\Framework\View\LayoutInterface $layout; - private \ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage; - private \ClawRock\Debug\Helper\Url $url; public function __construct( - \Magento\Framework\View\LayoutInterface $layout, - \ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage, - \ClawRock\Debug\Helper\Url $url + private \Magento\Framework\View\LayoutInterface $layout, + private \ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage, + private \ClawRock\Debug\Helper\Url $url ) { - $this->layout = $layout; - $this->profileMemoryStorage = $profileMemoryStorage; - $this->url = $url; } public function getToken(): string diff --git a/Observer/AllowedIP.php b/Observer/AllowedIP.php index 51b7d39..8e4b2cb 100644 --- a/Observer/AllowedIP.php +++ b/Observer/AllowedIP.php @@ -8,12 +8,9 @@ class AllowedIP implements ObserverInterface { - private \ClawRock\Debug\Helper\Config $config; - public function __construct( - \ClawRock\Debug\Helper\Config $config + private \ClawRock\Debug\Helper\Config $config ) { - $this->config = $config; } public function execute(Observer $observer) diff --git a/Observer/BeforeSendResponse.php b/Observer/BeforeSendResponse.php index 1f2b54e..e60e770 100644 --- a/Observer/BeforeSendResponse.php +++ b/Observer/BeforeSendResponse.php @@ -8,15 +8,10 @@ class BeforeSendResponse implements ObserverInterface { - private \ClawRock\Debug\Helper\Config $config; - private \ClawRock\Debug\Model\Profiler $profiler; - public function __construct( - \ClawRock\Debug\Helper\Config $config, - \ClawRock\Debug\Model\Profiler $profiler + private \ClawRock\Debug\Helper\Config $config, + private \ClawRock\Debug\Model\Profiler $profiler ) { - $this->config = $config; - $this->profiler = $profiler; } public function execute(Observer $observer) diff --git a/Observer/Collector/LayoutCollectorAfterToHtml.php b/Observer/Collector/LayoutCollectorAfterToHtml.php index 3b76672..dccfaa5 100644 --- a/Observer/Collector/LayoutCollectorAfterToHtml.php +++ b/Observer/Collector/LayoutCollectorAfterToHtml.php @@ -10,12 +10,9 @@ class LayoutCollectorAfterToHtml implements ObserverInterface { - private \ClawRock\Debug\Model\Collector\LayoutCollector $layoutCollector; - public function __construct( - \ClawRock\Debug\Model\Collector\LayoutCollector $layoutCollector + private \ClawRock\Debug\Model\Collector\LayoutCollector $layoutCollector ) { - $this->layoutCollector = $layoutCollector; } public function execute(Observer $observer) diff --git a/Observer/Config/DatabaseProfiler.php b/Observer/Config/DatabaseProfiler.php index 39e2451..02cf0c8 100644 --- a/Observer/Config/DatabaseProfiler.php +++ b/Observer/Config/DatabaseProfiler.php @@ -10,18 +10,11 @@ class DatabaseProfiler implements ObserverInterface { - private \Magento\Framework\Message\ManagerInterface $messageManager; - private \ClawRock\Debug\Model\Config\Database\ProfilerWriter $dbProfilerWriter; - private \ClawRock\Debug\Helper\Config $config; - public function __construct( - \Magento\Framework\Message\ManagerInterface $messageManager, - \ClawRock\Debug\Model\Config\Database\ProfilerWriter $dbProfilerWriter, - \ClawRock\Debug\Helper\Config $config + private \Magento\Framework\Message\ManagerInterface $messageManager, + private \ClawRock\Debug\Model\Config\Database\ProfilerWriter $dbProfilerWriter, + private \ClawRock\Debug\Helper\Config $config ) { - $this->messageManager = $messageManager; - $this->dbProfilerWriter = $dbProfilerWriter; - $this->config = $config; } public function execute(Observer $observer): void diff --git a/Observer/DebugHandle.php b/Observer/DebugHandle.php index b0c9e78..ffd084e 100644 --- a/Observer/DebugHandle.php +++ b/Observer/DebugHandle.php @@ -9,12 +9,9 @@ class DebugHandle implements ObserverInterface { - private \ClawRock\Debug\Helper\Config $config; - public function __construct( - \ClawRock\Debug\Helper\Config $config + private \ClawRock\Debug\Helper\Config $config ) { - $this->config = $config; } public function execute(Observer $observer) diff --git a/Observer/ValidateRedirect.php b/Observer/ValidateRedirect.php index 1b6c976..b352f93 100644 --- a/Observer/ValidateRedirect.php +++ b/Observer/ValidateRedirect.php @@ -9,12 +9,9 @@ class ValidateRedirect implements ObserverInterface { - private \ClawRock\Debug\Model\Session $session; - public function __construct( - \ClawRock\Debug\Model\Session $session + private \ClawRock\Debug\Model\Session $session ) { - $this->session = $session; } public function execute(Observer $observer) diff --git a/Plugin/Collector/CacheCollectorPlugin.php b/Plugin/Collector/CacheCollectorPlugin.php index 407284d..c5cc254 100644 --- a/Plugin/Collector/CacheCollectorPlugin.php +++ b/Plugin/Collector/CacheCollectorPlugin.php @@ -11,12 +11,9 @@ */ class CacheCollectorPlugin { - private \ClawRock\Debug\Model\Collector\CacheCollector $cacheCollector; - public function __construct( - \ClawRock\Debug\Model\Collector\CacheCollector $cacheCollector + private \ClawRock\Debug\Model\Collector\CacheCollector $cacheCollector ) { - $this->cacheCollector = $cacheCollector; } /** diff --git a/Plugin/Collector/EventCollectorPlugin.php b/Plugin/Collector/EventCollectorPlugin.php index 2db21ce..501f72b 100644 --- a/Plugin/Collector/EventCollectorPlugin.php +++ b/Plugin/Collector/EventCollectorPlugin.php @@ -12,12 +12,9 @@ */ class EventCollectorPlugin { - private \ClawRock\Debug\Model\Collector\EventCollector $eventCollector; - public function __construct( - \ClawRock\Debug\Model\Collector\EventCollector $eventCollector + private \ClawRock\Debug\Model\Collector\EventCollector $eventCollector ) { - $this->eventCollector = $eventCollector; } public function aroundDispatch( diff --git a/Plugin/Collector/ModelCollectorPlugin.php b/Plugin/Collector/ModelCollectorPlugin.php index 2b801e6..ce2bf6d 100644 --- a/Plugin/Collector/ModelCollectorPlugin.php +++ b/Plugin/Collector/ModelCollectorPlugin.php @@ -11,18 +11,11 @@ */ class ModelCollectorPlugin { - private \ClawRock\Debug\Model\Collector\ModelCollector $modelCollector; - private \ClawRock\Debug\Helper\Formatter $formatter; - private \ClawRock\Debug\Helper\Debug $debug; - public function __construct( - \ClawRock\Debug\Model\Collector\ModelCollector $modelCollector, - \ClawRock\Debug\Helper\Formatter $formatter, - \ClawRock\Debug\Helper\Debug $debug + private \ClawRock\Debug\Model\Collector\ModelCollector $modelCollector, + private \ClawRock\Debug\Helper\Formatter $formatter, + private \ClawRock\Debug\Helper\Debug $debug ) { - $this->modelCollector = $modelCollector; - $this->formatter = $formatter; - $this->debug = $debug; } /** diff --git a/Plugin/Collector/TimeCollectorPlugin.php b/Plugin/Collector/TimeCollectorPlugin.php index d8e4403..1359348 100644 --- a/Plugin/Collector/TimeCollectorPlugin.php +++ b/Plugin/Collector/TimeCollectorPlugin.php @@ -7,12 +7,9 @@ class TimeCollectorPlugin { - private \ClawRock\Debug\Model\Profiler\Driver\StopwatchDriver $stopwatchDriver; - public function __construct( - \ClawRock\Debug\Model\Profiler\Driver\StopwatchDriver $stopwatchDriver + private \ClawRock\Debug\Model\Profiler\Driver\StopwatchDriver $stopwatchDriver ) { - $this->stopwatchDriver = $stopwatchDriver; } public function beforeLaunch(): void diff --git a/Plugin/Collector/TranslationCollectorPlugin.php b/Plugin/Collector/TranslationCollectorPlugin.php index e1d7204..75691f8 100644 --- a/Plugin/Collector/TranslationCollectorPlugin.php +++ b/Plugin/Collector/TranslationCollectorPlugin.php @@ -11,16 +11,12 @@ */ class TranslationCollectorPlugin { - private \Magento\Framework\TranslateInterface $translate; private ?array $translations = null; - private \ClawRock\Debug\Model\Collector\TranslationCollector $translationCollector; public function __construct( - \Magento\Framework\TranslateInterface $translate, - \ClawRock\Debug\Model\Collector\TranslationCollector $translationCollector + private \Magento\Framework\TranslateInterface $translate, + private \ClawRock\Debug\Model\Collector\TranslationCollector $translationCollector ) { - $this->translate = $translate; - $this->translationCollector = $translationCollector; } public function beforeRender(Translate $subject, array $source, array $arguments): void diff --git a/Plugin/ErrorHandler/WhoopsPlugin.php b/Plugin/ErrorHandler/WhoopsPlugin.php index 7d27d82..f2d73a5 100644 --- a/Plugin/ErrorHandler/WhoopsPlugin.php +++ b/Plugin/ErrorHandler/WhoopsPlugin.php @@ -9,18 +9,11 @@ class WhoopsPlugin { - private \ClawRock\Debug\Helper\Config $config; - private \Whoops\RunFactory $whoopsFactory; - private \Whoops\Handler\PrettyPageHandlerFactory $prettyPageHandlerFactory; - public function __construct( - \ClawRock\Debug\Helper\Config $config, - \Whoops\RunFactory $whoopsFactory, - \Whoops\Handler\PrettyPageHandlerFactory $prettyPageHandlerFactory + private \ClawRock\Debug\Helper\Config $config, + private \Whoops\RunFactory $whoopsFactory, + private \Whoops\Handler\PrettyPageHandlerFactory $prettyPageHandlerFactory ) { - $this->config = $config; - $this->whoopsFactory = $whoopsFactory; - $this->prettyPageHandlerFactory = $prettyPageHandlerFactory; } /** diff --git a/Plugin/PageCache/KernelPlugin.php b/Plugin/PageCache/KernelPlugin.php index e697d15..834fc53 100644 --- a/Plugin/PageCache/KernelPlugin.php +++ b/Plugin/PageCache/KernelPlugin.php @@ -8,12 +8,9 @@ */ class KernelPlugin { - private \ClawRock\Debug\Model\Storage\HttpStorage $httpStorage; - public function __construct( - \ClawRock\Debug\Model\Storage\HttpStorage $httpStorage + private \ClawRock\Debug\Model\Storage\HttpStorage $httpStorage ) { - $this->httpStorage = $httpStorage; } /** diff --git a/Plugin/UseMagentoBackendThemeOnDebugFrontendViewPlugin.php b/Plugin/UseMagentoBackendThemeOnDebugFrontendViewPlugin.php index c761aa2..4a1541c 100644 --- a/Plugin/UseMagentoBackendThemeOnDebugFrontendViewPlugin.php +++ b/Plugin/UseMagentoBackendThemeOnDebugFrontendViewPlugin.php @@ -7,12 +7,9 @@ class UseMagentoBackendThemeOnDebugFrontendViewPlugin { - private \Magento\Framework\View\DesignInterface $design; - public function __construct( - \Magento\Framework\View\DesignInterface $design + private \Magento\Framework\View\DesignInterface $design ) { - $this->design = $design; } public function beforeExecute(): void diff --git a/Readme.md b/Readme.md index ed1ee21..eceb057 100644 --- a/Readme.md +++ b/Readme.md @@ -17,7 +17,7 @@ All settings have only default scope and config type pool is set to environment ## Compatibility * Magento >= 2.4.4 -* PHP 8.1, 8.2 +* PHP >= 8.1 ## Profiler collectors - Ajax diff --git a/Test/Unit/Controller/Profiler/PurgeTest.php b/Test/Unit/Controller/Profiler/PurgeTest.php index 5dd1151..4b99b1b 100644 --- a/Test/Unit/Controller/Profiler/PurgeTest.php +++ b/Test/Unit/Controller/Profiler/PurgeTest.php @@ -19,8 +19,8 @@ class PurgeTest extends TestCase private \Magento\Framework\Controller\Result\Redirect $redirectMock; /** @var \ClawRock\Debug\Model\Storage\ProfileFileStorage&\PHPUnit\Framework\MockObject\MockObject */ private \ClawRock\Debug\Model\Storage\ProfileFileStorage $profileFileStorageMock; - /** @var \ClawRock\Debug\Logger\Logger&\PHPUnit\Framework\MockObject\MockObject */ - private \ClawRock\Debug\Logger\Logger $loggerMock; + /** @var \Psr\Log\LoggerInterface&\PHPUnit\Framework\MockObject\MockObject */ + private \Psr\Log\LoggerInterface $loggerMock; private \ClawRock\Debug\Controller\Profiler\Purge $controller; protected function setUp(): void @@ -42,9 +42,7 @@ protected function setUp(): void ->disableOriginalConstructor() ->getMock(); - $this->loggerMock = $this->getMockBuilder(\ClawRock\Debug\Logger\Logger::class) - ->disableOriginalConstructor() - ->getMock(); + $this->loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class); $this->controller = new Purge( $this->resultFactoryMock, diff --git a/Test/Unit/Model/Storage/ProfileFileStorageTest.php b/Test/Unit/Model/Storage/ProfileFileStorageTest.php index 3851561..6a6a9c0 100644 --- a/Test/Unit/Model/Storage/ProfileFileStorageTest.php +++ b/Test/Unit/Model/Storage/ProfileFileStorageTest.php @@ -21,8 +21,8 @@ class ProfileFileStorageTest extends TestCase private \Magento\Framework\Filesystem\File\WriteFactory $fileWriteFactoryMock; /** @var \Magento\Framework\Filesystem\File\WriteInterface&\PHPUnit\Framework\MockObject\MockObject */ private \Magento\Framework\Filesystem\File\WriteInterface $writeMock; - /** @var \ClawRock\Debug\Logger\Logger&\PHPUnit\Framework\MockObject\MockObject */ - private \ClawRock\Debug\Logger\Logger $loggerMock; + /** @var \Psr\Log\LoggerInterface&\PHPUnit\Framework\MockObject\MockObject */ + private \Psr\Log\LoggerInterface $loggerMock; /** @var \ClawRock\Debug\Helper\File&\PHPUnit\Framework\MockObject\MockObject */ private \ClawRock\Debug\Helper\File $fileHelperMock; /** @var \ClawRock\Debug\Model\Serializer\ProfileSerializer&\PHPUnit\Framework\MockObject\MockObject */ @@ -57,9 +57,7 @@ protected function setUp(): void $this->writeMock = $this->getMockForAbstractClass(\Magento\Framework\Filesystem\File\WriteInterface::class); - $this->loggerMock = $this->getMockBuilder(\ClawRock\Debug\Logger\Logger::class) - ->disableOriginalConstructor() - ->getMock(); + $this->loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class); $this->fileHelperMock = $this->getMockBuilder(\ClawRock\Debug\Helper\File::class) ->disableOriginalConstructor() diff --git a/composer.json b/composer.json index 901ce24..049e6df 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "filp/whoops": "^2.1", "jdorn/sql-formatter": "^1.2", "symfony/var-dumper": "*", - "symfony/stopwatch": "^2.8 || ^3.0 || ^4.0 || ^5.0" + "symfony/stopwatch": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0" }, "require-dev": { "bitexpert/phpstan-magento": "^0.30.0", diff --git a/etc/di.xml b/etc/di.xml index 418c54d..1de4510 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -12,19 +12,19 @@ ClawRock\Debug\Model\Session\Storage - + - Magento\Framework\Filesystem\Driver\File + /var/log/profiler.log - - + + profiler - + ClawRock\Debug\Logger\Handler - + Magento\Customer\Model\Session\Proxy @@ -110,4 +110,34 @@ + + + + ClawRock\Debug\Logger\Logger + + + + + + ClawRock\Debug\Logger\Logger + + + + + + ClawRock\Debug\Logger\Logger + + + + + + ClawRock\Debug\Logger\Logger + + + + + + ClawRock\Debug\Logger\Logger + +