MAGETWO-34361: Pull request processing

Author: sivaschenko

app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php

@@ -86,7 +86,7 @@ class PersonalInfo extends \Magento\Backend\Block\Template
      * @param \Magento\Framework\Registry $registry
      * @param Mapper $addressMapper
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
-     * @param \Magento\Customer\Model\Log $customerLog
+     * @param \Magento\Customer\Model\Logger $customerLogger
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -286,9 +286,6 @@ public function getStoreLastLoginDateTimezone()
      */
     public function getCurrentStatus()
     {
-        if (!$this->customerLog->getCustomerId()) {
-            return __('Offline');
-        }
         if (!$this->customerLog->getLastLoginAt()) {
             return __('Offline');
         }

app/code/Magento/Customer/Model/Logger.php

@@ -68,10 +68,29 @@ public function log($customerId, array $data)
      * Load log by Customer Id.
      *
      * @param int $customerId
-     * @return \Magento\Customer\Model\Log
-     * @throws \LogicException
+     * @return Log
      */
-    public function get($customerId)
+    public function get($customerId = null)
+    {
+        if (null !== $customerId) {
+            $data = $this->loadLogData($customerId);
+        }
+
+        return $this->logFactory->create(
+            [
+                'customerId' => isset($data['customer_id']) ? $data['customer_id'] : null,
+                'lastLoginAt' => isset($data['last_login_at']) ? $data['last_login_at'] : null,
+                'lastLogoutAt' => isset($data['last_logout_at']) ? $data['last_logout_at'] : null,
+                'lastVisitAt' => isset($data['last_visit_at']) ? $data['last_visit_at'] : null
+            ]
+        );
+    }
+
+    /**
+     * @param int $customerId
+     * @return array
+     */
+    protected function loadLogData($customerId)
     {
         /** @var \Magento\Framework\DB\Adapter\AdapterInterface $adapter */
         $adapter = $this->resource->getConnection('read');
@@ -93,20 +112,6 @@ public function get($customerId)
             )
             ->limit(1);
 
-        $data = $adapter->fetchRow($select);
-
-        if (!$data) {
-            //throw new \LogicException('Unable to load customer log');
-            return $this->logFactory->create([]);
-        }
-
-        return $this->logFactory->create(
-            [
-                'customerId' => $data['customer_id'],
-                'lastLoginAt' => $data['last_login_at'],
-                'lastLogoutAt' => $data['last_logout_at'],
-                'lastVisitAt' => $data['last_visit_at'],
-            ]
-        );
+        return $adapter->fetchRow($select);
     }
 }