Merge branch 'feature/38' into develop

weierophinney · weierophinney · commit 887d36e8b158 · 2016-09-13T09:10:38.000-05:00
Close #38
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,7 +10,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Deprecated
 
-- Nothing.
+- [#38](https://github.com/zendframework/zend-stdlib/pull/38) deprecates
+  `Zend\Stdlib\JsonSerializable`, as all supported version of PHP now support
+  it.
 
 ### Removed
 
diff --git a/README.md b/README.md
@@ -7,12 +7,11 @@
 class for different scopes like:
 
 - array utilities functions;
-- json serializable interfaces;
 - general messaging systems;
 - string wrappers;
 - etc.
 
 ---
 
 - File issues at https://github.com/zendframework/zend-stdlib/issues
-- Documentation is at http://framework.zend.com/manual/current/en/index.html#zend-stdlib
+- Documentation is at https://docs.zendframework.com/zend-stdlib/
diff --git a/src/JsonSerializable.php b/src/JsonSerializable.php
@@ -9,6 +9,9 @@
 
 namespace Zend\Stdlib;
 
+/**
+ * @deprecated Since 3.1.0; use the native JsonSerializable interface
+ */
 interface JsonSerializable extends \JsonSerializable
 {
 }

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,9 @@`
`9`	`9`
`10`	`10`	`namespace Zend\Stdlib;`
`11`	`11`
	`12`	`+/**`
	`13`	`+ * @deprecated Since 3.1.0; use the native JsonSerializable interface`
	`14`	`+ */`
`12`	`15`	`interface JsonSerializable extends \JsonSerializable`
`13`	`16`	`{`
`14`	`17`	`}`