Merge branch 'MAGETWO-91528' of github.com:magento-borg/magento2ce into MAGETWO-91528

fascinosum · fascinosum · commit 5a46fa4424d2 · 2018-07-03T16:47:49.000-05:00
diff --git a/lib/internal/Magento/Framework/Filter/Truncate.php b/lib/internal/Magento/Framework/Filter/Truncate.php
@@ -10,6 +10,9 @@
  *
  * Truncate a string to a certain length if necessary, appending the $etc string.
  * $remainder will contain the string that has been replaced with $etc.
+ *
+ * @deprecated
+ * @see \Magento\Framework\Filter\TruncateFilter
  */
 class Truncate implements \Zend_Filter_Interface
 {

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,9 @@`
`10`	`10`	`*`
`11`	`11`	`* Truncate a string to a certain length if necessary, appending the $etc string.`
`12`	`12`	`* $remainder will contain the string that has been replaced with $etc.`
	`13`	`+ *`
	`14`	`+ * @deprecated`
	`15`	`+ * @see \Magento\Framework\Filter\TruncateFilter`
`13`	`16`	`*/`
`14`	`17`	`class Truncate implements \Zend_Filter_Interface`
`15`	`18`	`{`