Skip to content

Commit

Permalink
Merge pull request #14 from laminas/1.1.x-merge-up-into-1.2.x_6084b3d…
Browse files Browse the repository at this point in the history
…3c8b847.97082617

Merge release 1.1.1 into 1.2.x
  • Loading branch information
boesing committed Apr 25, 2021
2 parents 11759de + 2a1f160 commit 3fbc219
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/CommonAdapterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ abstract class CommonAdapterTest extends AbstractCommonAdapterTest
/**
* All datatypes of PHP
*
* @var string[]
* @var string[]|null
*/
protected $_phpDatatypes = [];
protected $_phpDatatypes;

protected function setUp(): void
{
$this->storage = $this->_storage;
$this->options = $this->_options;
$this->phpDatatypes = $this->_phpDatatypes;
$this->phpDatatypes = $this->_phpDatatypes ?? $this->phpDatatypes;

parent::setUp();
}
Expand Down

0 comments on commit 3fbc219

Please sign in to comment.