Merge pull request #55 from maxmind/greg/namespaced-jsonserializable-…

…5.3-compat

Use proper namespace for PHP 5.3 JsonSerializable

CHANGELOG.md

@@ -1,6 +1,18 @@
 CHANGELOG
 =========
 
+2.3.2 (2015-09-XX)
+------------------
+
+* `JsonSerializable` compatibility interface was moved to `GeoIp2\Compat`
+  rather than the global namespace to prevent autoloading issues. Reported by
+  Tomas Buteler. GitHub #54.
+* Missing documentation for the `$postal` property was added to the
+  `GeoIp2\Model\City` class. Fix by Roy Sindre Norangshol. GitHub #51.
+* In the Phar distribution, source files for this module no longer have their
+  documentation stripped, allowing IDE introspection to work properly.
+  Reported by Dominic Black. GitHub #52.
+
 2.3.1 (2015-06-30)
 ------------------
 

composer.json

@@ -22,8 +22,7 @@
     },
     "autoload": {
         "psr-4": {
-            "GeoIp2\\": "src",
-            "": "compat/"
+            "GeoIp2\\": "src"
         }
     }
 }

src/Compat/JsonSerializable.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace GeoIp2\Compat;
+
+// @codingStandardsIgnoreFile
+
+/**
+  * This interface exists to provide backwards compatibility with PHP 5.3
+  *
+  * This should _not_ be used by any third-party code.
+  *
+  * @ignore
+  */
+if (interface_exists('JsonSerializable')) {
+    interface JSONSerializable extends \JSONSerializable
+    {
+    }
+} else {
+    interface JsonSerializable
+    {
+        /**
+         * Returns data that can be serialized by json_encode
+         * @ignore
+         */
+        public function jsonSerialize();
+    }
+}

src/Model/AbstractModel.php

@@ -2,10 +2,12 @@
 
 namespace GeoIp2\Model;
 
+use GeoIp2\Compat\JsonSerializable;
+
 /**
  * @ignore
  */
-abstract class AbstractModel implements \JsonSerializable
+abstract class AbstractModel implements JsonSerializable
 {
     protected $raw;
 

src/Record/AbstractRecord.php

@@ -2,7 +2,9 @@
 
 namespace GeoIp2\Record;
 
-abstract class AbstractRecord implements \JsonSerializable
+use GeoIp2\Compat\JsonSerializable;
+
+abstract class AbstractRecord implements JsonSerializable
 {
     private $record;