Code cleanup

Author: tig-luuksmal

Helper/TigFieldsHelper.php

@@ -52,7 +52,9 @@ class TigFieldsHelper
     /**
      * @param LoggerInterface $logger
      */
-    public function __construct(LoggerInterface $logger){
+    public function __construct(
+        LoggerInterface $logger
+    ){
         $this->logger = $logger;
     }
 

Plugin/Model/Checkout/LayoutProcessorPlugin.php

@@ -65,9 +65,10 @@ class LayoutProcessorPlugin
      * @param NotifierInterface     $notifier
      * @param ScopeConfigInterface  $scopeConfig
      */
-    public function __construct(ArrayManager            $arrayManager,
-                                NotifierInterface       $notifier,
-                                ScopeConfigInterface    $scopeConfig
+    public function __construct(
+        ArrayManager            $arrayManager,
+        NotifierInterface       $notifier,
+        ScopeConfigInterface    $scopeConfig
     ) {
         $this->arrayManager = $arrayManager;
         $this->notifier     = $notifier;
@@ -168,7 +169,7 @@ private function getParentPath($path, $delimiter = '/', $count = 1)
      */
     public function addAdminErrorMessage($message)
     {
-        $this->notifier->addMajor("TIG Postcode", "Postcodeservice detected one or more compability issues with your shop setup");
+        $this->notifier->addMajor("TIG Postcode", "Postcodeservice detected one or more compatibility issues with your shop setup");
     }
 
     /**

Plugin/Model/Osc/LayoutProcessorPlugin.php

@@ -65,9 +65,10 @@ class LayoutProcessorPlugin
      * @param NotifierInterface     $notifier
      * @param ScopeConfigInterface  $scopeConfig
      */
-    public function __construct(ArrayManager            $arrayManager,
-                                NotifierInterface       $notifier,
-                                ScopeConfigInterface    $scopeConfig
+    public function __construct(
+        ArrayManager            $arrayManager,
+        NotifierInterface       $notifier,
+        ScopeConfigInterface    $scopeConfig
     ) {
         $this->arrayManager = $arrayManager;
         $this->notifier     = $notifier;
@@ -168,7 +169,7 @@ private function getParentPath($path, $delimiter = '/', $count = 1)
      */
     public function addAdminErrorMessage($message)
     {
-        $this->notifier->addMajor("TIG Postcode", "Postcodeservice detected one or more compability issues with your shop setup");
+        $this->notifier->addMajor("TIG Postcode", "Postcodeservice detected one or more compatibility issues with your shop setup");
     }
 
     /**

Plugin/Model/ResourceModel/Country/CollectionPlugin.php

@@ -34,6 +34,7 @@
 
 use Magento\Framework\Module\FullModuleList;
 use TIG\Postcode\Config\Provider\ModuleConfiguration;
+use Magento\Directory\Model\ResourceModel\Country\Collection;
 
 class CollectionPlugin
 {
@@ -208,26 +209,26 @@ private function addPostcodeConfig(&$countryOption, $country, $sortOrderBase, $s
      * @return int[]
      */
     private function getSortOrderAndIncrement(){
-        $sortOrderBase = 81;
+        $sortOrderBase      = 81;
         $sortOrderIncrement = 1;
 
         foreach(self::SORT_ORDER_CONFIG as $module => $config){
             if(!$this->fullModuleList->has($module)) {
                 continue;
             }
-            $sortOrderBase = $config[self::SORT_ORDER_BASE];
+            $sortOrderBase      = $config[self::SORT_ORDER_BASE];
             $sortOrderIncrement = $config[self::SORT_ORDER_INCREMENT];
         }
 
         return [$sortOrderBase, $sortOrderIncrement];
     }
 
     /**
-     * @param       \Magento\Directory\Model\ResourceModel\Country\Collection$subject
-     * @param        $result
+     * @param Collection    $subject
+     * @param               $result
      *
      * @return mixed
-     * @see \Magento\Directory\Model\ResourceModel\Country\Collection::toOptionArray
+     * @see Collection::toOptionArray
      */
     public function afterToOptionArray(
         $subject,

Plugin/View/Page/Config/Renderer.php

@@ -3,6 +3,8 @@
 
 use Magento\Framework\Module\ModuleList;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\View\Page\Config\Renderer as pageRender;
 use Magento\Framework\View\Page\Config;
 
 class Renderer
@@ -13,35 +15,40 @@ class Renderer
     /** @var ScopeConfigInterface */
     private $scopeConfig;
 
+    /** @var ScopeInterface */
+    private $scopeStore;
+
     /** @var ModuleList  */
     public $moduleList;
 
     /**
-     * @param \Magento\Framework\View\Page\Config   $config
-     * @param ScopeConfigInterface                  $scopeConfig
-     * @param ModuleList                            $moduleList
+     * @param Config                $config
+     * @param ScopeConfigInterface  $scopeConfig
+     * @param ModuleList            $moduleList
      */
     public function __construct(
         Config                  $config,
         ScopeConfigInterface    $scopeConfig,
+        ScopeInterface          $scopeStore,
         ModuleList              $moduleList
     ){
         $this->config       = $config;
         $this->scopeConfig  = $scopeConfig;
+        $this->scopeStore   = $scopeStore;
         $this->moduleList   = $moduleList;
     }
 
     /**
-     * @param \Magento\Framework\View\Page\Config\Renderer $subject
+     * @param pageRender $subject
      * @param $assetestlist
      *
      * @see Renderer::renderAssets()
      *
      * @return array|array[]
      */
     public function beforeRenderAssets(
-        \Magento\Framework\View\Page\Config\Renderer $subject,
-                                                    $assetestlist = [])
+        pageRender $subject,
+        $assetestlist = [])
     {
         $modules = $this->moduleList->getNames();
 
@@ -58,12 +65,12 @@ public function beforeRenderAssets(
                 $this->config->addPageAsset('TIG_Postcode::css/postcode_main.css');
                 // check if NL is enabled
                 if ($this->scopeConfig->getValue('tig_postcode/countries/enable_nl_check',
-                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE)){
+                    $this->scopeStore::SCOPE_STORE)){
                     $this->config->addPageAsset('TIG_Postcode::css/postcode_nl.css');
                 }
                 // check if BE is enabled
                 if ($this->scopeConfig->getValue('tig_postcode/countries/enable_be_check',
-                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE)){
+                    $this->scopeStore::SCOPE_STORE)){
                     $this->config->addPageAsset('TIG_Postcode::css/postcode_be.css');
                 }
             }

view/adminhtml/templates/config/parsing/streets.phtml

@@ -42,7 +42,7 @@
             <br/>
             <?php echo $block->escapeHtml(__('Tampering with the settings may affect the workflow of third party extensions. Use at your own risk.'));?>
             <br />
-            <strong><?php echo $block->escapeHtml(__('Note: These settings are disabled in this new release. If you still need this functionality contact support'));?></strong>
+            <strong><?php echo $block->escapeHtml(__('Note: These settings are disabled in this new release. If you still need this functionality please contact support'));?></strong>
         </div>
     </div>
 </div>