Set minimum PHP version to 8.1

Smile-SA · Sep 5, 2023 · 25a1f30 · 25a1f30
1 parent 18f7507
commit 25a1f30
Show file tree

Hide file tree

Showing 37 changed files with 106 additions and 278 deletions.
diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml
@@ -13,7 +13,7 @@ jobs:
         strategy:
             matrix:
                 php-version:
-                    - '7.4'
+                    - '8.1'
 
         steps:
             - name: 'Checkout'

diff --git a/Block/Toolbar.php b/Block/Toolbar.php
@@ -19,23 +19,18 @@
  */
 class Toolbar extends Template
 {
-    protected DataHelper $dataHelper;
-    protected SummaryFactory $blockSummaryFactory;
-
     /**
      * @var Zone\AbstractZone[]
      */
     protected array $zones = [];
 
     public function __construct(
         Context $context,
-        DataHelper $dataHelper,
-        SummaryFactory $blockSummaryFactory,
+        protected DataHelper $dataHelper,
+        protected SummaryFactory $blockSummaryFactory,
         array $data = []
     ) {
         parent::__construct($context, $data);
-        $this->dataHelper = $dataHelper;
-        $this->blockSummaryFactory = $blockSummaryFactory;
 
         $this->setData('cache_lifetime', 0);
         $this->setTemplate('Smile_DebugToolbar::toolbar.phtml');

diff --git a/Block/Zone/AbstractZone.php b/Block/Zone/AbstractZone.php
@@ -16,22 +16,17 @@
  */
 abstract class AbstractZone extends Template
 {
-    protected DataHelper $dataHelper;
-    protected FormatterFactory $formatterFactory;
     protected Summary $summaryBlock;
     protected bool $warning = false;
     protected array $tablesToDisplay = [];
 
     public function __construct(
         Context $context,
-        DataHelper $dataHelper,
-        FormatterFactory $formatterFactory,
+        protected DataHelper $dataHelper,
+        protected FormatterFactory $formatterFactory,
         array $data = []
     ) {
         parent::__construct($context, $data);
-        $this->dataHelper = $dataHelper;
-        $this->formatterFactory = $formatterFactory;
-
         $this->setData('cache_lifetime', 0);
         $this->setTemplate('Smile_DebugToolbar::zone/' . $this->getCode() . '.phtml');
     }
@@ -66,10 +61,8 @@ public function setSummaryBlock(Summary $block): self
 
     /**
      * Add a value to the summary.
-     *
-     * @param mixed $value
      */
-    public function addToSummary(string $sectionName, string $key, $value): void
+    public function addToSummary(string $sectionName, string $key, mixed $value): void
     {
         $this->summaryBlock->addToSummary($sectionName, $key, $value);
     }
@@ -109,7 +102,7 @@ public function displaySections(array $sections = []): string
             }
 
             foreach ($sectionValues as $name => $value) {
-                $html .= $this->displaySectionValue($name, $value);
+                $html .= $this->displaySectionValue((string) $name, $value);
             }
             $html .= '</tbody>';
 
@@ -148,10 +141,9 @@ public function displaySectionsGrouped(array $sections = []): string
     /**
      * Get the good css class and the cleaned value.
      *
-     * @param mixed $value
      * @return string[]
      */
-    protected function getClassAndValue($value): array
+    protected function getClassAndValue(mixed $value): array
     {
         if (
             !is_array($value)
@@ -166,11 +158,8 @@ protected function getClassAndValue($value): array
 
     /**
      * Display a row section.
-     *
-     * @param string|int $name
-     * @param mixed $value
      */
-    protected function displaySectionValue($name, $value): string
+    protected function displaySectionValue(string $name, mixed $value): string
     {
         [$class, $value] = $this->getClassAndValue($value);
 
@@ -237,10 +226,8 @@ public function getTimer(string $code): float
 
     /**
      * Format a value, using rules, and type.
-     *
-     * @param string|float $value
      */
-    public function formatValue($value, array $rules = [], ?string $type = null): array
+    public function formatValue(mixed $value, array $rules = [], ?string $type = null): array
     {
         $formatter = $this->formatterFactory->create(
             [

diff --git a/Block/Zone/Cache.php b/Block/Zone/Cache.php
@@ -15,20 +15,15 @@
  */
 class Cache extends AbstractZone
 {
-    protected DeploymentConfig $deployConfig;
-    protected CacheHelper $cacheHelper;
-
     public function __construct(
         Context $context,
         DataHelper $dataHelper,
         FormatterFactory $formatterFactory,
-        DeploymentConfig $deployConfig,
-        CacheHelper $cacheHelper,
+        protected DeploymentConfig $deployConfig,
+        protected CacheHelper $cacheHelper,
         array $data = []
     ) {
         parent::__construct($context, $dataHelper, $formatterFactory, $data);
-        $this->deployConfig = $deployConfig;
-        $this->cacheHelper = $cacheHelper;
     }
 
     /**
@@ -62,10 +57,8 @@ public function getCacheMode(): string
 
     /**
      * Get the cache info.
-     *
-     * @return string|array
      */
-    public function getCacheInfo()
+    public function getCacheInfo(): array|string
     {
         $config = $this->deployConfig->get('cache');
         if (!$config || !is_array($config)) {

diff --git a/Block/Zone/Generic.php b/Block/Zone/Generic.php
@@ -17,23 +17,16 @@
  */
 class Generic extends AbstractZone
 {
-    protected ProductMetadataInterface $productMetadata;
-    protected AppState $appState;
-    protected DeploymentConfig $deployConfig;
-
     public function __construct(
         Context $context,
         DataHelper $dataHelper,
         FormatterFactory $formatterFactory,
-        ProductMetadataInterface $productMetadata,
-        AppState $appState,
-        DeploymentConfig $deployConfig,
+        protected ProductMetadataInterface $productMetadata,
+        protected AppState $appState,
+        protected DeploymentConfig $deployConfig,
         array $data = []
     ) {
         parent::__construct($context, $dataHelper, $formatterFactory, $data);
-        $this->productMetadata = $productMetadata;
-        $this->appState = $appState;
-        $this->deployConfig = $deployConfig;
     }
 
     /**
@@ -111,10 +104,8 @@ public function getSessionMode(): string
 
     /**
      * Get the session info.
-     *
-     * @return array|string
      */
-    public function getSessionInfo()
+    public function getSessionInfo(): array|string
     {
         $config = $this->deployConfig->get('session');
         if (!$config || !is_array($config)) {

diff --git a/Block/Zone/Layout.php b/Block/Zone/Layout.php
@@ -14,17 +14,14 @@
  */
 class Layout extends AbstractZone
 {
-    protected LayoutHelper $layoutHelper;
-
     public function __construct(
         Context $context,
         DataHelper $dataHelper,
         FormatterFactory $formatterFactory,
-        LayoutHelper $layoutHelper,
+        protected LayoutHelper $layoutHelper,
         array $data = []
     ) {
         parent::__construct($context, $dataHelper, $formatterFactory, $data);
-        $this->layoutHelper = $layoutHelper;
     }
 
     /**

diff --git a/Block/Zone/Mysql.php b/Block/Zone/Mysql.php
@@ -15,20 +15,15 @@
  */
 class Mysql extends AbstractZone
 {
-    protected ResourceModel $resourceModel;
-    protected DirectoryList $directoryList;
-
     public function __construct(
         Context $context,
         DataHelper $dataHelper,
         FormatterFactory $formatterFactory,
-        ResourceModel $resourceModel,
-        DirectoryList $directoryList,
+        protected ResourceModel $resourceModel,
+        protected DirectoryList $directoryList,
         array $data = []
     ) {
         parent::__construct($context, $dataHelper, $formatterFactory, $data);
-        $this->resourceModel = $resourceModel;
-        $this->directoryList = $directoryList;
     }
 
     /**

diff --git a/Block/Zone/Observer.php b/Block/Zone/Observer.php
@@ -14,17 +14,14 @@
  */
 class Observer extends AbstractZone
 {
-    protected ObserverHelper $observerHelper;
-
     public function __construct(
         Context $context,
         DataHelper $dataHelper,
         FormatterFactory $formatterFactory,
-        ObserverHelper   $observerHelper,
+        protected ObserverHelper   $observerHelper,
         array $data = []
     ) {
         parent::__construct($context, $dataHelper, $formatterFactory, $data);
-        $this->observerHelper = $observerHelper;
     }
 
     /**

diff --git a/Block/Zone/Preference.php b/Block/Zone/Preference.php
@@ -14,17 +14,14 @@
  */
 class Preference extends AbstractZone
 {
-    protected PreferenceHelper $preferenceHelper;
-
     public function __construct(
         Context $context,
         DataHelper $dataHelper,
         FormatterFactory $formatterFactory,
-        PreferenceHelper $preferenceHelper,
+        protected PreferenceHelper $preferenceHelper,
         array $data = []
     ) {
         parent::__construct($context, $dataHelper, $formatterFactory, $data);
-        $this->preferenceHelper = $preferenceHelper;
     }
 
     /**

diff --git a/Block/Zone/Profiler.php b/Block/Zone/Profiler.php
@@ -15,17 +15,14 @@
  */
 class Profiler extends AbstractZone
 {
-    protected ProfilerHelper $profilerHelper;
-
     public function __construct(
         Context $context,
         DataHelper $dataHelper,
         FormatterFactory $formatterFactory,
-        ProfilerHelper $profilerHelper,
+        protected ProfilerHelper $profilerHelper,
         array $data = []
     ) {
         parent::__construct($context, $dataHelper, $formatterFactory, $data);
-        $this->profilerHelper = $profilerHelper;
     }
 
     /**

diff --git a/Block/Zone/Summary.php b/Block/Zone/Summary.php
@@ -38,7 +38,7 @@ public function getSummarySections(): array
     /**
      * @inheritdoc
      */
-    public function addToSummary(string $sectionName, string $key, $value): void
+    public function addToSummary(string $sectionName, string $key, mixed $value): void
     {
         if (is_array($value) && array_key_exists('has_warning', $value) && $value['has_warning']) {
             $this->hasWarning();

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## WIP
+
+- Set minimum PHP version to 8.1
+
 ## [6.1.3] - 2023-09-04
 [6.1.3]: https://github.com/Smile-SA/magento2-module-debug-toolbar/compare/6.1.2...6.1.3
 

diff --git a/Controller/Index/Index.php b/Controller/Index/Index.php
@@ -9,11 +9,8 @@
 
 class Index implements HttpGetActionInterface
 {
-    protected ResultFactory $resultFactory;
-
-    public function __construct(ResultFactory $resultFactory)
+    public function __construct(protected ResultFactory $resultFactory)
     {
-        $this->resultFactory = $resultFactory;
     }
 
     /**

diff --git a/DB/Profiler.php b/DB/Profiler.php
@@ -12,7 +12,7 @@
 class Profiler extends OriginalProfiler
 {
     /**
-     * @inheritDoc
+     * @inheritdoc
      */
     public function queryStart($queryText, $queryType = null): ?int
     {
@@ -44,24 +44,12 @@ protected function getTypeFromQuery(string $queryText): int
         }
         $base = strtolower($base);
 
-        switch ($base) {
-            case 'insert':
-                $queryType = self::INSERT;
-                break;
-            case 'update':
-                $queryType = self::UPDATE;
-                break;
-            case 'delete':
-                $queryType = self::DELETE;
-                break;
-            case 'select':
-                $queryType = self::SELECT;
-                break;
-            default:
-                $queryType = self::QUERY;
-                break;
-        }
-
-        return $queryType;
+        return match ($base) {
+            'insert' => self::INSERT,
+            'update' => self::UPDATE,
+            'delete' => self::DELETE,
+            'select' => self::SELECT,
+            default => self::QUERY,
+        };
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ jobs: @@
             strategy:
                 matrix:
                     php-version:
-                        - '7.4'
+                        - '8.1'
             steps:
                 - name: 'Checkout'
@@ Expand Down @@