diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php index cfce587c68..96ac9eb87b 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php @@ -151,7 +151,7 @@ EOF if ((null !== $name) && ($optionsCount > 0)) { throw new \InvalidArgumentException('The options tags, tag, parameters & parameter can not be combined with the service name argument.'); } elseif ((null === $name) && $optionsCount > 1) { - throw new \InvalidArgumentException('The options tags, tag, parameters & parameter can not be combied together.'); + throw new \InvalidArgumentException('The options tags, tag, parameters & parameter can not be combined together.'); } } diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SubRequestController.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SubRequestController.php index 14d002642b..598ecc0833 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SubRequestController.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SubRequestController.php @@ -30,7 +30,7 @@ class SubRequestController extends ContainerAware $content = $handler->render($errorUrl, 'inline', array('alt' => $altUrl)); // ...to check that the FragmentListener still references the right Request - // when rendering another fragment after the error occured + // when rendering another fragment after the error occurred // should render en/html instead of fr/json $content .= $handler->render(new ControllerReference('TestBundle:SubRequest:fragment')); diff --git a/src/Symfony/Component/Validator/Constraints/IsbnValidator.php b/src/Symfony/Component/Validator/Constraints/IsbnValidator.php index c33184fcc7..62a3b0388e 100644 --- a/src/Symfony/Component/Validator/Constraints/IsbnValidator.php +++ b/src/Symfony/Component/Validator/Constraints/IsbnValidator.php @@ -16,7 +16,7 @@ use Symfony\Component\Validator\ConstraintValidator; use Symfony\Component\Validator\Exception\UnexpectedTypeException; /** - * Validates wether the value is a valid ISBN-10 or ISBN-13. + * Validates whether the value is a valid ISBN-10 or ISBN-13. * * @author The Whole Life To Learn *