Merge branch '3.4' into 4.4

* 3.4:
  minor. refs #13186
  [Security] clarified the encoding with memory providers
  Fix wording

Author: OskarStark

components/phpunit_bridge.rst

@@ -757,7 +757,7 @@ Troubleshooting
 The ``@group time-sensitive`` and ``@group dns-sensitive`` annotations work
 "by convention" and assume that the namespace of the tested class can be
 obtained just by removing the ``Tests\`` part from the test namespace. I.e.
-that if the your test case fully-qualified class name (FQCN) is
+if your test cases fully-qualified class name (FQCN) is
 ``App\Tests\Watch\DummyWatchTest``, it assumes the tested class namespace
 is ``App\Watch``.