merged branch jbafford/doubled-word-fixes (PR symfony#8144)

fabpot · fabpot · commit d52d9aeba099 · 2013-05-27T08:45:55.000+02:00
This PR was merged into the 2.1 branch. Discussion ---------- Fix several instances of doubled words | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a One correction to an exception; the rest in docblocks. Commits ------- 52fed7b Fix several instances of doubled words
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
@@ -242,7 +242,7 @@ protected function assertValidMappingConfiguration(array $mappingConfig, $object
         if (!in_array($mappingConfig['type'], array('xml', 'yml', 'annotation', 'php', 'staticphp'))) {
             throw new \InvalidArgumentException(sprintf('Can only configure "xml", "yml", "annotation", "php" or '.
                 '"staticphp" through the DoctrineBundle. Use your own bundle to configure other metadata drivers. '.
-                'You can register them by adding a a new driver to the '.
+                'You can register them by adding a new driver to the '.
                 '"%s" service definition.', $this->getObjectManagerElementName($objectManagerName.'.metadata_driver')
             ));
         }
diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatter.php b/src/Symfony/Component/Console/Formatter/OutputFormatter.php
@@ -239,7 +239,7 @@ private function createStyleFromString($string)
      *
      * @param string $text Input text
      *
-     * @return string string Styled text
+     * @return string Styled text
      */
     private function applyCurrentStyle($text)
     {
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
@@ -690,7 +690,7 @@ public function setExpires(\DateTime $date = null)
 
     /**
      * Returns the number of seconds after the time specified in the response's Date
-     * header when the the response should no longer be considered fresh.
+     * header when the response should no longer be considered fresh.
      *
      * First, it checks for a s-maxage directive, then a max-age directive, and then it falls
      * back on an expires header. It returns null when no maximum age can be established.
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Store.php b/src/Symfony/Component/HttpKernel/HttpCache/Store.php
@@ -241,7 +241,7 @@ public function invalidate(Request $request)
      * @param array  $env1 A Request HTTP header array
      * @param array  $env2 A Request HTTP header array
      *
-     * @return Boolean true if the the two environments match, false otherwise
+     * @return Boolean true if the two environments match, false otherwise
      */
     private function requestsMatch($vary, $env1, $env2)
     {

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ protected function assertValidMappingConfiguration(array $mappingConfig, $object`
`242`	`242`	`if (!in_array($mappingConfig['type'], array('xml', 'yml', 'annotation', 'php', 'staticphp'))) {`
`243`	`243`	`throw new \InvalidArgumentException(sprintf('Can only configure "xml", "yml", "annotation", "php" or '.`
`244`	`244`	`'"staticphp" through the DoctrineBundle. Use your own bundle to configure other metadata drivers. '.`
`245`		`- 'You can register them by adding a a new driver to the '.`
	`245`	`+ 'You can register them by adding a new driver to the '.`
`246`	`246`	`'"%s" service definition.', $this->getObjectManagerElementName($objectManagerName.'.metadata_driver')`
`247`	`247`	`));`
`248`	`248`	`}`
Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ private function createStyleFromString($string)`
`239`	`239`	`*`
`240`	`240`	`* @param string $text Input text`
`241`	`241`	`*`
`242`		`- * @return string string Styled text`
	`242`	`+ * @return string Styled text`
`243`	`243`	`*/`
`244`	`244`	`private function applyCurrentStyle($text)`
`245`	`245`	`{`
Original file line number	Diff line number	Diff line change
`@@ -690,7 +690,7 @@ public function setExpires(\DateTime $date = null)`
`690`	`690`
`691`	`691`	`/**`
`692`	`692`	`* Returns the number of seconds after the time specified in the response's Date`
`693`		`- * header when the the response should no longer be considered fresh.`
	`693`	`+ * header when the response should no longer be considered fresh.`
`694`	`694`	`*`
`695`	`695`	`* First, it checks for a s-maxage directive, then a max-age directive, and then it falls`
`696`	`696`	`* back on an expires header. It returns null when no maximum age can be established.`
Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ public function invalidate(Request $request)`
`241`	`241`	`* @param array $env1 A Request HTTP header array`
`242`	`242`	`* @param array $env2 A Request HTTP header array`
`243`	`243`	`*`
`244`		`- * @return Boolean true if the the two environments match, false otherwise`
	`244`	`+ * @return Boolean true if the two environments match, false otherwise`
`245`	`245`	`*/`
`246`	`246`	`private function requestsMatch($vary, $env1, $env2)`
`247`	`247`	`{`