Merge pull request #67 from trinos-nl/master

PHP 8.1 compatibility

Author: rubenexp

…ck/System/Config/Form/Field/ReadOnly.php …stem/Config/Form/Field/ReadOnlyField.phpBlock/System/Config/Form/Field/ReadOnly.php renamed to Block/System/Config/Form/Field/ReadOnlyField.php Block/System/Config/Form/Field/ReadOnly.php renamed to Block/System/Config/Form/Field/ReadOnlyField.php

@@ -1,13 +1,13 @@
-<?php
-namespace Experius\Postcode\Block\System\Config\Form\Field;
-
-use Magento\Framework\Data\Form\Element\AbstractElement;
-
-class ReadOnly extends \Magento\Config\Block\System\Config\Form\Field
-{
-    protected function _getElementHtml(AbstractElement $element)
-    {
-        $element->setData('readonly', 1);
-        return $element->getElementHtml();
-    }
-}
+<?php
+namespace Experius\Postcode\Block\System\Config\Form\Field;
+
+use Magento\Framework\Data\Form\Element\AbstractElement;
+
+class ReadOnlyField extends \Magento\Config\Block\System\Config\Form\Field
+{
+    protected function _getElementHtml(AbstractElement $element)
+    {
+        $element->setData('readonly', 1);
+        return $element->getElementHtml();
+    }
+}

Helper/Data.php

@@ -368,17 +368,17 @@ protected function getStoreConfig($path)
 
     protected function getKey()
     {
-        return trim($this->getStoreConfig('postcodenl_api/general/api_key'));
+        return trim($this->getStoreConfig('postcodenl_api/general/api_key') ?? '');
     }
 
     protected function getSecret()
     {
-        return trim($this->getStoreConfig('postcodenl_api/general/api_secret'));
+        return trim($this->getStoreConfig('postcodenl_api/general/api_secret') ?? '');
     }
 
     protected function getServiceUrl()
     {
-        $serviceUrl = trim($this->getStoreConfig('postcodenl_api/development_config/api_url'));
+        $serviceUrl = trim($this->getStoreConfig('postcodenl_api/development_config/api_url') ?? '');
         if (empty($serviceUrl)) {
             $serviceUrl = self::API_URL;
         }

etc/adminhtml/system.xml

@@ -22,7 +22,7 @@
                 </field>
                 <field id="api_key_is_valid" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="40" translate="label" type="text">
                     <label>Api Key is valid</label>
-                    <frontend_model>Experius\Postcode\Block\System\Config\Form\Field\ReadOnly</frontend_model>
+                    <frontend_model>Experius\Postcode\Block\System\Config\Form\Field\ReadOnlyField</frontend_model>
                 </field>
                 <field id="api_key_checker" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="41" translate="label" type="button">
                     <button_label>Check Api Key</button_label>