Merge branch '6.4' into 7.2

* 6.4:
  -
  CS fixes

Author: nicolas-grekas

ProxyHelper.php

@@ -70,7 +70,7 @@ public static function generateLazyGhost(\ReflectionClass $class): string
             }
 
             if ($flags & (\ReflectionProperty::IS_FINAL | \ReflectionProperty::IS_PRIVATE)) {
-                throw new LogicException(sprintf('Cannot generate lazy ghost: property "%s::$%s" is final or private(set).', $class->name, $name));
+                throw new LogicException(\sprintf('Cannot generate lazy ghost: property "%s::$%s" is final or private(set).', $class->name, $name));
             }
 
             $p = $propertyScopes[$k][4] ?? Hydrator::$propertyScopes[$class->name][$k][4] = new \ReflectionProperty($scope, $name);
@@ -92,7 +92,7 @@ public static function generateLazyGhost(\ReflectionClass $class): string
                     $arg = '$'.$method->getParameters()[0]->name;
                     $hooks .= "        set({$parameters}) { \$this->initializeLazyObject(); parent::\${$name}::set({$arg}); }\n";
                 } else {
-                    throw new LogicException(sprintf('Cannot generate lazy ghost: hook "%s::%s()" is not supported.', $class->name, $method->name));
+                    throw new LogicException(\sprintf('Cannot generate lazy ghost: hook "%s::%s()" is not supported.', $class->name, $method->name));
                 }
             }
 
@@ -159,7 +159,7 @@ public static function generateLazyProxy(?\ReflectionClass $class, array $interf
                 }
 
                 if ($flags & (\ReflectionProperty::IS_FINAL | \ReflectionProperty::IS_PRIVATE)) {
-                    throw new LogicException(sprintf('Cannot generate lazy proxy: property "%s::$%s" is final or private(set).', $class->name, $name));
+                    throw new LogicException(\sprintf('Cannot generate lazy proxy: property "%s::$%s" is final or private(set).', $class->name, $name));
                 }
 
                 $p = $propertyScopes[$k][4] ?? Hydrator::$propertyScopes[$class->name][$k][4] = new \ReflectionProperty($scope, $name);
@@ -228,7 +228,7 @@ public static function generateLazyProxy(?\ReflectionClass $class, array $interf
 
                     EOPHP;
                 } else {
-                    throw new LogicException(sprintf('Cannot generate lazy proxy: hook "%s::%s()" is not supported.', $class->name, $method->name));
+                    throw new LogicException(\sprintf('Cannot generate lazy proxy: hook "%s::%s()" is not supported.', $class->name, $method->name));
                 }
             }
 

Tests/LazyGhostTraitTest.php

@@ -331,7 +331,7 @@ public function testPropertyHooksWithDefaultValue()
 
         $this->assertSame(321, $object->backedIntWithDefault);
         $this->assertSame('321', $object->backedStringWithDefault);
-        $this->assertSame(false, $object->backedBoolWithDefault);
+        $this->assertFalse($object->backedBoolWithDefault);
         $this->assertTrue($initialized);
 
         $initialized = false;
@@ -344,7 +344,7 @@ public function testPropertyHooksWithDefaultValue()
         $this->assertTrue($initialized);
         $this->assertSame(654, $object->backedIntWithDefault);
         $this->assertSame('654', $object->backedStringWithDefault);
-        $this->assertSame(true, $object->backedBoolWithDefault);
+        $this->assertTrue($object->backedBoolWithDefault);
     }
 
     /**