Skip to content

Commit

Permalink
Merge branch '4.4' into 5.4
Browse files Browse the repository at this point in the history
* 4.4:
  CS fixes
  Bump Symfony version to 4.4.44
  Update VERSION for 4.4.43
  Update CONTRIBUTORS for 4.4.43
  Update CHANGELOG for 4.4.43
  • Loading branch information
nicolas-grekas committed Jun 27, 2022
2 parents fe501d4 + d49682f commit c641d63
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion PropertyAccessor.php
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,7 @@ public static function createCache(string $namespace, int $defaultLifetime, stri
}

$apcu = new ApcuAdapter($namespace, $defaultLifetime / 5, $version);
if ('cli' === \PHP_SAPI && !filter_var(ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOLEAN)) {
if ('cli' === \PHP_SAPI && !filter_var(\ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOLEAN)) {
$apcu->setLogger(new NullLogger());
} elseif (null !== $logger) {
$apcu->setLogger($logger);
Expand Down
8 changes: 4 additions & 4 deletions Tests/PropertyAccessorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -930,7 +930,7 @@ public function testWriteToSingularPropertyWhilePluralOneExists()
{
$object = new TestSingularAndPluralProps();

$this->propertyAccessor->isWritable($object, 'email'); //cache access info
$this->propertyAccessor->isWritable($object, 'email'); // cache access info
$this->propertyAccessor->setValue($object, 'email', 'test@email.com');

self::assertEquals('test@email.com', $object->getEmail());
Expand All @@ -941,7 +941,7 @@ public function testWriteToPluralPropertyWhileSingularOneExists()
{
$object = new TestSingularAndPluralProps();

$this->propertyAccessor->isWritable($object, 'emails'); //cache access info
$this->propertyAccessor->isWritable($object, 'emails'); // cache access info
$this->propertyAccessor->setValue($object, 'emails', ['test@email.com']);

$this->assertEquals(['test@email.com'], $object->getEmails());
Expand All @@ -952,7 +952,7 @@ public function testAdderAndRemoverArePreferredOverSetter()
{
$object = new TestPluralAdderRemoverAndSetter();

$this->propertyAccessor->isWritable($object, 'emails'); //cache access info
$this->propertyAccessor->isWritable($object, 'emails'); // cache access info
$this->propertyAccessor->setValue($object, 'emails', ['test@email.com']);

$this->assertEquals(['test@email.com'], $object->getEmails());
Expand All @@ -962,7 +962,7 @@ public function testAdderAndRemoverArePreferredOverSetterForSameSingularAndPlura
{
$object = new TestPluralAdderRemoverAndSetterSameSingularAndPlural();

$this->propertyAccessor->isWritable($object, 'aircraft'); //cache access info
$this->propertyAccessor->isWritable($object, 'aircraft'); // cache access info
$this->propertyAccessor->setValue($object, 'aircraft', ['aeroplane']);

$this->assertEquals(['aeroplane'], $object->getAircraft());
Expand Down

0 comments on commit c641d63

Please sign in to comment.