diff --git a/src/Symfony/Component/Finder/Shell/Command.php b/src/Symfony/Component/Finder/Shell/Command.php index 14111797ed..0c4a3118cf 100644 --- a/src/Symfony/Component/Finder/Shell/Command.php +++ b/src/Symfony/Component/Finder/Shell/Command.php @@ -198,7 +198,7 @@ class Command public function end() { if (null === $this->parent) { - throw new \RuntimeException('Calling end on root command dont makes sense.'); + throw new \RuntimeException('Calling end on root command doesn\'t make sense.'); } return $this->parent; diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php index ad44f15d35..eb93637877 100644 --- a/src/Symfony/Component/Form/Form.php +++ b/src/Symfony/Component/Form/Form.php @@ -542,7 +542,7 @@ class Form implements \IteratorAggregate, FormInterface } // Check whether the form is compound. - // This check is preferrable over checking the number of children, + // This check is preferable over checking the number of children, // since forms without children may also be compound. // (think of empty collection forms) if ($this->config->getCompound()) { @@ -837,7 +837,7 @@ class Form implements \IteratorAggregate, FormInterface */ public function getChildren() { - trigger_error('getChilren() is deprecated since version 2.1 and will be removed in 2.3. Use all() instead.', E_USER_DEPRECATED); + trigger_error('getChildren() is deprecated since version 2.1 and will be removed in 2.3. Use all() instead.', E_USER_DEPRECATED); return $this->all(); } diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php index 3b5d1448a0..e145a7e698 100644 --- a/src/Symfony/Component/HttpFoundation/Request.php +++ b/src/Symfony/Component/HttpFoundation/Request.php @@ -572,7 +572,7 @@ class Request * Be warned that enabling this feature might lead to CSRF issues in your code. * Check that you are using CSRF tokens when required. * - * The HTTP method can only be overriden when the real HTTP method is POST. + * The HTTP method can only be overridden when the real HTTP method is POST. */ public static function enableHttpMethodParameterOverride() { @@ -722,7 +722,7 @@ class Request * * * http://localhost/mysite returns an empty string * * http://localhost/mysite/about returns '/about' - * * htpp://localhost/mysite/enco%20ded returns '/enco%20ded' + * * http://localhost/mysite/enco%20ded returns '/enco%20ded' * * http://localhost/mysite/about?var=1 returns '/about' * * @return string The raw path (i.e. not urldecoded) diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php index 6f158cd1b7..7fbfd0a479 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php @@ -13,7 +13,7 @@ namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler; use Symfony\Component\HttpFoundation\Session\Storage\Handler\MemcachedSessionHandler; -class MemcacheddSessionHandlerTest extends \PHPUnit_Framework_TestCase +class MemcachedSessionHandlerTest extends \PHPUnit_Framework_TestCase { const PREFIX = 'prefix_'; const TTL = 1000;