20.2.0 SHQ16-2938 option to not modify carrier, SHQ16-2434 add IP to …

…request, SHQ16-2489 handle empty street
shipperhq · Dec 21, 2017 · 22d211f · 22d211f
1 parent 592b423
commit 22d211f
Show file tree

Hide file tree

Showing 26 changed files with 125 additions and 119 deletions.
diff --git a/CHANGELOG-PUBLIC.md b/CHANGELOG-PUBLIC.md
@@ -0,0 +1 @@
+# Change Log
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -1,43 +1,50 @@
 # Change Log
 
-## [1.3.2](https://github.com/webshopapps/module-logger/tree/1.3.2) (2017-03-10)
-[Full Changelog](https://github.com/webshopapps/module-logger/compare/1.3.0...1.3.2)
+## [20.2.0](https://github.com/webshopapps/module-logger/tree/20.2.0) (2017-12-01)
+[Full Changelog](https://github.com/webshopapps/module-logger/compare/20.1.1...20.2.0)
 
-## [1.3.0](https://github.com/webshopapps/module-logger/tree/1.3.0) (2017-03-10)
-[Full Changelog](https://github.com/webshopapps/module-logger/compare/1.3.1...1.3.0)
+**Merged pull requests:**
 
-## [1.3.1](https://github.com/webshopapps/module-logger/tree/1.3.1) (2017-03-10)
-[Full Changelog](https://github.com/webshopapps/module-logger/compare/1.3.3...1.3.1)
+- SHQ16-2432 Code sniffer changes [\#1](https://github.com/webshopapps/module-logger/pull/1) ([wsagen](https://github.com/wsagen))
 
-## [1.3.3](https://github.com/webshopapps/module-logger/tree/1.3.3) (2017-03-10)
-[Full Changelog](https://github.com/webshopapps/module-logger/compare/1.2.9...1.3.3)
+## [20.1.1](https://github.com/webshopapps/module-logger/tree/20.1.1) (2017-03-10)
+[Full Changelog](https://github.com/webshopapps/module-logger/compare/20.1.0...20.1.1)
 
-## [1.2.9](https://github.com/webshopapps/module-logger/tree/1.2.9) (2017-02-14)
-[Full Changelog](https://github.com/webshopapps/module-logger/compare/1.2.7...1.2.9)
+## [20.1.0](https://github.com/webshopapps/module-logger/tree/20.1.0) (2017-03-10)
+[Full Changelog](https://github.com/webshopapps/module-logger/compare/20.1.3...20.1.0)
 
-## [1.2.7](https://github.com/webshopapps/module-logger/tree/1.2.7) (2016-11-30)
-[Full Changelog](https://github.com/webshopapps/module-logger/compare/1.2.8...1.2.7)
+## [20.1.3](https://github.com/webshopapps/module-logger/tree/20.1.3) (2017-03-10)
+[Full Changelog](https://github.com/webshopapps/module-logger/compare/20.1.2...20.1.3)
+
+## [20.1.2](https://github.com/webshopapps/module-logger/tree/20.1.2) (2017-03-10)
+[Full Changelog](https://github.com/webshopapps/module-logger/compare/1.2.9...20.1.2)
+
+## [1.2.9](https://github.com/webshopapps/module-logger/tree/1.2.9) (2017-02-14)
+[Full Changelog](https://github.com/webshopapps/module-logger/compare/1.2.8...1.2.9)
 
 ## [1.2.8](https://github.com/webshopapps/module-logger/tree/1.2.8) (2016-11-30)
-[Full Changelog](https://github.com/webshopapps/module-logger/compare/1.2.6...1.2.8)
+[Full Changelog](https://github.com/webshopapps/module-logger/compare/1.2.7...1.2.8)
 
-## [1.2.6](https://github.com/webshopapps/module-logger/tree/1.2.6) (2016-08-18)
-[Full Changelog](https://github.com/webshopapps/module-logger/compare/1.2.1...1.2.6)
+## [1.2.7](https://github.com/webshopapps/module-logger/tree/1.2.7) (2016-11-30)
+[Full Changelog](https://github.com/webshopapps/module-logger/compare/1.2.6...1.2.7)
 
-## [1.2.1](https://github.com/webshopapps/module-logger/tree/1.2.1) (2016-03-09)
-[Full Changelog](https://github.com/webshopapps/module-logger/compare/1.2.2...1.2.1)
+## [1.2.6](https://github.com/webshopapps/module-logger/tree/1.2.6) (2016-08-18)
+[Full Changelog](https://github.com/webshopapps/module-logger/compare/1.2.2...1.2.6)
 
 ## [1.2.2](https://github.com/webshopapps/module-logger/tree/1.2.2) (2016-03-09)
-[Full Changelog](https://github.com/webshopapps/module-logger/compare/1.2.3...1.2.2)
+[Full Changelog](https://github.com/webshopapps/module-logger/compare/1.2.1...1.2.2)
 
-## [1.2.3](https://github.com/webshopapps/module-logger/tree/1.2.3) (2016-03-09)
-[Full Changelog](https://github.com/webshopapps/module-logger/compare/1.2.4...1.2.3)
+## [1.2.1](https://github.com/webshopapps/module-logger/tree/1.2.1) (2016-03-09)
+[Full Changelog](https://github.com/webshopapps/module-logger/compare/1.2.4...1.2.1)
 
 ## [1.2.4](https://github.com/webshopapps/module-logger/tree/1.2.4) (2016-03-09)
 [Full Changelog](https://github.com/webshopapps/module-logger/compare/1.2.5...1.2.4)
 
 ## [1.2.5](https://github.com/webshopapps/module-logger/tree/1.2.5) (2016-03-09)
-[Full Changelog](https://github.com/webshopapps/module-logger/compare/1.0.2...1.2.5)
+[Full Changelog](https://github.com/webshopapps/module-logger/compare/1.2.3...1.2.5)
+
+## [1.2.3](https://github.com/webshopapps/module-logger/tree/1.2.3) (2016-03-09)
+[Full Changelog](https://github.com/webshopapps/module-logger/compare/1.0.2...1.2.3)
 
 ## [1.0.2](https://github.com/webshopapps/module-logger/tree/1.0.2) (2016-03-04)
 [Full Changelog](https://github.com/webshopapps/module-logger/compare/1.0.1...1.0.2)

diff --git a/src/Block/Adminhtml/Logger.php b/src/Block/Adminhtml/Logger.php
@@ -51,4 +51,4 @@ protected function _construct()
 
         $this->buttonList->remove('add');
     }
-}
+}
diff --git a/src/Block/Adminhtml/Logger/Grid.php b/src/Block/Adminhtml/Logger/Grid.php
@@ -42,5 +42,4 @@ class Grid extends WidgetGrid
      * @var string
      */
     protected $_template = 'ShipperHQ_Logger::grid.phtml';
-
-}
+}
diff --git a/src/Block/Adminhtml/Logger/Grid/Renderer/Actions.php b/src/Block/Adminhtml/Logger/Grid/Renderer/Actions.php
@@ -64,10 +64,12 @@ public function render(\Magento\Framework\DataObject $row)
     {
         $encodedUrl = $this->_urlHelper->getEncodedUrl();
         if (!$row->getIsRead()) {
-            return sprintf('<a href="%s">%s</a> | <a href="%s" onClick="deleteConfirm(\'%s\',this.href); return false;">%s</a>',
+            return sprintf(
+                '<a href="%s">%s</a> | <a href="%s" onClick="deleteConfirm(\'%s\',this.href); return false;">%s</a>',
                 $this->getUrl(
                     '*/*/markAsRead/',
-                    ['_current' => true, 'id' => $row->getId()] ),
+                    ['_current' => true, 'id' => $row->getId()]
+                ),
                 __('Mark as Read'),
                 $this->getUrl(
                     '*/*/remove/',
@@ -80,9 +82,9 @@ public function render(\Magento\Framework\DataObject $row)
                 __('Are you sure?'),
                 __('Remove')
             );
-        }
-        else {
-            return sprintf('<a href="%s" onClick="deleteConfirm(\'%s\',this.href); return false;">%s</a>',
+        } else {
+            return sprintf(
+                '<a href="%s" onClick="deleteConfirm(\'%s\',this.href); return false;">%s</a>',
                 $this->getUrl(
                     '*/*/remove/',
                     [
@@ -98,4 +100,3 @@ public function render(\Magento\Framework\DataObject $row)
         return parent::render($row);
     }
 }
-
diff --git a/src/Block/Adminhtml/Logger/Grid/Renderer/Message.php b/src/Block/Adminhtml/Logger/Grid/Renderer/Message.php
@@ -63,9 +63,10 @@ class Message extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstrac
     public function render(\Magento\Framework\DataObject $row)
     {
         $dots = '';
-        if(strlen($row->getDescription())>512) { $dots = ' . . . '; }
+        if (strlen($row->getDescription())>512) {
+            $dots = ' . . . ';
+        }
         return '<span class="grid-row-title">' . $row->getTitle() . '</span>'
         . ($row->getDescription() ? '<br />' . substr($row->getDescription(), 0, 512) . $dots : '');
     }
 }
-
diff --git a/src/Block/Adminhtml/Logger/View.php b/src/Block/Adminhtml/Logger/View.php
@@ -84,7 +84,8 @@ public function getMessageData()
         return $log;
     }
 
-    public function getBackUrl() {
+    public function getBackUrl()
+    {
         return $this->getUrl('shqlogger/*/index');
     }
 }
diff --git a/src/Block/Config/Form/Fieldset/Modules/DisableLogging.php b/src/Block/Config/Form/Fieldset/Modules/DisableLogging.php
@@ -83,24 +83,25 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
 
         $modules = $this->_moduleList->getNames();
 
-        $wsaApproved = array('webshopapps','shipperhq');
+        $wsaApproved = ['webshopapps','shipperhq'];
 
         sort($modules);
 
         $viewAllExtns = $this->_scopeConfig->isSetFlag(
             'shqlogmenu/shqlogger/view_all_extns',
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
 
         foreach ($modules as $moduleName) {
-            if ($moduleName==='Mage_Adminhtml' ||$moduleName==='ShipperHQ_Common' || $moduleName==='ShipperHQ_Logger'
-                || stripos($moduleName,'Mage_') !== false) {
+            if ($moduleName==='Mage_Adminhtml' || $moduleName==='ShipperHQ_Common' || $moduleName==='ShipperHQ_Logger'
+                || stripos($moduleName, 'Mage_') !== false) {
                 continue;
             }
 
-            $providerArray = explode('_',$moduleName);
+            $providerArray = explode('_', $moduleName);
             $provider = strtolower($providerArray[0]);
 
-            if (!$viewAllExtns && !in_array($provider, $wsaApproved)){
+            if (!$viewAllExtns && !in_array($provider, $wsaApproved)) {
                 continue;
             }
             $html.= $this->_getFieldHtml($element, $moduleName);

diff --git a/src/Controller/Adminhtml/Logger.php b/src/Controller/Adminhtml/Logger.php
@@ -88,5 +88,4 @@ protected function _isAllowed()
     {
         return $this->_authorization->isAllowed('ShipperHQ_Logger::logger');
     }
-
-}
+}
diff --git a/src/Controller/Adminhtml/Logger/Index.php b/src/Controller/Adminhtml/Logger/Index.php
@@ -32,6 +32,7 @@
  * See COPYING.txt for license details.
  */
 namespace ShipperHQ\Logger\Controller\Adminhtml\Logger;
+
 class Index extends \ShipperHQ\Logger\Controller\Adminhtml\Logger
 {
     /**
@@ -50,4 +51,3 @@ public function execute()
         return $resultPage;
     }
 }
-?>
diff --git a/src/Controller/Adminhtml/Logger/MassDestroy.php b/src/Controller/Adminhtml/Logger/MassDestroy.php
@@ -58,5 +58,4 @@ public function execute()
 
         $this->_redirect('shqlogger/*/index');
     }
-
 }
diff --git a/src/Controller/Adminhtml/Logger/MassMarkAsRead.php b/src/Controller/Adminhtml/Logger/MassMarkAsRead.php
@@ -65,5 +65,4 @@ public function execute()
         }
         $this->_redirect('shqlogger/*/index');
     }
-
 }
diff --git a/src/Controller/Adminhtml/Logger/MassRemove.php b/src/Controller/Adminhtml/Logger/MassRemove.php
@@ -61,5 +61,4 @@ public function execute()
 
         $this->_redirect('shqlogger/*/index');
     }
-
 }
diff --git a/src/Controller/Adminhtml/Logger/View.php b/src/Controller/Adminhtml/Logger/View.php
@@ -32,6 +32,7 @@
  * See COPYING.txt for license details.
  */
 namespace ShipperHQ\Logger\Controller\Adminhtml\Logger;
+
 class View extends \ShipperHQ\Logger\Controller\Adminhtml\Logger
 {
     /**
@@ -51,7 +52,5 @@ public function execute()
         $this->_view->loadLayout();
         $this->_view->getLayout()->getBlock('shqlogger_logger_log_view')->setData('log', $model);
         $this->_view->renderLayout();
-
     }
 }
-?>
diff --git a/src/Helper/Config.php b/src/Helper/Config.php
@@ -38,8 +38,6 @@
 use ShipperHQ\Common\Helper\AbstractConfig;
 use Psr\Log\LogLevel;
 
-
-
 /**
  * Class Config
  */
@@ -60,13 +58,13 @@ class Config extends AbstractConfig implements ConfigInterface
     public function getCodes()
     {
         return [
-            'logLevel'   =>array(
+            'logLevel'   =>[
                 self::SEVERITY_CRITICAL => __('critical'),
                 self::SEVERITY_MAJOR    => __('warning'),
                 self::SEVERITY_MINOR    => __('info'),
                 self::SEVERITY_NOTICE   => __('debug'),
                 self::SEVERITY_NONE     => __('DISABLED')
-            ),
+            ],
         ];
     }
 }
diff --git a/src/Model/Log.php b/src/Model/Log.php
@@ -53,7 +53,7 @@ protected function _construct()
      */
     public function loadLatestNotice()
     {
-        $this->setData(array());
+        $this->setData([]);
         $this->getResource()->loadLatestNotice($this);
         return $this;
     }
@@ -74,21 +74,21 @@ public function getNoticeStatus()
      * @param array $data
      * @return \ShipperHQ\Logger\Model\Log
      */
-    public function parse($severity,$extension,$title,$description,$code=0,$url='')
+    public function parse($severity, $extension, $title, $description, $code = 0, $url = '')
     {
         if (is_array($description) || is_object($description)) {
             $description = print_r($description, true);
         }
 
-        $feedData[] = array(
+        $feedData[] = [
             'severity'      => $severity,
             'date_added'    => gmdate('Y-m-d H:i:s'),
             'extension'     => $extension,
             'title'         => $title,
             'description'   => $description,
-            'code'			=> $code,
-            'url'			=> $url
-        );
+            'code'          => $code,
+            'url'           => $url
+        ];
 
         return $this->getResource()->parse($this, $feedData);
     }
@@ -97,5 +97,4 @@ public function truncate()
     {
         return $this->getResource()->truncate();
     }
-
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,4 +51,4 @@ protected function _construct() @@
             $this->buttonList->remove('add');
         }
-    }
+    }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -58,5 +58,4 @@ public function execute()

		$this->_redirect('shqlogger/*/index');
		}

		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -61,5 +61,4 @@ public function execute()

		$this->_redirect('shqlogger/*/index');
		}

		}