Merge pull request #30 from aivis/add-server-ip-field

add server_ip field

Author: aivis

.travis.yml

@@ -4,7 +4,7 @@ php:
   - 7.0
   - 7.1
   - 7.2
-  - hhvm
+  - 7.3
 
 before_script:
   - travis_retry composer self-update

src/Understand/UnderstandLaravel5/EventLogger.php

@@ -78,6 +78,7 @@ protected function getMetaFields()
             'url' => 'UnderstandFieldProvider::getUrl',
             'method' => 'UnderstandFieldProvider::getRequestMethod',
             'client_ip' => 'UnderstandFieldProvider::getClientIp',
+            'server_ip' => 'UnderstandFieldProvider::getServerIp',
         ];
     }
 }

src/Understand/UnderstandLaravel5/ExceptionLogger.php

@@ -135,6 +135,7 @@ protected function getMetaFields()
             'url' => 'UnderstandFieldProvider::getUrl',
             'method' => 'UnderstandFieldProvider::getRequestMethod',
             'client_ip' => 'UnderstandFieldProvider::getClientIp',
+            'server_ip' => 'UnderstandFieldProvider::getServerIp',
             'user_agent' => 'UnderstandFieldProvider::getClientUserAgent',
             'laravel_version' => 'UnderstandFieldProvider::getLaravelVersion',
             'sql_queries' => 'UnderstandFieldProvider::getSqlQueries',

tests/ExceptionEncoderTest.php

@@ -100,7 +100,7 @@ protected function assertIncompleteClassStackTrace($exception, $index)
         $encoder = new Understand\UnderstandLaravel5\ExceptionEncoder();
         $stackTraceArray = $encoder->stackTraceToArray($exception->getTrace());
 
-        if (starts_with(phpversion(), '7.2'))
+        if (starts_with(phpversion(), ['7.2', '7.3']))
         {
             $this->assertSame('__PHP_Incomplete_Class', $stackTraceArray[$index]['args'][0]);
         }

tests/FieldProviderTest.php

@@ -91,4 +91,15 @@ public function testQueryCount()
 
         $this->assertCount(100, $queries);
     }
+
+    public function testGetServerIp()
+    {
+        $this->app['understand.dataCollector']->set('sql_queries', range(1, 1000));
+
+        $this->call('GET', '/', [], [], [], ['SERVER_ADDR' => '127.0 0.1']);
+
+        $ip = $this->app['understand.fieldProvider']->getServerIp();
+
+        $this->assertEquals('127.0 0.1', $ip);
+    }
 }