diff --git a/spec/cc/engine/analyzers/php/main_spec.rb b/spec/cc/engine/analyzers/php/main_spec.rb
index 9e37e1f0..b7c6c155 100644
--- a/spec/cc/engine/analyzers/php/main_spec.rb
+++ b/spec/cc/engine/analyzers/php/main_spec.rb
@@ -56,6 +56,31 @@
       expect(result).to match "\"type\":\"issue\""
     end
 
+    it "handles INF & NAN constants" do
+      create_source_file("foo.php", <<-EOPHP)
+          <?php
+          function f1($name) {
+            // the php-parser lib turns this into INF, but writing INF directly gets emitted differently
+            if (empty($name)) {
+              return 646e444;
+            } else {
+              return 0;
+            }
+          }
+
+          function f2($name) {
+            if (empty($name)) {
+              return 646e444;
+            } else {
+              return 0;
+            }
+          }
+      EOPHP
+
+      result = run_engine(engine_conf).strip
+      expect(result).to match "\"type\":\"issue\""
+    end
+
     it "skips unparsable files" do
       create_source_file("foo.php", <<-EOPHP)
         <?php blorb &; "fee
diff --git a/vendor/php-parser/lib/PhpParser/Serializer/JSON.php b/vendor/php-parser/lib/PhpParser/Serializer/JSON.php
index 6cbef8b4..1779ac2c 100644
--- a/vendor/php-parser/lib/PhpParser/Serializer/JSON.php
+++ b/vendor/php-parser/lib/PhpParser/Serializer/JSON.php
@@ -29,7 +29,11 @@ protected function _serialize($node) {
           }
 
           foreach ($node as $name => $subNode) {
-            if (is_string($subNode)) {
+            if (INF === $subNode) {
+              $doc[$name] = "_PHP:CONST:INF";
+            } elseif (NaN === $subNode) {
+              $doc[$name] = "_PHP:CONST:NaN";
+            } elseif (is_string($subNode)) {
               $doc[$name] = utf8_encode($subNode);
             } elseif (is_int($subNode)) {
               $doc[$name] = $subNode;