merged branch pborreli/sun-typos (PR #5858)

This PR was merged into the master branch.

Commits
-------

a7ce6be Fixed typos

Discussion
----------

Fixed typos
This commit is contained in:
Fabien Potencier 2012-10-29 08:15:24 +01:00
commit ba1592568f
10 changed files with 13 additions and 13 deletions

View File

@ -264,9 +264,9 @@ class DialogHelper extends Helper
return self::$stty;
}
exec('/usr/bin/env stty', $output, $exicode);
exec('/usr/bin/env stty', $output, $exitcode);
return self::$stty = $exicode === 0;
return self::$stty = $exitcode === 0;
}
/**

View File

@ -598,7 +598,7 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
$inputDefinition = $application->getDefinition();
// check wether the default arguments and options are not returned any more
// check whether the default arguments and options are not returned any more
$this->assertFalse($inputDefinition->hasArgument('command'));
$this->assertFalse($inputDefinition->hasOption('help'));
@ -622,7 +622,7 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
$inputDefinition = $application->getDefinition();
// check wether the default arguments and options are not returned any more
// check whether the default arguments and options are not returned any more
$this->assertFalse($inputDefinition->hasArgument('command'));
$this->assertFalse($inputDefinition->hasOption('help'));

View File

@ -258,7 +258,7 @@ class ChoiceFormFieldTest extends FormFieldTestCase
$node = $this->createNode('input', '', array('type' => 'checkbox', 'name' => 'name', 'checked' => 'checked'));
$field = new ChoiceFormField($node);
$field->untick();
$this->assertNull($field->getValue(), '->untick() unticks checkoxes');
$this->assertNull($field->getValue(), '->untick() unticks checkboxes');
}
public function testSelect()

View File

@ -282,7 +282,7 @@ class FormTest extends \PHPUnit_Framework_TestCase
{
$form = $this->createForm('<form><select multiple="multiple" name="multi"><option value="foo">foo</option><option value="bar">bar</option></select><input type="submit" /></form>');
$form->setValues(array('multi' => array("foo", "bar")));
$this->assertEquals(array('multi' => array('foo', 'bar')), $form->getValues(), '->setValue() sets tehe values of select');
$this->assertEquals(array('multi' => array('foo', 'bar')), $form->getValues(), '->setValue() sets the values of select');
}
public function testGetPhpValues()

View File

@ -230,7 +230,7 @@ class GnuFindAdapter extends AbstractAdapter
if (0 > $mins) {
// mtime is in the future
$command->add(' -mmin -0');
// we will have no result so we dont need to continue
// we will have no result so we don't need to continue
return;
}

View File

@ -528,7 +528,7 @@ class FinderTest extends Iterator\RealIteratorTestCase
/**
* Searching in multiple locations involves AppendIterator which does an unnecessary rewind which leaves FilterIterator
* with inner FilesystemIterator in an ivalid state.
* with inner FilesystemIterator in an invalid state.
*
* @see https://bugs.php.net/bug.php?id=49104
*

View File

@ -141,7 +141,7 @@ class CollectionTypeTest extends TypeTestCase
$this->assertTrue($form->createView()->vars['multipart']);
}
public function testGetDataDoesNotContainsProtypeNameBeforeDataAreSet()
public function testGetDataDoesNotContainsPrototypeNameBeforeDataAreSet()
{
$form = $this->factory->create('collection', array(), array(
'type' => 'file',

View File

@ -1097,7 +1097,7 @@ class Response
}
/**
* Is the reponse forbidden?
* Is the response forbidden?
*
* @return Boolean
*

View File

@ -240,7 +240,7 @@ class UrlMatcherTest extends \PHPUnit_Framework_TestCase
$matcher = new UrlMatcher($coll, new RequestContext());
// 'w' eagerly matches as much as possible and the other variables match the remaining chars.
// This also shows that the variables w-z must all exclude the separating char (the dot '.' in this case) by default requirement.
// Otherwise they would also comsume '.xml' and _format would never match as it's an optional variable.
// Otherwise they would also consume '.xml' and _format would never match as it's an optional variable.
$this->assertEquals(array('w' => 'wwwww', 'x' => 'x', 'y' => 'Y', 'z' => 'Z','_format' => 'xml', '_route' => 'test'), $matcher->match('/wwwwwxYZ.xml'));
// As 'y' has custom requirement and can only be of value 'y|Y', it will leave 'ZZZ' to variable z.
// So with carefully chosen requirements adjacent variables, can be useful.

View File

@ -151,13 +151,13 @@ class RegexValidatorTest extends \PHPUnit_Framework_TestCase
));
$this->assertNull($constraint->getHtmlPattern());
// Automaticaly converted
// Automatically converted
$constraint = new Regex(array(
'pattern' => '/^[a-z]+$/',
));
$this->assertEquals('[a-z]+', $constraint->getHtmlPattern());
// Automaticaly converted, adds .*
// Automatically converted, adds .*
$constraint = new Regex(array(
'pattern' => '/[a-z]+/',
));