Upgrade framework
This commit is contained in:
@@ -1,15 +1,19 @@
|
||||
<?php
|
||||
<?php declare(strict_types=1);
|
||||
/*
|
||||
* This file is part of Object Enumerator.
|
||||
* This file is part of sebastian/object-enumerator.
|
||||
*
|
||||
* (c) Sebastian Bergmann <sebastian@phpunit.de>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace SebastianBergmann\ObjectEnumerator;
|
||||
|
||||
use function array_merge;
|
||||
use function func_get_args;
|
||||
use function is_array;
|
||||
use function is_object;
|
||||
use SebastianBergmann\ObjectReflector\ObjectReflector;
|
||||
use SebastianBergmann\RecursionContext\Context;
|
||||
|
||||
/**
|
||||
@@ -64,19 +68,10 @@ class Enumerator
|
||||
}
|
||||
} else {
|
||||
$objects[] = $variable;
|
||||
$reflector = new \ReflectionObject($variable);
|
||||
|
||||
foreach ($reflector->getProperties() as $attribute) {
|
||||
$attribute->setAccessible(true);
|
||||
|
||||
try {
|
||||
$value = $attribute->getValue($variable);
|
||||
} catch (\Throwable $e) {
|
||||
continue;
|
||||
} catch (\Exception $e) {
|
||||
continue;
|
||||
}
|
||||
$reflector = new ObjectReflector;
|
||||
|
||||
foreach ($reflector->getAttributes($variable) as $value) {
|
||||
if (!is_array($value) && !is_object($value)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -1,15 +1,16 @@
|
||||
<?php
|
||||
<?php declare(strict_types=1);
|
||||
/*
|
||||
* This file is part of Object Enumerator.
|
||||
* This file is part of sebastian/object-enumerator.
|
||||
*
|
||||
* (c) Sebastian Bergmann <sebastian@phpunit.de>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace SebastianBergmann\ObjectEnumerator;
|
||||
|
||||
interface Exception
|
||||
use Throwable;
|
||||
|
||||
interface Exception extends Throwable
|
||||
{
|
||||
}
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
<?php
|
||||
<?php declare(strict_types=1);
|
||||
/*
|
||||
* This file is part of Object Enumerator.
|
||||
* This file is part of sebastian/object-enumerator.
|
||||
*
|
||||
* (c) Sebastian Bergmann <sebastian@phpunit.de>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace SebastianBergmann\ObjectEnumerator;
|
||||
|
||||
class InvalidArgumentException extends \InvalidArgumentException implements Exception
|
||||
|
||||
Reference in New Issue
Block a user