Merge branch '2.7' into 2.8

* 2.7: [DI] Make dumped docblocks less verbose

Author: nicolas-grekas

src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php

@@ -565,7 +565,7 @@ private function addService($id, Definition $definition)
  if ($definition->isSynthetic()) {
  $return[] = '@throws RuntimeException always since this service is expected to be injected dynamically';
  } elseif ($class = $definition->getClass()) {
- $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)) {
@@ -601,40 +601,14 @@ private function addService($id, Definition $definition)
 
  $return = str_replace("\n * \n", "\n *\n", implode("\n * ", $return));
 
- $doc = '';
- if ($definition->isShared() && ContainerInterface::SCOPE_PROTOTYPE !== $scope) {
- $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() && ContainerInterface::SCOPE_PROTOTYPE !== $scope ? ' 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
@@ -643,8 +617,8 @@ private function addService($id, Definition $definition)
  $code = <<<EOF
 
  /*{$this->docStar}
- * Gets the '$id' service.$doc
- *$lazyInitializationDoc
+ * Gets the $public '$id'$shared$autowired service.
+ *
  * $return
  */
  {$visibility} function get{$this->camelize($id)}Service($lazyInitialization)

src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php

@@ -263,7 +263,7 @@ public function testDumpAutowireData()
  $container = include self::$fixturesPath.'/containers/container24.php';
  $dumper = new PhpDumper($container);
 
- $this->assertEquals(file_get_contents(self::$fixturesPath.'/php/services24.php'), $dumper->dump());
+ $this->assertStringEqualsFile(self::$fixturesPath.'/php/services24.php', $dumper->dump());
  }
 
  public function testInlinedDefinitionReferencingServiceContainer()

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php

@@ -55,12 +55,9 @@ public function isFrozen()
  }
 
  /**
- * 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()
  {

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php

@@ -59,12 +59,9 @@ public function isFrozen()
  }
 
  /**
- * 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()
  {

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php

@@ -53,12 +53,9 @@ public function isFrozen()
  }
 
  /**
- * 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()
  {

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php

@@ -32,25 +32,19 @@ public function __construct()
  }
 
  /**
- * 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()
  {
  return $this->services['service_from_anonymous_factory'] = call_user_func(array(new \Bar\FooClass(), 'getInstance'));
  }
 
  /**
- * Gets the 'service_with_method_call_and_factory' service.
- *
- * This service is shared.
- * This method always returns the same instance of the service.
+ * Gets the public 'service_with_method_call_and_factory' shared service.
  *
- * @return \Bar\FooClass A Bar\FooClass instance
+ * @return \Bar\FooClass
  */
  protected function getServiceWithMethodCallAndFactoryService()
  {

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services20.php

@@ -32,12 +32,9 @@ public function __construct()
  }
 
  /**
- * Gets the 'depends_on_request' service.
+ * Gets the public 'depends_on_request' 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 getDependsOnRequestService()
  {
@@ -49,12 +46,9 @@ protected function getDependsOnRequestService()
  }
 
  /**
- * Gets the 'request' service.
- *
- * This service is shared.
- * This method always returns the same instance of the service.
+ * Gets the public 'request' shared service.
  *
- * @return \Request A Request instance
+ * @return \Request
  */
  protected function getRequestService()
  {

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php

@@ -31,14 +31,9 @@ public function __construct()
  }
 
  /**
- * 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()
  {