Merge branch '2.6' into 2.7

nicolas-grekas · nicolas-grekas · commit 9d373af7ca70 · 2015-05-12T17:01:57.000+02:00
* 2.6:
  [travis] Use container-based infrastructure
  [PropertyAccess] Fix setting public property on a class having a magic getter
  ContainerInterface: unused exception dropped

Conflicts:
	.travis.yml
diff --git a/Container.php b/Container.php
@@ -259,7 +259,6 @@ public function has($id)
      *
      * @return object The associated service
      *
-     * @throws InvalidArgumentException          if the service is not defined
      * @throws ServiceCircularReferenceException When a circular reference is detected
      * @throws ServiceNotFoundException          When the service is not defined
      * @throws \Exception                        if an exception has been thrown when the service has been resolved
diff --git a/ContainerInterface.php b/ContainerInterface.php
@@ -50,7 +50,6 @@ public function set($id, $service, $scope = self::SCOPE_CONTAINER);
      *
      * @return object The associated service
      *
-     * @throws InvalidArgumentException          if the service is not defined
      * @throws ServiceCircularReferenceException When a circular reference is detected
      * @throws ServiceNotFoundException          When the service is not defined
      *

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,6 @@ public function has($id)`
`259`	`259`	`*`
`260`	`260`	`* @return object The associated service`
`261`	`261`	`*`
`262`		`- * @throws InvalidArgumentException if the service is not defined`
`263`	`262`	`* @throws ServiceCircularReferenceException When a circular reference is detected`
`264`	`263`	`* @throws ServiceNotFoundException When the service is not defined`
`265`	`264`	`* @throws \Exception if an exception has been thrown when the service has been resolved`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,6 @@ public function set($id, $service, $scope = self::SCOPE_CONTAINER);`
`50`	`50`	`*`
`51`	`51`	`* @return object The associated service`
`52`	`52`	`*`
`53`		`- * @throws InvalidArgumentException if the service is not defined`
`54`	`53`	`* @throws ServiceCircularReferenceException When a circular reference is detected`
`55`	`54`	`* @throws ServiceNotFoundException When the service is not defined`
`56`	`55`	`*`