Merge branch '2.6' into 2.7

fabpot · fabpot · commit 7a6f881c7604 · 2015-03-27T11:22:45.000+01:00
* 2.6:
  CS: fixes
  Translator component has default domain for null implemented no need to have default translation domain logic in 3 different places
  [Form] [TwigBridge] Bootstrap layout whitespace control
  [travis] Kill tests when a new commit has been pushed
  fixed CS
  Change behavior to mirror hash_equals() returning early if there is a length mismatch
  CS fixing
  Prevent modifying secrets as much as possible
  Update StringUtils.php
  Whitespace
  Update StringUtils.php
  StringUtils::equals() arguments in RememberMe Cookie based implementation are confused
  CS: general fixes
  [SecurityBundle] removed a duplicated service definition and simplified others.

Conflicts:
	src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
diff --git a/Dumper/PhpDumper.php b/Dumper/PhpDumper.php
@@ -826,7 +826,7 @@ private function startClass($class, $baseClass, $namespace)
 $bagClass
 
 /**
- * $class
+ * $class.
  *
  * This class has been auto-generated
  * by the Symfony Dependency Injection Component.
diff --git a/Tests/Fixtures/php/services1-1.php b/Tests/Fixtures/php/services1-1.php
@@ -10,7 +10,7 @@
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
 /**
- * Container
+ * Container.
  *
  * This class has been auto-generated
  * by the Symfony Dependency Injection Component.
diff --git a/Tests/Fixtures/php/services1.php b/Tests/Fixtures/php/services1.php
@@ -9,7 +9,7 @@
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
 /**
- * ProjectServiceContainer
+ * ProjectServiceContainer.
  *
  * This class has been auto-generated
  * by the Symfony Dependency Injection Component.
diff --git a/Tests/Fixtures/php/services10.php b/Tests/Fixtures/php/services10.php
@@ -9,7 +9,7 @@
 use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
 
 /**
- * ProjectServiceContainer
+ * ProjectServiceContainer.
  *
  * This class has been auto-generated
  * by the Symfony Dependency Injection Component.
diff --git a/Tests/Fixtures/php/services12.php b/Tests/Fixtures/php/services12.php
@@ -9,7 +9,7 @@
 use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
 
 /**
- * ProjectServiceContainer
+ * ProjectServiceContainer.
  *
  * This class has been auto-generated
  * by the Symfony Dependency Injection Component.
diff --git a/Tests/Fixtures/php/services8.php b/Tests/Fixtures/php/services8.php
@@ -9,7 +9,7 @@
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
 /**
- * ProjectServiceContainer
+ * ProjectServiceContainer.
  *
  * This class has been auto-generated
  * by the Symfony Dependency Injection Component.
diff --git a/Tests/Fixtures/php/services9.php b/Tests/Fixtures/php/services9.php
@@ -9,7 +9,7 @@
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
 /**
- * ProjectServiceContainer
+ * ProjectServiceContainer.
  *
  * This class has been auto-generated
  * by the Symfony Dependency Injection Component.
diff --git a/Tests/Fixtures/php/services9_compiled.php b/Tests/Fixtures/php/services9_compiled.php
@@ -9,7 +9,7 @@
 use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
 
 /**
- * ProjectServiceContainer
+ * ProjectServiceContainer.
  *
  * This class has been auto-generated
  * by the Symfony Dependency Injection Component.

Original file line number	Diff line number	Diff line change
`@@ -826,7 +826,7 @@ private function startClass($class, $baseClass, $namespace)`
`826`	`826`	`$bagClass`
`827`	`827`
`828`	`828`	`/**`
`829`		`- * $class`
	`829`	`+ * $class.`
`830`	`830`	`*`
`831`	`831`	`* This class has been auto-generated`
`832`	`832`	`* by the Symfony Dependency Injection Component.`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;`
`11`	`11`
`12`	`12`	`/**`
`13`		`- * Container`
	`13`	`+ * Container.`
`14`	`14`	`*`
`15`	`15`	`* This class has been auto-generated`
`16`	`16`	`* by the Symfony Dependency Injection Component.`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;`
`10`	`10`
`11`	`11`	`/**`
`12`		`- * ProjectServiceContainer`
	`12`	`+ * ProjectServiceContainer.`
`13`	`13`	`*`
`14`	`14`	`* This class has been auto-generated`
`15`	`15`	`* by the Symfony Dependency Injection Component.`