Merge branch 'hotfix/1'

weierophinney · weierophinney · commit 69fc1aff9bb7 · 2017-10-16T08:50:13.000-05:00
Close #1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,13 +8,18 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
+### Changed
+
+- Nothing.
+
 ### Deprecated
 
 - Nothing.
 
 ### Removed
 
-- Nothing.
+- [#1](https://github.com/zendframework/zend-xml2json/pull/1) removes an
+  obsolete `@deprecated` annotation.
 
 ### Fixed
 
diff --git a/src/Xml2Json.php b/src/Xml2Json.php
@@ -42,7 +42,6 @@ class Xml2Json
      * NOTE: Encoding native javascript expressions via Zend\Json\Expr is not
      * possible.
      *
-     * @deprecated by https://github.com/zendframework/zf2/pull/6778
      * @param string $xmlStringContents XML String to be converted.
      * @param  bool $ignoreXmlAttributes Include or exclude XML attributes in
      *     the conversion process.

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,6 @@ class Xml2Json`
`42`	`42`	`* NOTE: Encoding native javascript expressions via Zend\Json\Expr is not`
`43`	`43`	`* possible.`
`44`	`44`	`*`
`45`		`- * @deprecated by https://github.com/zendframework/zf2/pull/6778`
`46`	`45`	`* @param string $xmlStringContents XML String to be converted.`
`47`	`46`	`* @param bool $ignoreXmlAttributes Include or exclude XML attributes in`
`48`	`47`	`* the conversion process.`