Skip to content

Commit 35407b7

Browse files
committed
Merge branch '4.4'
* 4.4: There is no handler file in storage [PHPUnit Bridge] Minor tweaks related to polyfills
2 parents 82c6c6c + 7213ac3 commit 35407b7

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

components/phpunit_bridge.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ Polyfills for the Unavailable Methods
389389

390390
When using the ``simple-phpunit`` script, PHPUnit Bridge injects polyfills for
391391
most methods of the ``TestCase`` and ``Assert`` classes (e.g. ``expectException()``,
392-
``expectExcpetionMessage()``, ``assertContainsEquals``, etc.). This allows writing
392+
``expectExceptionMessage()``, ``assertContainsEquals()``, etc.). This allows writing
393393
test cases using the latest best practices while still remaining compatible with
394394
older PHPUnit versions.
395395

@@ -413,18 +413,18 @@ call to the ``doSetUp()``, ``doTearDown()``, ``doSetUpBeforeClass()`` and
413413

414414
class MyTest extends TestCase
415415
{
416+
// when using the SetUpTearDownTrait, methods like doSetup() can
417+
// be defined with and without the 'void' return type, as you wish
416418
use SetUpTearDownTrait;
417419

418-
private $state;
419-
420420
private function doSetup()
421421
{
422-
$this->state = 'demo';
422+
// ...
423423
}
424424

425425
protected function doSetup(): void
426426
{
427-
// visibility and return type-hint of method is free
427+
// ...
428428
}
429429
}
430430

doctrine/pdo_session_storage.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ Preparing the Database to Store Sessions
184184

185185
Before storing sessions in the database, you must create the table that stores
186186
the information. The session handler provides a method called
187-
:method:`Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler::createTable`
187+
:method:`Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\PdoSessionHandler::createTable`
188188
to set up this table for you according to the database engine used::
189189

190190
try {

0 commit comments

Comments
 (0)