Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

[PropertyAccess] Throw an InvalidArgumentException when the type do not match #17738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 10 commits into from
Closed

[PropertyAccess] Throw an InvalidArgumentException when the type do not match #17738

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1329eb6
[PropertyAccess] Throw an InvalidArgumentException when the type do n…
dunglas Feb 9, 2016
762e5b1
Add missing return statement. Update PHPDoc
dunglas Feb 9, 2016
90e7953
Fixes some edge cases...
dunglas Feb 16, 2016
834f970
Test E_RECOVERABLE_ERROR
dunglas Feb 16, 2016
bd210f9
Fix typo
dunglas Feb 16, 2016
799ab29
Emulate PHP 7's \TypeError
dunglas Feb 23, 2016
7233f70
CS
dunglas Feb 23, 2016
453cc12
PHPDoc
dunglas Feb 23, 2016
fe8e9e5
More CS fixes
dunglas Feb 23, 2016
28dc4e3
CS
dunglas Feb 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixes some edge cases...
  • Loading branch information
@dunglas
dunglas committed Feb 16, 2016
commit 90e7953cb31349d78ad4af645d347df5269fc6f0
19 changes: 15 additions & 4 deletions 19 src/Symfony/Component/PropertyAccess/PropertyAccessor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,8 +542,9 @@ private function writeIndex(&$array, $index, $value)
* @param string $property The property to write
* @param mixed $value The value to write
*
* @throws NoSuchPropertyException If the property does not exist or is not
* public.
* @throws NoSuchPropertyException If the property does not exist or is not
* public.
* @throws InvalidArgumentException
*/
private function writeProperty(&$object, $property, $value)
{
Expand Down Expand Up @@ -580,9 +581,13 @@ private function writeProperty(&$object, $property, $value)
* @param object $object
* @param string $method
* @param mixed $value
*
* @throws InvalidArgumentException
* @throws \Exception
*/
private function callMethod($object, $method, $value) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

{ should be on the next line

if (class_exists('TypeError')) {
// Cannot use class_exists because the PHP 7 polyfill defines \TypeError
if (PHP_MAJOR_VERSION >= 7) {
// PHP 7
try {
$object->{$method}($value);
Expand All @@ -600,8 +605,12 @@ private function callMethod($object, $method, $value) {

try {
$object->{$method}($value);
} finally {
restore_error_handler();
} catch (\Exception $e) {
// Cannot use finally in 5.5 because of https://bugs.php.net/bug.php?id=67047
restore_error_handler();

throw $e;
}
}

Expand All @@ -614,6 +623,8 @@ private function callMethod($object, $method, $value) {
* @param array|\Traversable $collection The collection to write
* @param string $addMethod The add*() method
* @param string $removeMethod The remove*() method
*
* @throws InvalidArgumentException
*/
private function writeCollection($object, $property, $collection, $addMethod, $removeMethod)
{
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.