Remove RequestMatcher reference originated by C&P

ajgarlag · ajgarlag · commit 0768aef02b26 · 2016-10-20T10:48:12.000+02:00
diff --git a/src/Encoding/FilteredStream.php b/src/Encoding/FilteredStream.php
@@ -37,9 +37,11 @@ abstract class FilteredStream implements StreamInterface
     public function __construct(StreamInterface $stream, $readFilterOptions = null, $writeFilterOptions = null)
     {
         $this->readFilterCallback = Filter\fun($this->readFilter(), $readFilterOptions);
+
         if (null !== $writeFilterOptions) {
-            @trigger_error('The $writeFilterOptions argument is deprecated since version 1.5 and will be removed in 2.0. Use Http\Message\RequestMatcher\RequestMatcher instead.', E_USER_DEPRECATED);
+            @trigger_error('The $writeFilterOptions argument is deprecated since version 1.5 and will be removed in 2.0.', E_USER_DEPRECATED);
         }
+
         $this->stream = $stream;
     }
 
@@ -131,7 +133,7 @@ public function __toString()
      */
     public function getReadFilter()
     {
-        @trigger_error('The '.__CLASS__.'::'.__METHOD__.' method is deprecated since version 1.5 and will be removed in 2.0. Use Http\Message\RequestMatcher\RequestMatcher instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__CLASS__.'::'.__METHOD__.' method is deprecated since version 1.5 and will be removed in 2.0.', E_USER_DEPRECATED);
 
         return $this->readFilter();
     }
@@ -152,7 +154,7 @@ abstract protected function readFilter();
      */
     public function getWriteFilter()
     {
-        @trigger_error('The '.__CLASS__.'::'.__METHOD__.' method is deprecated since version 1.5 and will be removed in 2.0. Use Http\Message\RequestMatcher\RequestMatcher instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__CLASS__.'::'.__METHOD__.' method is deprecated since version 1.5 and will be removed in 2.0.', E_USER_DEPRECATED);
 
         return $this->writeFilter();
     }

Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,11 @@ abstract class FilteredStream implements StreamInterface`
`37`	`37`	`public function __construct(StreamInterface $stream, $readFilterOptions = null, $writeFilterOptions = null)`
`38`	`38`	`{`
`39`	`39`	`$this->readFilterCallback = Filter\fun($this->readFilter(), $readFilterOptions);`
	`40`	`+`
`40`	`41`	`if (null !== $writeFilterOptions) {`
`41`		`- @trigger_error('The $writeFilterOptions argument is deprecated since version 1.5 and will be removed in 2.0. Use Http\Message\RequestMatcher\RequestMatcher instead.', E_USER_DEPRECATED);`
	`42`	`+ @trigger_error('The $writeFilterOptions argument is deprecated since version 1.5 and will be removed in 2.0.', E_USER_DEPRECATED);`
`42`	`43`	`}`
	`44`	`+`
`43`	`45`	`$this->stream = $stream;`
`44`	`46`	`}`
`45`	`47`
`@@ -131,7 +133,7 @@ public function __toString()`
`131`	`133`	`*/`
`132`	`134`	`public function getReadFilter()`
`133`	`135`	`{`
`134`		`- @trigger_error('The '.__CLASS__.'::'.__METHOD__.' method is deprecated since version 1.5 and will be removed in 2.0. Use Http\Message\RequestMatcher\RequestMatcher instead.', E_USER_DEPRECATED);`
	`136`	`+ @trigger_error('The '.__CLASS__.'::'.__METHOD__.' method is deprecated since version 1.5 and will be removed in 2.0.', E_USER_DEPRECATED);`
`135`	`137`
`136`	`138`	`return $this->readFilter();`
`137`	`139`	`}`
`@@ -152,7 +154,7 @@ abstract protected function readFilter();`
`152`	`154`	`*/`
`153`	`155`	`public function getWriteFilter()`
`154`	`156`	`{`
`155`		`- @trigger_error('The '.__CLASS__.'::'.__METHOD__.' method is deprecated since version 1.5 and will be removed in 2.0. Use Http\Message\RequestMatcher\RequestMatcher instead.', E_USER_DEPRECATED);`
	`157`	`+ @trigger_error('The '.__CLASS__.'::'.__METHOD__.' method is deprecated since version 1.5 and will be removed in 2.0.', E_USER_DEPRECATED);`
`156`	`158`
`157`	`159`	`return $this->writeFilter();`
`158`	`160`	`}`