diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged branch pborreli/typos-isbn (PR #7761) 

This PR was merged into the master branch.

Discussion
----------

Fixed typos

Sorry for the multiple PRs

Commits
-------

6ef7f10 Fixed typos
This commit is contained in:
Fabien Potencier 2013-04-21 13:21:42 +02:00
parent a4abfb9550 6ef7f10628
commit 39dfbf682c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
View File

@ -151,7 +151,7 @@ EOF
if ((null !== $name) && ($optionsCount > 0)) { if ((null !== $name) && ($optionsCount > 0)) {
throw new \InvalidArgumentException('The options tags, tag, parameters & parameter can not be combined with the service name argument.'); throw new \InvalidArgumentException('The options tags, tag, parameters & parameter can not be combined with the service name argument.');
} elseif ((null === $name) && $optionsCount > 1) { } 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.');
} }
} }

2
src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SubRequestController.php
View File

@ -30,7 +30,7 @@ class SubRequestController extends ContainerAware
$content = $handler->render($errorUrl, 'inline', array('alt' => $altUrl)); $content = $handler->render($errorUrl, 'inline', array('alt' => $altUrl));
// ...to check that the FragmentListener still references the right Request // ...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 // should render en/html instead of fr/json
$content .= $handler->render(new ControllerReference('TestBundle:SubRequest:fragment')); $content .= $handler->render(new ControllerReference('TestBundle:SubRequest:fragment'));

2
src/Symfony/Component/Validator/Constraints/IsbnValidator.php
View File

@ -16,7 +16,7 @@ use Symfony\Component\Validator\ConstraintValidator;
use Symfony\Component\Validator\Exception\UnexpectedTypeException; 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 <thewholelifetolearn@gmail.com> * @author The Whole Life To Learn <thewholelifetolearn@gmail.com>
* *