diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.3' into 3.4

Browse Source 
* 3.3:
  [DI] Make dumped docblocks less verbose
  [VarDumper] Dont use Stub objects for arrays
This commit is contained in:
Nicolas Grekas 2017-07-26 10:10:47 +02:00
commit f9c4621800
21 changed files with 327 additions and 759 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
View File

@ -588,7 +588,7 @@ class PhpDumper extends Dumper
if ($class = $definition->getClass()) {
$class = $this->container->resolveEnvPlaceholders($class);
$return[] = sprintf('@return %s A %s instance', 0 === strpos($class, '%') ? 'object' : '\\'.ltrim($class, '\\'), ltrim($class, '\\'));
$return[] = sprintf(0 === strpos($class, '%') ? '@return object A %1$s instance' : '@return \%s', ltrim($class, '\\'));
} elseif ($definition->getFactory()) {
$factory = $definition->getFactory();
if (is_string($factory)) {
@ -613,40 +613,14 @@ class PhpDumper extends Dumper
$return = str_replace("\n * \n", "\n *\n", implode("\n * ", $return));
$return = $this->container->resolveEnvPlaceholders($return);
$doc = '';
if ($definition->isShared()) {
$doc .= <<<'EOF'
*
* This service is shared.
* This method always returns the same instance of the service.
EOF;
}
if (!$definition->isPublic()) {
$doc .= <<<'EOF'
*
* This service is private.
* If you want to be able to request this service from the container directly,
* make it public, otherwise you might end up with broken code.
EOF;
}
if ($definition->isAutowired()) {
$doc .= <<<EOF
*
* This service is autowired.
EOF;
}
$shared = $definition->isShared() ? ' shared' : '';
$public = $definition->isPublic() ? 'public' : 'private';
$autowired = $definition->isAutowired() ? ' autowired' : '';
if ($definition->isLazy()) {
$lazyInitialization = '$lazyLoad = true';
$lazyInitializationDoc = "\n * @param bool \$lazyLoad whether to try lazy-loading the service with a proxy\n *";
} else {
$lazyInitialization = '';
$lazyInitializationDoc = '';
}
// with proxies, for 5.3.3 compatibility, the getter must be public to be accessible to the initializer
@ -656,8 +630,8 @@ EOF;
$code = <<<EOF
/*{$this->docStar}
* Gets the '$id' service.$doc
*$lazyInitializationDoc
* Gets the $public '$id'$shared$autowired service.
*
* $return
*/
{$visibility} function {$methodName}($lazyInitialization)

7
src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
View File

@ -63,12 +63,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'test' service.
* Gets the public 'test' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \stdClass A stdClass instance
* @return \stdClass
*/
protected function getTestService()
{

7
src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
View File

@ -67,12 +67,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'test' service.
* Gets the public 'test' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \stdClass A stdClass instance
* @return \stdClass
*/
protected function getTestService()
{

7
src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php
View File

@ -61,12 +61,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'bar' service.
* Gets the public 'bar' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \stdClass A stdClass instance
* @return \stdClass
*/
protected function getBarService()
{

14
src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
View File

@ -62,12 +62,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'service_from_anonymous_factory' service.
* Gets the public 'service_from_anonymous_factory' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \Bar\FooClass A Bar\FooClass instance
* @return \Bar\FooClass
*/
protected function getServiceFromAnonymousFactoryService()
{
@ -75,12 +72,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'service_with_method_call_and_factory' service.
* Gets the public 'service_with_method_call_and_factory' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \Bar\FooClass A Bar\FooClass instance
* @return \Bar\FooClass
*/
protected function getServiceWithMethodCallAndFactoryService()
{

9
src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php
View File

@ -61,14 +61,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'foo' service.
* Gets the public 'foo' shared autowired service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* This service is autowired.
*
* @return \Foo A Foo instance
* @return \Foo
*/
protected function getFooService()
{

5
src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php
View File

@ -63,10 +63,7 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'test' service.
*
* This service is shared.
* This method always returns the same instance of the service.
* Gets the public 'test' shared service.
*
* @return object A %env(FOO)% instance
*/

7
src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php
View File

@ -64,12 +64,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'Symfony\Component\DependencyInjection\Tests\Fixtures\Container33\Foo' service.
* Gets the public 'Symfony\Component\DependencyInjection\Tests\Fixtures\Container33\Foo' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \Symfony\Component\DependencyInjection\Tests\Fixtures\Container33\Foo A Symfony\Component\DependencyInjection\Tests\Fixtures\Container33\Foo instance
* @return \Symfony\Component\DependencyInjection\Tests\Fixtures\Container33\Foo
*/
protected function getSymfony_Component_DependencyInjection_Tests_Fixtures_Container33_FooService()
{

181
src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
View File

@ -73,12 +73,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'bar' service.
* Gets the public 'bar' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \Bar\FooClass A Bar\FooClass instance
* @return \Bar\FooClass
*/
protected function getBarService()
{
@ -92,12 +89,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'baz' service.
* Gets the public 'baz' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \Baz A Baz instance
* @return \Baz
*/
protected function getBazService()
{
@ -109,12 +103,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'configured_service' service.
* Gets the public 'configured_service' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \stdClass A stdClass instance
* @return \stdClass
*/
protected function getConfiguredServiceService()
{
@ -126,12 +117,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'configured_service_simple' service.
* Gets the public 'configured_service_simple' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \stdClass A stdClass instance
* @return \stdClass
*/
protected function getConfiguredServiceSimpleService()
{
@ -143,12 +131,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'decorated' service.
* Gets the public 'decorated' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \stdClass A stdClass instance
* @return \stdClass
*/
protected function getDecoratedService()
{
@ -156,12 +141,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'decorator_service' service.
* Gets the public 'decorator_service' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \stdClass A stdClass instance
* @return \stdClass
*/
protected function getDecoratorServiceService()
{
@ -169,12 +151,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'decorator_service_with_name' service.
* Gets the public 'decorator_service_with_name' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \stdClass A stdClass instance
* @return \stdClass
*/
protected function getDecoratorServiceWithNameService()
{
@ -182,12 +161,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'deprecated_service' service.
* Gets the public 'deprecated_service' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \stdClass A stdClass instance
* @return \stdClass
*
* @deprecated The "deprecated_service" service is deprecated. You should stop using it, as it will soon be removed.
*/
@ -199,12 +175,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'factory_service' service.
* Gets the public 'factory_service' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \Bar A Bar instance
* @return \Bar
*/
protected function getFactoryServiceService()
{
@ -212,12 +185,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'factory_service_simple' service.
* Gets the public 'factory_service_simple' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \Bar A Bar instance
* @return \Bar
*/
protected function getFactoryServiceSimpleService()
{
@ -225,12 +195,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'foo' service.
* Gets the public 'foo' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \Bar\FooClass A Bar\FooClass instance
* @return \Bar\FooClass
*/
protected function getFooService()
{
@ -249,10 +216,7 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'foo.baz' service.
*
* This service is shared.
* This method always returns the same instance of the service.
* Gets the public 'foo.baz' shared service.
*
* @return object A %baz_class% instance
*/
@ -266,7 +230,7 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'foo_bar' service.
* Gets the public 'foo_bar' service.
*
* @return object A %foo_class% instance
*/
@ -278,12 +242,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'foo_with_inline' service.
* Gets the public 'foo_with_inline' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \Foo A Foo instance
* @return \Foo
*/
protected function getFooWithInlineService()
{
@ -295,12 +256,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'lazy_context' service.
* Gets the public 'lazy_context' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \LazyContext A LazyContext instance
* @return \LazyContext
*/
protected function getLazyContextService()
{
@ -313,12 +271,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'lazy_context_ignore_invalid_ref' service.
* Gets the public 'lazy_context_ignore_invalid_ref' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \LazyContext A LazyContext instance
* @return \LazyContext
*/
protected function getLazyContextIgnoreInvalidRefService()
{
@ -335,12 +290,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'method_call1' service.
* Gets the public 'method_call1' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \Bar\FooClass A Bar\FooClass instance
* @return \Bar\FooClass
*/
protected function getMethodCall1Service()
{
@ -362,12 +314,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'new_factory_service' service.
* Gets the public 'new_factory_service' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \FooBarBaz A FooBarBaz instance
* @return \FooBarBaz
*/
protected function getNewFactoryServiceService()
{
@ -379,12 +328,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'service_from_static_method' service.
* Gets the public 'service_from_static_method' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \Bar\FooClass A Bar\FooClass instance
* @return \Bar\FooClass
*/
protected function getServiceFromStaticMethodService()
{
@ -392,16 +338,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'configurator_service' service.
* Gets the private 'configurator_service' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* This service is private.
* If you want to be able to request this service from the container directly,
* make it public, otherwise you might end up with broken code.
*
* @return \ConfClass A ConfClass instance
* @return \ConfClass
*/
protected function getConfiguratorServiceService()
{
@ -413,16 +352,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'configurator_service_simple' service.
* Gets the private 'configurator_service_simple' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* This service is private.
* If you want to be able to request this service from the container directly,
* make it public, otherwise you might end up with broken code.
*
* @return \ConfClass A ConfClass instance
* @return \ConfClass
*/
protected function getConfiguratorServiceSimpleService()
{
@ -430,16 +362,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'factory_simple' service.
* Gets the private 'factory_simple' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* This service is private.
* If you want to be able to request this service from the container directly,
* make it public, otherwise you might end up with broken code.
*
* @return \SimpleFactoryClass A SimpleFactoryClass instance
* @return \SimpleFactoryClass
*/
protected function getFactorySimpleService()
{
@ -447,16 +372,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'inlined' service.
* Gets the private 'inlined' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* This service is private.
* If you want to be able to request this service from the container directly,
* make it public, otherwise you might end up with broken code.
*
* @return \Bar A Bar instance
* @return \Bar
*/
protected function getInlinedService()
{
@ -469,16 +387,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'new_factory' service.
* Gets the private 'new_factory' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* This service is private.
* If you want to be able to request this service from the container directly,
* make it public, otherwise you might end up with broken code.
*
* @return \FactoryClass A FactoryClass instance
* @return \FactoryClass
*/
protected function getNewFactoryService()
{

123
src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
View File

@ -83,12 +83,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'bar' service.
* Gets the public 'bar' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \Bar\FooClass A Bar\FooClass instance
* @return \Bar\FooClass
*/
protected function getBarService()
{
@ -102,12 +99,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'baz' service.
* Gets the public 'baz' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \Baz A Baz instance
* @return \Baz
*/
protected function getBazService()
{
@ -119,12 +113,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'configured_service' service.
* Gets the public 'configured_service' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \stdClass A stdClass instance
* @return \stdClass
*/
protected function getConfiguredServiceService()
{
@ -139,12 +130,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'configured_service_simple' service.
* Gets the public 'configured_service_simple' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \stdClass A stdClass instance
* @return \stdClass
*/
protected function getConfiguredServiceSimpleService()
{
@ -156,12 +144,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'decorator_service' service.
* Gets the public 'decorator_service' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \stdClass A stdClass instance
* @return \stdClass
*/
protected function getDecoratorServiceService()
{
@ -169,12 +154,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'decorator_service_with_name' service.
* Gets the public 'decorator_service_with_name' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \stdClass A stdClass instance
* @return \stdClass
*/
protected function getDecoratorServiceWithNameService()
{
@ -182,12 +164,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'deprecated_service' service.
* Gets the public 'deprecated_service' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \stdClass A stdClass instance
* @return \stdClass
*
* @deprecated The "deprecated_service" service is deprecated. You should stop using it, as it will soon be removed.
*/
@ -199,12 +178,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'factory_service' service.
* Gets the public 'factory_service' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \Bar A Bar instance
* @return \Bar
*/
protected function getFactoryServiceService()
{
@ -212,12 +188,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'factory_service_simple' service.
* Gets the public 'factory_service_simple' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \Bar A Bar instance
* @return \Bar
*/
protected function getFactoryServiceSimpleService()
{
@ -225,12 +198,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'foo' service.
* Gets the public 'foo' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \Bar\FooClass A Bar\FooClass instance
* @return \Bar\FooClass
*/
protected function getFooService()
{
@ -249,12 +219,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'foo.baz' service.
* Gets the public 'foo.baz' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \BazClass A BazClass instance
* @return \BazClass
*/
protected function getFoo_BazService()
{
@ -266,9 +233,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'foo_bar' service.
* Gets the public 'foo_bar' service.
*
* @return \Bar\FooClass A Bar\FooClass instance
* @return \Bar\FooClass
*/
protected function getFooBarService()
{
@ -276,12 +243,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'foo_with_inline' service.
* Gets the public 'foo_with_inline' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \Foo A Foo instance
* @return \Foo
*/
protected function getFooWithInlineService()
{
@ -298,12 +262,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'lazy_context' service.
* Gets the public 'lazy_context' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \LazyContext A LazyContext instance
* @return \LazyContext
*/
protected function getLazyContextService()
{
@ -316,12 +277,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'lazy_context_ignore_invalid_ref' service.
* Gets the public 'lazy_context_ignore_invalid_ref' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \LazyContext A LazyContext instance
* @return \LazyContext
*/
protected function getLazyContextIgnoreInvalidRefService()
{
@ -333,12 +291,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'method_call1' service.
* Gets the public 'method_call1' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \Bar\FooClass A Bar\FooClass instance
* @return \Bar\FooClass
*/
protected function getMethodCall1Service()
{
@ -354,12 +309,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'new_factory_service' service.
* Gets the public 'new_factory_service' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \FooBarBaz A FooBarBaz instance
* @return \FooBarBaz
*/
protected function getNewFactoryServiceService()
{
@ -374,12 +326,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'service_from_static_method' service.
* Gets the public 'service_from_static_method' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \Bar\FooClass A Bar\FooClass instance
* @return \Bar\FooClass
*/
protected function getServiceFromStaticMethodService()
{

7
src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php
View File

@ -67,12 +67,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'bar' service.
* Gets the public 'bar' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \BarClass A BarClass instance
* @return \BarClass
*/
protected function getBarService()
{

67
src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php
View File

@ -72,12 +72,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'bar_service' service.
* Gets the public 'bar_service' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \stdClass A stdClass instance
* @return \stdClass
*/
protected function getBarServiceService()
{
@ -85,12 +82,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'foo_service' service.
* Gets the public 'foo_service' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \Symfony\Component\DependencyInjection\ServiceLocator A Symfony\Component\DependencyInjection\ServiceLocator instance
* @return \Symfony\Component\DependencyInjection\ServiceLocator
*/
protected function getFooServiceService()
{
@ -104,12 +98,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'translator.loader_1' service.
* Gets the public 'translator.loader_1' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \stdClass A stdClass instance
* @return \stdClass
*/
protected function getTranslator_Loader1Service()
{
@ -117,12 +108,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'translator.loader_2' service.
* Gets the public 'translator.loader_2' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \stdClass A stdClass instance
* @return \stdClass
*/
protected function getTranslator_Loader2Service()
{
@ -130,12 +118,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'translator.loader_3' service.
* Gets the public 'translator.loader_3' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \stdClass A stdClass instance
* @return \stdClass
*/
protected function getTranslator_Loader3Service()
{
@ -143,12 +128,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'translator_1' service.
* Gets the public 'translator_1' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator A Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator instance
* @return \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator
*/
protected function getTranslator1Service()
{
@ -158,12 +140,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'translator_2' service.
* Gets the public 'translator_2' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator A Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator instance
* @return \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator
*/
protected function getTranslator2Service()
{
@ -177,12 +156,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'translator_3' service.
* Gets the public 'translator_3' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator A Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator instance
* @return \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator
*/
protected function getTranslator3Service()
{
@ -199,16 +175,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'baz_service' service.
* Gets the private 'baz_service' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* This service is private.
* If you want to be able to request this service from the container directly,
* make it public, otherwise you might end up with broken code.
*
* @return \stdClass A stdClass instance
* @return \stdClass
*/
protected function getBazServiceService()
{

25
src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php
View File

@ -66,12 +66,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'bar_service' service.
* Gets the public 'bar_service' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \stdClass A stdClass instance
* @return \stdClass
*/
protected function getBarServiceService()
{
@ -79,12 +76,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'foo_service' service.
* Gets the public 'foo_service' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \stdClass A stdClass instance
* @return \stdClass
*/
protected function getFooServiceService()
{
@ -92,16 +86,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'baz_service' service.
* Gets the private 'baz_service' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* This service is private.
* If you want to be able to request this service from the container directly,
* make it public, otherwise you might end up with broken code.
*
* @return \stdClass A stdClass instance
* @return \stdClass
*/
protected function getBazServiceService()
{

18
src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php
View File

@ -65,12 +65,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'public_foo' service.
* Gets the public 'public_foo' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \stdClass A stdClass instance
* @return \stdClass
*/
protected function getPublicFooService()
{
@ -78,16 +75,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'private_foo' service.
* Gets the private 'private_foo' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* This service is private.
* If you want to be able to request this service from the container directly,
* make it public, otherwise you might end up with broken code.
*
* @return \stdClass A stdClass instance
* @return \stdClass
*/
protected function getPrivateFooService()
{

29
src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
View File

@ -70,12 +70,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber' service.
* Gets the public 'Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber' shared service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* @return \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber A Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber instance
* @return \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber
*/
protected function getSymfony_Component_DependencyInjection_Tests_Fixtures_TestServiceSubscriberService()
{
@ -83,14 +80,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'foo_service' service.
* Gets the public 'foo_service' shared autowired service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* This service is autowired.
*
* @return \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber A Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber instance
* @return \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber
*/
protected function getFooServiceService()
{
@ -106,18 +98,9 @@ class ProjectServiceContainer extends Container
}
/**
* Gets the 'autowired.Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition' service.
* Gets the private 'autowired.Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition' shared autowired service.
*
* This service is shared.
* This method always returns the same instance of the service.
*
* This service is private.
* If you want to be able to request this service from the container directly,
* make it public, otherwise you might end up with broken code.
*
* This service is autowired.
*
* @return \Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition A Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition instance
* @return \Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition
*/
protected function getAutowired_Symfony_Component_DependencyInjection_Tests_Fixtures_CustomDefinitionService()
{

4
src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
View File

@ -229,7 +229,7 @@ abstract class AbstractCloner implements ClonerInterface
gc_disable();
}
try {
$data = $this->doClone($var);
return new Data($this->doClone($var));
} finally {
if ($gc) {
gc_enable();
@ -237,8 +237,6 @@ abstract class AbstractCloner implements ClonerInterface
restore_error_handler();
$this->prevErrorHandler = null;
}
return new Data($data);
}
/**

97
src/Symfony/Component/VarDumper/Cloner/Data.php
View File

@ -16,7 +16,7 @@ use Symfony\Component\VarDumper\Caster\Caster;
/**
* @author Nicolas Grekas <p@tchwork.com>
*/
class Data implements \ArrayAccess, \Countable, \IteratorAggregate, \Serializable
class Data implements \ArrayAccess, \Countable, \IteratorAggregate
{
private $data;
private $position = 0;
@ -72,7 +72,7 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate, \Serializabl
if ($item instanceof Stub && Stub::TYPE_REF === $item->type && !$item->position) {
$item = $item->value;
}
if (!$item instanceof Stub) {
if (!($item = $this->getStub($item)) instanceof Stub) {
return $item;
}
if (Stub::TYPE_STRING === $item->type) {
@ -82,7 +82,7 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate, \Serializabl
$children = $item->position ? $this->data[$item->position] : array();
foreach ($children as $k => $v) {
if ($recursive && !$v instanceof Stub) {
if ($recursive && !($v = $this->getStub($v)) instanceof Stub) {
continue;
}
$children[$k] = clone $this;
@ -90,12 +90,12 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate, \Serializabl
$children[$k]->position = $item->position;
if ($recursive) {
if ($v instanceof Stub && Stub::TYPE_REF === $v->type && $v->value instanceof Stub) {
if (Stub::TYPE_REF === $v->type && ($v = $this->getStub($v->value)) instanceof Stub) {
$recursive = (array) $recursive;
if (isset($recursive[$v->value->position])) {
if (isset($recursive[$v->position])) {
continue;
}
$recursive[$v->value->position] = true;
$recursive[$v->position] = true;
}
$children[$k] = $children[$k]->getValue($recursive);
}
@ -123,7 +123,7 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate, \Serializabl
public function __get($key)
{
if (null !== $data = $this->seek($key)) {
$item = $data->data[$data->position][$data->key];
$item = $this->getStub($data->data[$data->position][$data->key]);
return $item instanceof Stub || array() === $item ? $data : $item;
}
@ -236,7 +236,7 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate, \Serializabl
if ($item instanceof Stub && Stub::TYPE_REF === $item->type && !$item->position) {
$item = $item->value;
}
if (!$item instanceof Stub || !$item->position) {
if (!($item = $this->getStub($item)) instanceof Stub || !$item->position) {
return;
}
$keys = array($key);
@ -278,57 +278,6 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate, \Serializabl
$this->dumpItem($dumper, new Cursor(), $refs, $this->data[$this->position][$this->key]);
}
/**
* @internal
*/
public function serialize()
{
$data = $this->data;
foreach ($data as $i => $values) {
foreach ($values as $k => $v) {
if ($v instanceof Stub) {
if (Stub::TYPE_ARRAY === $v->type) {
$v = self::mapStubConsts($v, false);
$data[$i][$k] = array($v->class, $v->position, $v->cut);
} else {
$v = self::mapStubConsts($v, false);
$data[$i][$k] = array($v->class, $v->position, $v->cut, $v->type, $v->value, $v->handle, $v->refCount, $v->attr);
}
}
}
}
return serialize(array($data, $this->position, $this->key, $this->maxDepth, $this->maxItemsPerDepth, $this->useRefHandles));
}
/**
* @internal
*/
public function unserialize($serialized)
{
list($data, $this->position, $this->key, $this->maxDepth, $this->maxItemsPerDepth, $this->useRefHandles) = unserialize($serialized);
foreach ($data as $i => $values) {
foreach ($values as $k => $v) {
if ($v && is_array($v)) {
$s = new Stub();
if (3 === count($v)) {
$s->type = Stub::TYPE_ARRAY;
$s = self::mapStubConsts($s, false);
list($s->class, $s->position, $s->cut) = $v;
$s->value = $s->cut + count($data[$s->position]);
} else {
list($s->class, $s->position, $s->cut, $s->type, $s->value, $s->handle, $s->refCount, $s->attr) = $v;
}
$data[$i][$k] = self::mapStubConsts($s, true);
}
}
}
$this->data = $data;
}
/**
* Depth-first dumping of items.
*
@ -346,7 +295,10 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate, \Serializabl
if (!$item instanceof Stub) {
$cursor->attr = array();
$type = gettype($item);
$type = \gettype($item);
if ($item && 'array' === $type) {
$item = $this->getStub($item);
}
} elseif (Stub::TYPE_REF === $item->type) {
if ($item->handle) {
if (!isset($refs[$r = $item->handle - (PHP_INT_MAX >> 1)])) {
@ -360,7 +312,7 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate, \Serializabl
}
$cursor->attr = $item->attr;
$type = $item->class ?: gettype($item->value);
$item = $item->value;
$item = $this->getStub($item->value);
}
if ($item instanceof Stub) {
if ($item->refCount) {
@ -458,21 +410,20 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate, \Serializabl
return $hashCut;
}
private static function mapStubConsts(Stub $stub, $resolve)
private function getStub($item)
{
static $stubConstIndexes, $stubConstValues;
if (null === $stubConstIndexes) {
$r = new \ReflectionClass(Stub::class);
$stubConstIndexes = array_flip(array_values($r->getConstants()));
$stubConstValues = array_flip($stubConstIndexes);
if (!$item || !\is_array($item)) {
return $item;
}
$map = $resolve ? $stubConstValues : $stubConstIndexes;
$stub = clone $stub;
$stub->type = $map[$stub->type];
$stub->class = isset($map[$stub->class]) ? $map[$stub->class] : $stub->class;
$stub = new Stub();
$stub->type = Stub::TYPE_ARRAY;
foreach ($item as $stub->class => $stub->position) {
}
if (isset($item[0])) {
$stub->cut = $item[0];
}
$stub->value = $stub->cut + \count($this->data[$stub->position]);
return $stub;
}

36
src/Symfony/Component/VarDumper/Cloner/Stub.php
View File

@ -16,19 +16,19 @@ namespace Symfony\Component\VarDumper\Cloner;
*
* @author Nicolas Grekas <p@tchwork.com>
*/
class Stub
class Stub implements \Serializable
{
const TYPE_REF = 'ref';
const TYPE_STRING = 'string';
const TYPE_ARRAY = 'array';
const TYPE_OBJECT = 'object';
const TYPE_RESOURCE = 'resource';
const TYPE_REF = 1;
const TYPE_STRING = 2;
const TYPE_ARRAY = 3;
const TYPE_OBJECT = 4;
const TYPE_RESOURCE = 5;
const STRING_BINARY = 'bin';
const STRING_UTF8 = 'utf8';
const STRING_BINARY = 1;
const STRING_UTF8 = 2;
const ARRAY_ASSOC = 'assoc';
const ARRAY_INDEXED = 'indexed';
const ARRAY_ASSOC = 1;
const ARRAY_INDEXED = 2;
public $type = self::TYPE_REF;
public $class = '';
@ -38,4 +38,20 @@ class Stub
public $refCount = 0;
public $position = 0;
public $attr = array();
/**
* @internal
*/
public function serialize()
{
return \serialize(array($this->class, $this->position, $this->cut, $this->type, $this->value, $this->handle, $this->refCount, $this->attr));
}
/**
* @internal
*/
public function unserialize($serialized)
{
list($this->class, $this->position, $this->cut, $this->type, $this->value, $this->handle, $this->refCount, $this->attr) = \unserialize($serialized);
}
}

223
src/Symfony/Component/VarDumper/Cloner/VarCloner.php
View File

@ -24,12 +24,11 @@ class VarCloner extends AbstractCloner
*/
protected function doClone($var)
{
$useExt = $this->useExt;
$len = 1; // Length of $queue
$pos = 0; // Number of cloned items past the minimum depth
$refsCounter = 0; // Hard references counter
$queue = array(array($var)); // This breadth-first queue is the return value
$arrayRefs = array(); // Map of queue indexes to stub array objects
$indexedArrays = array(); // Map of queue indexes that hold numerically indexed arrays
$hardRefs = array(); // Map of original zval hashes to stub objects
$objRefs = array(); // Map of original object handles to their stub object couterpart
$resRefs = array(); // Map of original resource handles to their stub object couterpart
@ -45,20 +44,15 @@ class VarCloner extends AbstractCloner
$a = null; // Array cast for nested structures
$stub = null; // Stub capturing the main properties of an original item value
// or null if the original value is used directly
$zval = array( // Main properties of the current value
'type' => null,
'zval_isref' => null,
'zval_hash' => null,
'array_count' => null,
'object_class' => null,
'object_handle' => null,
'resource_type' => null,
);
if (!self::$hashMask) {
self::initHashMask();
}
$hashMask = self::$hashMask;
$hashOffset = self::$hashOffset;
$arrayStub = new Stub();
$arrayStub->type = Stub::TYPE_ARRAY;
$fromObjCast = false;
for ($i = 0; $i < $len; ++$i) {
// Detect when we move on to the next tree depth
@ -70,76 +64,88 @@ class VarCloner extends AbstractCloner
}
}
$indexed = true; // Whether the currently iterated array is numerically indexed or not
$j = -1; // Position in the currently iterated array
$fromObjCast = array_keys($queue[$i]);
$fromObjCast = array_keys(array_flip($fromObjCast)) !== $fromObjCast;
$refs = $vals = $fromObjCast ? array_values($queue[$i]) : $queue[$i];
foreach ($queue[$i] as $k => $v) {
// $k is the original key
// $v is the original value or a stub object in case of hard references
if ($k !== ++$j) {
$indexed = false;
}
if ($fromObjCast) {
$k = $j;
}
if ($useExt) {
$zval = symfony_zval_info($k, $refs);
} else {
$refs[$k] = $cookie;
if ($zval['zval_isref'] = $vals[$k] === $cookie) {
$zval['zval_hash'] = $v instanceof Stub ? spl_object_hash($v) : null;
$refs = $vals = $queue[$i];
if (\PHP_VERSION_ID < 70200 && empty($indexedArrays[$i])) {
// see https://wiki.php.net/rfc/convert_numeric_keys_in_object_array_casts
foreach ($vals as $k => $v) {
if (\is_int($k)) {
continue;
}
foreach (array($k => true) as $j => $v) {
}
if ($k !== $j) {
$fromObjCast = true;
$refs = $vals = \array_values($queue[$i]);
break;
}
$zval['type'] = gettype($v);
}
if ($zval['zval_isref']) {
}
foreach ($vals as $k => $v) {
// $v is the original value or a stub object in case of hard references
$refs[$k] = $cookie;
if ($zvalIsRef = $vals[$k] === $cookie) {
$vals[$k] = &$stub; // Break hard references to make $queue completely
unset($stub); // independent from the original structure
if (isset($hardRefs[$zval['zval_hash']])) {
$vals[$k] = $useExt ? ($v = $hardRefs[$zval['zval_hash']]) : ($refs[$k] = $v);
if ($v instanceof Stub && isset($hardRefs[\spl_object_hash($v)])) {
$vals[$k] = $refs[$k] = $v;
if ($v->value instanceof Stub && (Stub::TYPE_OBJECT === $v->value->type || Stub::TYPE_RESOURCE === $v->value->type)) {
++$v->value->refCount;
}
++$v->refCount;
continue;
}
$refs[$k] = $vals[$k] = new Stub();
$refs[$k]->value = $v;
$h = \spl_object_hash($refs[$k]);
$hardRefs[$h] = &$refs[$k];
$values[$h] = $v;
$vals[$k]->handle = ++$refsCounter;
}
// Create $stub when the original value $v can not be used directly
// If $v is a nested structure, put that structure in array $a
switch ($zval['type']) {
case 'string':
if (isset($v[0]) && !preg_match('//u', $v)) {
switch (true) {
case empty($v):
case true === $v:
case \is_int($v):
case \is_float($v):
break;
case \is_string($v):
if (!\preg_match('//u', $v)) {
$stub = new Stub();
$stub->type = Stub::TYPE_STRING;
$stub->class = Stub::STRING_BINARY;
if (0 <= $maxString && 0 < $cut = strlen($v) - $maxString) {
if (0 <= $maxString && 0 < $cut = \strlen($v) - $maxString) {
$stub->cut = $cut;
$stub->value = substr($v, 0, -$cut);
$stub->value = \substr($v, 0, -$cut);
} else {
$stub->value = $v;
}
} elseif (0 <= $maxString && isset($v[1 + ($maxString >> 2)]) && 0 < $cut = mb_strlen($v, 'UTF-8') - $maxString) {
} elseif (0 <= $maxString && isset($v[1 + ($maxString >> 2)]) && 0 < $cut = \mb_strlen($v, 'UTF-8') - $maxString) {
$stub = new Stub();
$stub->type = Stub::TYPE_STRING;
$stub->class = Stub::STRING_UTF8;
$stub->cut = $cut;
$stub->value = mb_substr($v, 0, $maxString, 'UTF-8');
$stub->value = \mb_substr($v, 0, $maxString, 'UTF-8');
}
break;
case 'integer':
break;
case \is_array($v):
$stub = $arrayStub;
$stub->class = Stub::ARRAY_INDEXED;
case 'array':
if ($v) {
$stub = $arrayRefs[$len] = new Stub();
$stub->type = Stub::TYPE_ARRAY;
$stub->class = Stub::ARRAY_ASSOC;
$j = -1;
foreach ($v as $gk => $gv) {
if ($gk !== ++$j) {
$stub->class = Stub::ARRAY_ASSOC;
break;
}
}
$a = $v;
if (Stub::ARRAY_ASSOC === $stub->class) {
// Copies of $GLOBALS have very strange behavior,
// let's detect them with some black magic
$a = $v;
$a[$gid] = true;
// Happens with copies of $GLOBALS
@ -149,19 +155,23 @@ class VarCloner extends AbstractCloner
foreach ($v as $gk => &$gv) {
$a[$gk] = &$gv;
}
unset($gv);
} else {
$a = $v;
}
$stub->value = $zval['array_count'] ?: count($a);
} else {
$indexedArrays[$len] = true;
}
$stub->value = \count($a);
break;
case 'object':
if (empty($objRefs[$h = $zval['object_handle'] ?: ($hashMask ^ hexdec(substr(spl_object_hash($v), $hashOffset, PHP_INT_SIZE)))])) {
case \is_object($v):
case $v instanceof \__PHP_Incomplete_Class:
if (empty($objRefs[$h = $hashMask ^ \hexdec(\substr(\spl_object_hash($v), $hashOffset, \PHP_INT_SIZE))])) {
$stub = new Stub();
$stub->type = Stub::TYPE_OBJECT;
$stub->class = $zval['object_class'] ?: get_class($v);
$stub->class = \get_class($v);
$stub->value = $v;
$stub->handle = $h;
$a = $this->castObject($stub, 0 < $i);
@ -169,18 +179,12 @@ class VarCloner extends AbstractCloner
if (Stub::TYPE_OBJECT !== $stub->type || null === $stub->value) {
break;
}
if ($useExt) {
$zval['type'] = $stub->value;
$zval = symfony_zval_info('type', $zval);
$h = $zval['object_handle'];
} else {
$h = $hashMask ^ hexdec(substr(spl_object_hash($stub->value), $hashOffset, PHP_INT_SIZE));
}
$h = $hashMask ^ \hexdec(\substr(\spl_object_hash($stub->value), $hashOffset, \PHP_INT_SIZE));
$stub->handle = $h;
}
$stub->value = null;
if (0 <= $maxItems && $maxItems <= $pos && $minimumDepthReached) {
$stub->cut = count($a);
$stub->cut = \count($a);
$a = null;
}
}
@ -193,13 +197,11 @@ class VarCloner extends AbstractCloner
}
break;
case 'resource':
case 'unknown type':
case 'resource (closed)':
default: // resource
if (empty($resRefs[$h = (int) $v])) {
$stub = new Stub();
$stub->type = Stub::TYPE_RESOURCE;
if ('Unknown' === $stub->class = $zval['resource_type'] ?: @get_resource_type($v)) {
if ('Unknown' === $stub->class = @\get_resource_type($v)) {
$stub->class = 'Closed';
}
$stub->value = $v;
@ -207,7 +209,7 @@ class VarCloner extends AbstractCloner
$a = $this->castResource($stub, 0 < $i);
$stub->value = null;
if (0 <= $maxItems && $maxItems <= $pos && $minimumDepthReached) {
$stub->cut = count($a);
$stub->cut = \count($a);
$a = null;
}
}
@ -222,66 +224,51 @@ class VarCloner extends AbstractCloner
}
if (isset($stub)) {
if ($zval['zval_isref']) {
if ($useExt) {
$vals[$k] = $hardRefs[$zval['zval_hash']] = $v = new Stub();
$v->value = $stub;
} else {
$refs[$k] = new Stub();
$refs[$k]->value = $stub;
$h = spl_object_hash($refs[$k]);
$vals[$k] = $hardRefs[$h] = &$refs[$k];
$values[$h] = $v;
if ($a) {
if (!$minimumDepthReached || 0 > $maxItems) {
$queue[$len] = $a;
$stub->position = $len++;
} elseif ($pos < $maxItems) {
if ($maxItems < $pos += \count($a)) {
$a = \array_slice($a, 0, $maxItems - $pos);
if ($stub->cut >= 0) {
$stub->cut += $pos - $maxItems;
}
}
$queue[$len] = $a;
$stub->position = $len++;
} elseif ($stub->cut >= 0) {
$stub->cut += \count($a);
$stub->position = 0;
}
$vals[$k]->handle = ++$refsCounter;
}
if ($arrayStub === $stub) {
if ($arrayStub->cut) {
$stub = array($arrayStub->cut, $arrayStub->class => $arrayStub->position);
$arrayStub->cut = 0;
} else {
$stub = array($arrayStub->class => $arrayStub->position);
}
}
if ($zvalIsRef) {
$refs[$k]->value = $stub;
} else {
$vals[$k] = $stub;
}
if ($a) {
if ($minimumDepthReached && 0 <= $maxItems) {
$k = count($a);
if ($pos < $maxItems) {
if ($maxItems < $pos += $k) {
$a = array_slice($a, 0, $maxItems - $pos);
if ($stub->cut >= 0) {
$stub->cut += $pos - $maxItems;
}
}
} else {
if ($stub->cut >= 0) {
$stub->cut += $k;
}
$stub = $a = null;
unset($arrayRefs[$len]);
continue;
}
}
$queue[$len] = $a;
$stub->position = $len++;
}
$stub = $a = null;
} elseif ($zval['zval_isref']) {
if ($useExt) {
$vals[$k] = $hardRefs[$zval['zval_hash']] = new Stub();
$vals[$k]->value = $v;
} else {
$refs[$k] = $vals[$k] = new Stub();
$refs[$k]->value = $v;
$h = spl_object_hash($refs[$k]);
$hardRefs[$h] = &$refs[$k];
$values[$h] = $v;
}
$vals[$k]->handle = ++$refsCounter;
}
}
if ($fromObjCast) {
$fromObjCast = false;
$refs = $vals;
$vals = array();
$j = -1;
foreach ($queue[$i] as $k => $v) {
foreach (array($k => $v) as $a => $v) {
foreach (array($k => true) as $a => $v) {
}
if ($a !== $k) {
$vals = (object) $vals;
@ -294,13 +281,7 @@ class VarCloner extends AbstractCloner
}
$queue[$i] = $vals;
if (isset($arrayRefs[$i])) {
if ($indexed) {
$arrayRefs[$i]->class = Stub::ARRAY_INDEXED;
}
unset($arrayRefs[$i]);
}
unset($indexedArrays[$i]);
}
foreach ($values as $h => $v) {

6
src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php
View File

@ -60,7 +60,7 @@ EODUMP;
$xDump = <<<'EODUMP'
Symfony\Component\VarDumper\Caster\ConstStub {
+type: "ref"
+type: 1
+class: "2017-08-30 00:00:00.000000 Europe/Zurich (+02:00)"
+value: """
Wednesday, August 30, 2017\n
@ -145,7 +145,7 @@ EODUMP;
$xDump = <<<EODUMP
Symfony\Component\VarDumper\Caster\ConstStub {
+type: "ref"
+type: 1
+class: "$xInterval"
+value: "$xSeconds"
+cut: 0
@ -249,7 +249,7 @@ EODUMP;
$xDump = <<<EODUMP
Symfony\Component\VarDumper\Caster\ConstStub {
+type: "ref"
+type: 1
+class: "$xTimezone"
+value: "$xRegion"
+cut: 0

176
src/Symfony/Component/VarDumper/Tests/Cloner/VarClonerTest.php
View File

@ -33,19 +33,9 @@ Symfony\Component\VarDumper\Cloner\Data Object
(
[0] => Array
(
[0] => Symfony\Component\VarDumper\Cloner\Stub Object
[0] => Array
(
[type] => array
[class] => assoc
[value] => 1
[cut] => 0
[handle] => 0
[refCount] => 0
[position] => 1
[attr] => Array
(
)
[1] => 1
)
)
@ -84,7 +74,7 @@ Symfony\Component\VarDumper\Cloner\Data Object
(
[0] => Symfony\Component\VarDumper\Cloner\Stub Object
(
[type] => object
[type] => 4
[class] => stdClass
[value] =>
[cut] => 0
@ -103,7 +93,7 @@ Symfony\Component\VarDumper\Cloner\Data Object
(
[\000+\0001] => Symfony\Component\VarDumper\Cloner\Stub Object
(
[type] => object
[type] => 4
[class] => stdClass
[value] =>
[cut] => 0
@ -118,7 +108,7 @@ Symfony\Component\VarDumper\Cloner\Data Object
[\000+\0002] => Symfony\Component\VarDumper\Cloner\Stub Object
(
[type] => object
[type] => 4
[class] => stdClass
[value] =>
[cut] => 0
@ -209,152 +199,65 @@ Symfony\Component\VarDumper\Cloner\Data Object
(
[0] => Array
(
[0] => Symfony\Component\VarDumper\Cloner\Stub Object
[0] => Array
(
[type] => array
[class] => indexed
[value] => 5
[cut] => 0
[handle] => 0
[refCount] => 0
[position] => 1
[attr] => Array
(
)
[2] => 1
)
)
[1] => Array
(
[0] => Symfony\Component\VarDumper\Cloner\Stub Object
[0] => Array
(
[type] => array
[class] => indexed
[value] => 3
[cut] => 0
[handle] => 0
[refCount] => 0
[position] => 2
[attr] => Array
(
)
[2] => 2
)
[1] => Symfony\Component\VarDumper\Cloner\Stub Object
[1] => Array
(
[type] => array
[class] => indexed
[value] => 2
[cut] => 0
[handle] => 0
[refCount] => 0
[position] => 3
[attr] => Array
(
)
[2] => 3
)
[2] => Symfony\Component\VarDumper\Cloner\Stub Object
[2] => Array
(
[type] => array
[class] => indexed
[value] => 1
[cut] => 0
[handle] => 0
[refCount] => 0
[position] => 4
[attr] => Array
(
)
[2] => 4
)
[3] => Level 1 Item 0
[4] => Symfony\Component\VarDumper\Cloner\Stub Object
[4] => Array
(
[type] => array
[class] => indexed
[value] => 2
[cut] => 0
[handle] => 0
[refCount] => 0
[position] => 5
[attr] => Array
(
)
[2] => 5
)
)
[2] => Array
(
[0] => Symfony\Component\VarDumper\Cloner\Stub Object
[0] => Array
(
[type] => array
[class] => indexed
[value] => 4
[cut] => 0
[handle] => 0
[refCount] => 0
[position] => 6
[attr] => Array
(
)
[2] => 6
)
[1] => Symfony\Component\VarDumper\Cloner\Stub Object
[1] => Array
(
[type] => array
[class] => indexed
[value] => 3
[cut] => 2
[handle] => 0
[refCount] => 0
[position] => 7
[attr] => Array
(
)
[0] => 2
[2] => 7
)
[2] => Symfony\Component\VarDumper\Cloner\Stub Object
[2] => Array
(
[type] => array
[class] => assoc
[value] => 1
[cut] => 1
[handle] => 0
[refCount] => 0
[position] => 0
[attr] => Array
(
)
[0] => 1
[2] => 0
)
)
[3] => Array
(
[0] => Symfony\Component\VarDumper\Cloner\Stub Object
[0] => Array
(
[type] => array
[class] => assoc
[value] => 1
[cut] => 1
[handle] => 0
[refCount] => 0
[position] => 0
[attr] => Array
(
)
[0] => 1
[2] => 0
)
[1] => Level 2 Item 0
@ -369,8 +272,8 @@ Symfony\Component\VarDumper\Cloner\Data Object
(
[0] => Symfony\Component\VarDumper\Cloner\Stub Object
(
[type] => string
[class] => utf8
[type] => 2
[class] => 2
[value] => ABCDEFGHIJKLMNOPQRST
[cut] => 6
[handle] => 0
@ -429,24 +332,9 @@ object(Symfony\Component\VarDumper\Cloner\Data)#%i (6) {
[0]=>
array(1) {
[0]=>
object(Symfony\Component\VarDumper\Cloner\Stub)#%i (8) {
["type"]=>
string(5) "array"
["class"]=>
string(5) "assoc"
["value"]=>
array(1) {
[1]=>
int(1)
["cut"]=>
int(0)
["handle"]=>
int(0)
["refCount"]=>
int(0)
["position"]=>
int(1)
["attr"]=>
array(0) {
}
}
}
[1]=>
@ -454,7 +342,7 @@ object(Symfony\Component\VarDumper\Cloner\Data)#%i (6) {
["1"]=>
object(Symfony\Component\VarDumper\Cloner\Stub)#%i (8) {
["type"]=>
string(6) "object"
int(4)
["class"]=>
string(8) "stdClass"
["value"]=>
@ -514,7 +402,7 @@ Symfony\Component\VarDumper\Cloner\Data Object
(
[0] => Symfony\Component\VarDumper\Cloner\Stub Object
(
[type] => object
[type] => 4
[class] => %s
[value] =>
[cut] => 0