SafeStream: unregister protocols in cleaner way [Closes #6]

nette · Mar 19, 2016 · 4b9bb32 · 4b9bb32
1 parent 43c26e4
commit 4b9bb32
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/SafeStream/SafeStream.php b/src/SafeStream/SafeStream.php
@@ -50,9 +50,10 @@ class SafeStream
 	 */
 	public static function register()
 	{
-		@stream_wrapper_unregister('safe'); // old protocol
-		stream_wrapper_register('safe', __CLASS__);
-		@stream_wrapper_unregister(self::PROTOCOL); // intentionally @
+		foreach (array_intersect(stream_get_wrappers(), array('safe', self::PROTOCOL)) as $name) {
+			stream_wrapper_unregister($name);
+		}
+		stream_wrapper_register('safe', __CLASS__); // old protocol
 		return stream_wrapper_register(self::PROTOCOL, __CLASS__);
 	}