enflow
diff --git a/‎src/Symfony/Component/PropertyAccess/PropertyAccessor.php
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/PropertyAccess/PropertyAccessor.php
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Yaml/Inline.php
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Yaml/Inline.php
Lines changed: 2 additions & 2 deletions
@@ -472,7 +472,7 @@ private function readProperty($zval, $property)
                 } catch (\TypeError $e) {
                     // handle uninitialized properties in PHP >= 7
                     if (preg_match((sprintf('/^Return value of %s::%s\(\) must be of the type (\w+), null returned$/', preg_quote(\get_class($object)), $access[self::ACCESS_NAME])), $e->getMessage(), $matches)) {
-                        throw new AccessException(sprintf('The method "%s::%s()" returned "null", but expected type "%3$s". Have you forgotten to initialize a property or to make the return type nullable using "?%3$s" instead?', \get_class($object), $access[self::ACCESS_NAME], $matches[1]), 0, $e);
+                        throw new AccessException(sprintf('The method "%s::%s()" returned "null", but expected type "%3$s". Did you forget to initialize a property or to make the return type nullable using "?%3$s"?', \get_class($object), $access[self::ACCESS_NAME], $matches[1]), 0, $e);
                     }
 
                     throw $e;
@@ -505,7 +505,7 @@ private function readProperty($zval, $property)
             if (\PHP_VERSION_ID >= 70400 && preg_match('/^Typed property ([\w\\\]+)::\$(\w+) must not be accessed before initialization$/', $e->getMessage(), $matches)) {
                 $r = new \ReflectionProperty($matches[1], $matches[2]);
 
-                throw new AccessException(sprintf('The property "%s::$%s" is not readable because it is typed "%2$s". You should initialize it or declare a default value instead.', $r->getDeclaringClass()->getName(), $r->getType()->getName()), 0, $e);
+                throw new AccessException(sprintf('The property "%s::$%s" is not readable because it is typed "%s". You should initialize it or declare a default value instead.', $r->getDeclaringClass()->getName(), $r->getName(), $r->getType()->getName()), 0, $e);
             }
 
             throw $e;
 
@@ -137,7 +137,7 @@ public function testGetValueThrowsExceptionIfUninitializedProperty()
     public function testGetValueThrowsExceptionIfUninitializedPropertyWithGetter()
     {
         $this->expectException('Symfony\Component\PropertyAccess\Exception\AccessException');
-        $this->expectExceptionMessage('The method "Symfony\Component\PropertyAccess\Tests\Fixtures\UninitializedPrivateProperty::getUninitialized()" returned "null", but expected type "array". Have you forgotten to initialize a property or to make the return type nullable using "?array" instead?');
+        $this->expectExceptionMessage('The method "Symfony\Component\PropertyAccess\Tests\Fixtures\UninitializedPrivateProperty::getUninitialized()" returned "null", but expected type "array". Did you forget to initialize a property or to make the return type nullable using "?array"?');
 
         $this->propertyAccessor->getValue(new UninitializedPrivateProperty(), 'uninitialized');
     }
 
@@ -720,7 +720,7 @@ private static function evaluateScalar($scalar, $flags, $references = [])
                             throw new ParseException(sprintf('The constant "%s" is not defined.', $const), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
                         }
                         if (self::$exceptionOnInvalidType) {
-                            throw new ParseException(sprintf('The string "%s" could not be parsed as a constant. Have you forgotten to pass the "Yaml::PARSE_CONSTANT" flag to the parser?', $scalar), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
+                            throw new ParseException(sprintf('The string "%s" could not be parsed as a constant. Did you forget to pass the "Yaml::PARSE_CONSTANT" flag to the parser?', $scalar), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
                         }
 
                         return null;
@@ -738,7 +738,7 @@ private static function evaluateScalar($scalar, $flags, $references = [])
                             throw new ParseException(sprintf('The constant "%s" is not defined.', $const), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
                         }
                         if (self::$exceptionOnInvalidType) {
-                            throw new ParseException(sprintf('The string "%s" could not be parsed as a constant. Have you forgotten to pass the "Yaml::PARSE_CONSTANT" flag to the parser?', $scalar), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
+                            throw new ParseException(sprintf('The string "%s" could not be parsed as a constant. Did you forget to pass the "Yaml::PARSE_CONSTANT" flag to the parser?', $scalar), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
                         }
 
                         return null;
Original file line number	Diff line number	Diff line change
`@@ -472,7 +472,7 @@ private function readProperty($zval, $property)`
`472`	`472`	`} catch (\TypeError $e) {`
`473`	`473`	`// handle uninitialized properties in PHP >= 7`
`474`	`474`	`if (preg_match((sprintf('/^Return value of %s::%s\(\) must be of the type (\w+), null returned$/', preg_quote(\get_class($object)), $access[self::ACCESS_NAME])), $e->getMessage(), $matches)) {`
`475`		`- throw new AccessException(sprintf('The method "%s::%s()" returned "null", but expected type "%3$s". Have you forgotten to initialize a property or to make the return type nullable using "?%3$s" instead?', \get_class($object), $access[self::ACCESS_NAME], $matches[1]), 0, $e);`
	`475`	`+ throw new AccessException(sprintf('The method "%s::%s()" returned "null", but expected type "%3$s". Did you forget to initialize a property or to make the return type nullable using "?%3$s"?', \get_class($object), $access[self::ACCESS_NAME], $matches[1]), 0, $e);`
`476`	`476`	`}`
`477`	`477`
`478`	`478`	`throw $e;`
`@@ -505,7 +505,7 @@ private function readProperty($zval, $property)`
`505`	`505`	`if (\PHP_VERSION_ID >= 70400 && preg_match('/^Typed property ([\w\\\]+)::\$(\w+) must not be accessed before initialization$/', $e->getMessage(), $matches)) {`
`506`	`506`	`$r = new \ReflectionProperty($matches[1], $matches[2]);`
`507`	`507`
`508`		`- throw new AccessException(sprintf('The property "%s::$%s" is not readable because it is typed "%2$s". You should initialize it or declare a default value instead.', $r->getDeclaringClass()->getName(), $r->getType()->getName()), 0, $e);`
	`508`	`+ throw new AccessException(sprintf('The property "%s::$%s" is not readable because it is typed "%s". You should initialize it or declare a default value instead.', $r->getDeclaringClass()->getName(), $r->getName(), $r->getType()->getName()), 0, $e);`
`509`	`509`	`}`
`510`	`510`
`511`	`511`	`throw $e;`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ public function testGetValueThrowsExceptionIfUninitializedProperty()`
`137`	`137`	`public function testGetValueThrowsExceptionIfUninitializedPropertyWithGetter()`
`138`	`138`	`{`
`139`	`139`	`$this->expectException('Symfony\Component\PropertyAccess\Exception\AccessException');`
`140`		`- $this->expectExceptionMessage('The method "Symfony\Component\PropertyAccess\Tests\Fixtures\UninitializedPrivateProperty::getUninitialized()" returned "null", but expected type "array". Have you forgotten to initialize a property or to make the return type nullable using "?array" instead?');`
	`140`	`+ $this->expectExceptionMessage('The method "Symfony\Component\PropertyAccess\Tests\Fixtures\UninitializedPrivateProperty::getUninitialized()" returned "null", but expected type "array". Did you forget to initialize a property or to make the return type nullable using "?array"?');`
`141`	`141`
`142`	`142`	`$this->propertyAccessor->getValue(new UninitializedPrivateProperty(), 'uninitialized');`
`143`	`143`	`}`
Original file line number	Diff line number	Diff line change
`@@ -720,7 +720,7 @@ private static function evaluateScalar($scalar, $flags, $references = [])`
`720`	`720`	`throw new ParseException(sprintf('The constant "%s" is not defined.', $const), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);`
`721`	`721`	`}`
`722`	`722`	`if (self::$exceptionOnInvalidType) {`
`723`		`- throw new ParseException(sprintf('The string "%s" could not be parsed as a constant. Have you forgotten to pass the "Yaml::PARSE_CONSTANT" flag to the parser?', $scalar), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);`
	`723`	`+ throw new ParseException(sprintf('The string "%s" could not be parsed as a constant. Did you forget to pass the "Yaml::PARSE_CONSTANT" flag to the parser?', $scalar), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);`
`724`	`724`	`}`
`725`	`725`
`726`	`726`	`return null;`
`@@ -738,7 +738,7 @@ private static function evaluateScalar($scalar, $flags, $references = [])`
`738`	`738`	`throw new ParseException(sprintf('The constant "%s" is not defined.', $const), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);`
`739`	`739`	`}`
`740`	`740`	`if (self::$exceptionOnInvalidType) {`
`741`		`- throw new ParseException(sprintf('The string "%s" could not be parsed as a constant. Have you forgotten to pass the "Yaml::PARSE_CONSTANT" flag to the parser?', $scalar), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);`
	`741`	`+ throw new ParseException(sprintf('The string "%s" could not be parsed as a constant. Did you forget to pass the "Yaml::PARSE_CONSTANT" flag to the parser?', $scalar), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);`
`742`	`742`	`}`
`743`	`743`
`744`	`744`	`return null;`