From 0a12fd619e586cca9001abb8108544a8e6a19b0c Mon Sep 17 00:00:00 2001 From: Pascal Borreli Date: Sun, 21 Apr 2013 13:23:54 +0000 Subject: [PATCH] Fixed typos --- .../DependencyInjection/AbstractDoctrineExtension.php | 2 +- src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md | 2 +- src/Symfony/Component/HttpFoundation/Response.php | 2 +- src/Symfony/Component/HttpKernel/HttpCache/Store.php | 2 +- src/Symfony/Component/HttpKernel/HttpKernel.php | 2 +- .../Component/Intl/NumberFormatter/NumberFormatter.php | 2 +- src/Symfony/Component/Routing/Route.php | 2 +- .../Security/Core/Authentication/Token/AbstractToken.php | 4 ++-- .../Tests/Core/Authentication/Token/AbstractTokenTest.php | 4 ++-- src/Symfony/Component/Translation/Dumper/IniFileDumper.php | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php index 41b0af7b2a..331a465b2f 100644 --- a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php +++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php @@ -251,7 +251,7 @@ abstract class AbstractDoctrineExtension extends Extension 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/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md index 48dd3ee5e8..7dc591e560 100644 --- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md +++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md @@ -8,7 +8,7 @@ CHANGELOG * added possibility to load the serializer component in the service container * added route debug information when using the `router:match` command * added `TimedPhpEngine` - * added `--clean` option the the `translation:update` command + * added `--clean` option to the `translation:update` command * added `http_method_override` option * added support for default templates per render tag * added FormHelper::form(), FormHelper::start() and FormHelper::end() diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php index f6e6afed31..c4c5a53da6 100644 --- a/src/Symfony/Component/HttpFoundation/Response.php +++ b/src/Symfony/Component/HttpFoundation/Response.php @@ -684,7 +684,7 @@ class Response /** * 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 index 452b9dfe40..6143f0ba94 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/Store.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/Store.php @@ -265,7 +265,7 @@ class Store implements StoreInterface * @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) { diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php index 7a63171c7c..0001a49495 100644 --- a/src/Symfony/Component/HttpKernel/HttpKernel.php +++ b/src/Symfony/Component/HttpKernel/HttpKernel.php @@ -155,7 +155,7 @@ class HttpKernel implements HttpKernelInterface, TerminableInterface * Filters a response object. * * @param Response $response A Response instance - * @param Request $request A error message in case the response is not a Response object + * @param Request $request An error message in case the response is not a Response object * @param integer $type The type of the request (one of HttpKernelInterface::MASTER_REQUEST or HttpKernelInterface::SUB_REQUEST) * * @return Response The filtered Response instance diff --git a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php index 1d63948e31..0e5652e21e 100644 --- a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php +++ b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php @@ -725,7 +725,7 @@ class NumberFormatter } /** - * Returns the precision value if the the DECIMAL style is being used and the FRACTION_DIGITS attribute is unitialized. + * Returns the precision value if the DECIMAL style is being used and the FRACTION_DIGITS attribute is unitialized. * * @param integer|float $value The value to get the precision from if the FRACTION_DIGITS attribute is unitialized * @param int $precision The precision value to returns if the FRACTION_DIGITS attribute is initialized diff --git a/src/Symfony/Component/Routing/Route.php b/src/Symfony/Component/Routing/Route.php index a10d681c35..060e978116 100644 --- a/src/Symfony/Component/Routing/Route.php +++ b/src/Symfony/Component/Routing/Route.php @@ -358,7 +358,7 @@ class Route implements \Serializable } /** - * Checks if a an option has been set + * Checks if an option has been set * * @param string $name An option name * diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php index f21aa762fb..1d65819a43 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php @@ -91,7 +91,7 @@ abstract class AbstractToken implements TokenInterface public function setUser($user) { if (!($user instanceof UserInterface || (is_object($user) && method_exists($user, '__toString')) || is_string($user))) { - throw new \InvalidArgumentException('$user must be an instanceof of UserInterface, an object implementing a __toString method, or a primitive string.'); + throw new \InvalidArgumentException('$user must be an instanceof UserInterface, an object implementing a __toString method, or a primitive string.'); } if (null === $this->user) { @@ -190,7 +190,7 @@ abstract class AbstractToken implements TokenInterface } /** - * Returns a attribute value. + * Returns an attribute value. * * @param string $name The attribute name * diff --git a/src/Symfony/Component/Security/Tests/Core/Authentication/Token/AbstractTokenTest.php b/src/Symfony/Component/Security/Tests/Core/Authentication/Token/AbstractTokenTest.php index 4df6068106..783c27e1bb 100644 --- a/src/Symfony/Component/Security/Tests/Core/Authentication/Token/AbstractTokenTest.php +++ b/src/Symfony/Component/Security/Tests/Core/Authentication/Token/AbstractTokenTest.php @@ -116,9 +116,9 @@ class AbstractTokenTest extends \PHPUnit_Framework_TestCase $token->setAttributes($attributes); $this->assertEquals($attributes, $token->getAttributes(), '->getAttributes() returns the token attributes'); - $this->assertEquals('bar', $token->getAttribute('foo'), '->getAttribute() returns the value of a attribute'); + $this->assertEquals('bar', $token->getAttribute('foo'), '->getAttribute() returns the value of an attribute'); $token->setAttribute('foo', 'foo'); - $this->assertEquals('foo', $token->getAttribute('foo'), '->setAttribute() changes the value of a attribute'); + $this->assertEquals('foo', $token->getAttribute('foo'), '->setAttribute() changes the value of an attribute'); $this->assertTrue($token->hasAttribute('foo'), '->hasAttribute() returns true if the attribute is defined'); $this->assertFalse($token->hasAttribute('oof'), '->hasAttribute() returns false if the attribute is not defined'); diff --git a/src/Symfony/Component/Translation/Dumper/IniFileDumper.php b/src/Symfony/Component/Translation/Dumper/IniFileDumper.php index d808bdb2b4..173cf8c12d 100644 --- a/src/Symfony/Component/Translation/Dumper/IniFileDumper.php +++ b/src/Symfony/Component/Translation/Dumper/IniFileDumper.php @@ -14,7 +14,7 @@ namespace Symfony\Component\Translation\Dumper; use Symfony\Component\Translation\MessageCatalogue; /** - * IniFileDumper generates a ini formatted string representation of a message catalogue. + * IniFileDumper generates an ini formatted string representation of a message catalogue. * * @author Stealth35 */