Quick test at fixing some PHPCS issues

ctidigital · Jan 14, 2020 · 927ddfa · 927ddfa
1 parent 6050604
commit 927ddfa
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 15 deletions.
diff --git a/Component/CatalogPriceRules.php b/Component/CatalogPriceRules.php
@@ -12,9 +12,6 @@
 use CtiDigital\Configurator\Api\LoggerInterface;
 use Magento\CatalogRule\Api\Data\RuleInterfaceFactory;
 
-/**
- * Class CatalogPriceRules
- */
 class CatalogPriceRules implements ComponentInterface
 {
     /**

diff --git a/Component/CustomerGroups.php b/Component/CustomerGroups.php
@@ -92,12 +92,9 @@ private function createCustomerGroup($groupName, $taxClassId)
             ->setTaxClassId($taxClassId)
             ->save();
 
-
         $this->log->logInfo(
             sprintf('Customer Group "%s" created', $groupName)
         );
-
-        return;
     }
 
     /**

diff --git a/Component/Sql.php b/Component/Sql.php
@@ -12,7 +12,7 @@
 use CtiDigital\Configurator\Component\Processor\SqlSplitProcessor;
 
 /**
- * Class Sql
+ * Class Sql - Runs raw SQL queries - generally a fallback for when a configurator component is not available.
  */
 class Sql implements ComponentInterface
 {

diff --git a/Component/Websites.php b/Component/Websites.php
@@ -106,7 +106,7 @@ public function execute($data = null)
                 $indexProcess->load('catalog_product_price');
                 $indexProcess->reindexAll();
             }
-        } catch (ComponentException $e) {
+        } catch (\Exception $e) {
             $this->log->logError($e->getMessage());
         }
     }

diff --git a/Console/Command/RunCommand.php b/Console/Command/RunCommand.php
@@ -103,7 +103,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             if ($output->getVerbosity() > OutputInterface::VERBOSITY_NORMAL) {
                 $output->writeln('<comment>Finished Configurator</comment>');
             }
-        } catch (ConfiguratorAdapterException $e) {
+        } catch (\Exception $e) {
             $output->writeln('<error>' . $e->getMessage() . '</error>');
         }
     }

diff --git a/Model/Processor.php b/Model/Processor.php
@@ -13,8 +13,7 @@
 use Symfony\Component\Yaml\Yaml;
 
 /**
- * Class Processor
- * @package CtiDigital\Configurator\Model
+ * Class Processor - The overarching class that reads and processes the configurator files.
  *
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  */
@@ -454,7 +453,7 @@ private function getData($source)
     {
         return ($this->isSourceRemote($source) === true) ?
             $this->getRemoteData($source) :
-            file_get_contents(BP . '/' . $source);
+            file_get_contents(BP . '/' . $source); // phpcs:ignore Magento2.Functions.DiscouragedFunction
     }
 
     /**

diff --git a/Test/Integration/ShippingTablesRatesTest.php b/Test/Integration/ShippingTablesRatesTest.php
@@ -8,8 +8,7 @@
 use Magento\Framework\DB\Adapter\AdapterInterface;
 
 /**
- * Class ShippingTablesRatesTest
- * @package CtiDigital\Configurator\Component
+ * Class ShippingTablesRatesTest - Test to run against Shipping Table Rates
  * @SuppressWarnings(PHPMD.LongVariable)
  */
 class ShippingTablesRatesTest extends \PHPUnit\Framework\TestCase
@@ -33,7 +32,7 @@ class ShippingTablesRatesTest extends \PHPUnit\Framework\TestCase
      * From directory_country_region table
      * @var array
      */
-    private $regionIdMap = array('BER' => 82);
+    private $regionIdMap = ['BER' => 82];
 
     /**
      * @var ShippingTableRates