MAGETWO-47803: [Github] Error appears while IP convertation magento#33

Author: Victor Rad

etc/ee-to-ee/1.14.2.0/map.xml.dist

@@ -1320,9 +1320,7 @@
             </transform>
             <transform>
                 <field>enterprise_logging_event.x_forwarded_ip</field>
-                <handler class="Migration\Handler\ConvertIp">
-                    <param name="isIpPacked" value="0"/>
-                </handler>
+                <handler class="Migration\Handler\ConvertIp"/>
             </transform>
             <transform>
                 <field>rating_option_vote.remote_ip_long</field>

etc/ee-to-ee/1.14.2.1/map.xml.dist

@@ -1320,9 +1320,7 @@
             </transform>
             <transform>
                 <field>enterprise_logging_event.x_forwarded_ip</field>
-                <handler class="Migration\Handler\ConvertIp">
-                    <param name="isIpPacked" value="0"/>
-                </handler>
+                <handler class="Migration\Handler\ConvertIp"/>
             </transform>
             <transform>
                 <field>rating_option_vote.remote_ip_long</field>

etc/ee-to-ee/1.14.2.2/map.xml.dist

@@ -1326,9 +1326,7 @@
             </transform>
             <transform>
                 <field>enterprise_logging_event.x_forwarded_ip</field>
-                <handler class="Migration\Handler\ConvertIp">
-                    <param name="isIpPacked" value="0"/>
-                </handler>
+                <handler class="Migration\Handler\ConvertIp"/>
             </transform>
             <transform>
                 <field>rating_option_vote.remote_ip_long</field>

src/Migration/Handler/ConvertIp.php

@@ -12,19 +12,6 @@
  */
 class ConvertIp extends AbstractHandler implements HandlerInterface
 {
-    /**
-     * @var null
-     */
-    protected $isIpPacked = null;
-
-    /**
-     * @param int $isIpPacked
-     */
-    public function __construct($isIpPacked = 1)
-    {
-        $this->isIpPacked = $isIpPacked;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -33,11 +20,16 @@ public function handle(Record $recordToHandle, Record $oppositeRecord)
         $this->validate($recordToHandle);
 
         $value = $recordToHandle->getValue($this->field);
-        if (!$value) {
-            $recordToHandle->setValue($this->field, 0);
-            return;
+        if (filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)
+            || filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)
+        ) {
+            $newValue = (int) ip2long($value);
+        } else if (@inet_ntop($value) !== false) {
+            $newValue = (int) ip2long(inet_ntop($value));
+        } else {
+            $newValue = 0;
         }
-        $newValue = $this->isIpPacked ? ip2long(inet_ntop($value)) : ip2long($value);
+
         $recordToHandle->setValue($this->field, $newValue);
     }
 }