diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/EntityChoiceListTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/EntityChoiceListTest.php index 3a2e9bba9f..ef42dcd4eb 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/EntityChoiceListTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/EntityChoiceListTest.php @@ -73,7 +73,7 @@ class EntityChoiceListTest extends DoctrineOrmTestCase * @expectedException Symfony\Component\Form\Exception\FormException * @expectedMessage Entity "Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIdentEntity" passed to the choice field must have a "__toString()" method defined (or you can also override the "property" option). */ - public function testEntitesMustHaveAToStringMethod() + public function testEntitiesMustHaveAToStringMethod() { $entity1 = new NoToStringSingleIdentEntity(1, 'Foo'); $entity2 = new NoToStringSingleIdentEntity(2, 'Bar'); diff --git a/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php b/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php index f90217be2d..8bc9b6aa4b 100644 --- a/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php +++ b/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php @@ -18,7 +18,7 @@ use Symfony\Component\Form\Exception\StringCastException; use Symfony\Component\Form\Extension\Core\ChoiceList\ObjectChoiceList; /** - * Widely inspirated by the EntityChoiceList. + * Widely inspired by the EntityChoiceList. * * @author William Durand */ @@ -369,7 +369,7 @@ class ModelChoiceList extends ObjectChoiceList * * @param ColumnMap $column * - * @return boolean + * @return Boolean */ private function isInteger(\ColumnMap $column) { diff --git a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php index daefeb4fd7..3d81e7cbe4 100644 --- a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php +++ b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php @@ -37,6 +37,7 @@ class ExceptionController /** * Converts an Exception to a Response. * + * @param Request $request The request * @param FlattenException $exception A FlattenException instance * @param DebugLoggerInterface $logger A DebugLoggerInterface instance * @param string $format The format to use for rendering (html, xml, ...) diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig index a83a15b351..b8853213f3 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig @@ -174,7 +174,7 @@ * * @param request the request object * @param max - * @param threshold the threshold (lower bound) of the length of the timeline (in miliseconds). + * @param threshold the threshold (lower bound) of the length of the timeline (in milliseconds). * @param width the width of the canvas. */ this.drawOne = function(request, max, threshold, width) diff --git a/src/Symfony/Component/Config/Definition/ReferenceDumper.php b/src/Symfony/Component/Config/Definition/ReferenceDumper.php index 18e0e1b227..3230c01931 100644 --- a/src/Symfony/Component/Config/Definition/ReferenceDumper.php +++ b/src/Symfony/Component/Config/Definition/ReferenceDumper.php @@ -38,7 +38,8 @@ class ReferenceDumper } /** - * @param int $depth + * @param NodeInterface $node + * @param integer $depth */ private function writeNode(NodeInterface $node, $depth = 0) { diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php index 8d2e769179..d03e843817 100644 --- a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php +++ b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php @@ -886,7 +886,7 @@ class FilesystemTest extends \PHPUnit_Framework_TestCase /** * Returns file permissions as three digits (i.e. 755) * - * @param string $filepath + * @param string $filePath * * @return integer */ diff --git a/src/Symfony/Component/Finder/Expression/Regex.php b/src/Symfony/Component/Finder/Expression/Regex.php index d8eba7c002..05544d0c81 100644 --- a/src/Symfony/Component/Finder/Expression/Regex.php +++ b/src/Symfony/Component/Finder/Expression/Regex.php @@ -273,7 +273,7 @@ class Regex implements ValueInterface } /** - * @param array $replacements + * @param array $replacement * * @return Regex */ diff --git a/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php b/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php index 6aa2da1122..8c4cac9796 100755 --- a/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php +++ b/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php @@ -165,12 +165,6 @@ class ValidatorTypeGuesser implements FormTypeGuesserInterface case 'Symfony\Component\Validator\Constraints\MaxCount': return new TypeGuess('collection', array(), Guess::LOW_CONFIDENCE); - case 'Symfony\Component\Validator\Constraints\Time': - return new TypeGuess('time', array('input'=>'string'), Guess::HIGH_CONFIDENCE); - - case 'Symfony\Component\Validator\Constraints\Url': - return new TypeGuess('url', array(), Guess::HIGH_CONFIDENCE); - case 'Symfony\Component\Validator\Constraints\True': case 'Symfony\Component\Validator\Constraints\False': return new TypeGuess('checkbox', array(), Guess::MEDIUM_CONFIDENCE); diff --git a/src/Symfony/Component/Locale/Tests/Stub/StubIntlDateFormatterTest.php b/src/Symfony/Component/Locale/Tests/Stub/StubIntlDateFormatterTest.php index f3411b63d4..28e6d5b5b3 100644 --- a/src/Symfony/Component/Locale/Tests/Stub/StubIntlDateFormatterTest.php +++ b/src/Symfony/Component/Locale/Tests/Stub/StubIntlDateFormatterTest.php @@ -866,7 +866,7 @@ class StubIntlDateFormatterTest extends LocaleTestCase public function parseErrorProvider() { - return array( + $data = array( // 1 char month array('y-MMMMM-d', '1970-J-1'), array('y-MMMMM-d', '1970-S-1'), diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php index f9cfd5bd89..73a9aa4fcb 100644 --- a/src/Symfony/Component/Process/Process.php +++ b/src/Symfony/Component/Process/Process.php @@ -692,13 +692,13 @@ class Process /** * Stops the process. * - * @param float $timeout The timeout in seconds + * @param integer $timeout The timeout in seconds * * @return integer The exit-code of the process * * @throws RuntimeException if the process got signaled */ - public function stop($timeout=10) + public function stop($timeout = 10) { $timeoutMicro = (int) $timeout*10E6; if ($this->isRunning()) { diff --git a/src/Symfony/Component/Routing/CHANGELOG.md b/src/Symfony/Component/Routing/CHANGELOG.md index fba7d41a40..af5f753306 100644 --- a/src/Symfony/Component/Routing/CHANGELOG.md +++ b/src/Symfony/Component/Routing/CHANGELOG.md @@ -70,7 +70,7 @@ CHANGELOG it disallows the slash (`/`) and the next char. Using the previous char added no value and was problematic because the route `/index.{_format}` would be matched by `/index.ht/ml`. - * The default requirement now uses possesive quantifiers when possible which + * The default requirement now uses possessive quantifiers when possible which improves matching performance by up to 20% because it prevents backtracking when it's not needed. * The ConfigurableRequirementsInterface can now also be used to disable the requirements diff --git a/src/Symfony/Component/Routing/Loader/YamlFileLoader.php b/src/Symfony/Component/Routing/Loader/YamlFileLoader.php index 7a5e268b27..4d91cd5cd3 100644 --- a/src/Symfony/Component/Routing/Loader/YamlFileLoader.php +++ b/src/Symfony/Component/Routing/Loader/YamlFileLoader.php @@ -145,7 +145,7 @@ class YamlFileLoader extends FileLoader * @param string $path The loaded file path * * @throws \InvalidArgumentException If one of the provided config keys is not supported, - * something is missing or the combination is nonesense + * something is missing or the combination is nonsense */ protected function validate($config, $name, $path) { @@ -154,7 +154,7 @@ class YamlFileLoader extends FileLoader } if ($extraKeys = array_diff(array_keys($config), self::$availableKeys)) { throw new \InvalidArgumentException(sprintf( - 'The routing file "%s" contains unsupport keys for "%s": "%s". Expected one of: "%s".', + 'The routing file "%s" contains unsupported keys for "%s": "%s". Expected one of: "%s".', $path, $name, implode('", "', $extraKeys), implode('", "', self::$availableKeys) )); } diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php index 586191439f..48ddbd7e20 100644 --- a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php +++ b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php @@ -100,7 +100,7 @@ EOF; } /** - * Generates PHP code recursively to match a RouteCollection with all child routes and child collections. + * Generates PHP code to match a RouteCollection with all its routes. * * @param RouteCollection $routes A RouteCollection instance * @param Boolean $supportsRedirections Whether redirections are supported by the base class @@ -143,9 +143,9 @@ EOF; /** * Generates PHP code recursively to match a tree of routes * - * @param DumperPrefixCollection $routes A DumperPrefixCollection instance + * @param DumperPrefixCollection $collection A DumperPrefixCollection instance * @param Boolean $supportsRedirections Whether redirections are supported by the base class - * @param string $prefix Prefix of the parent collection + * @param string $parentPrefix Prefix of the parent collection * * @return string PHP code */ @@ -323,9 +323,9 @@ EOF; /** * Groups consecutive routes having the same hostname regex. * - * The results is a collection of collections of routes having the same hostname regex. + * The result is a collection of collections of routes having the same hostname regex. * - * @param DumperCollection $routes Flat collection of DumperRoutes + * @param RouteCollection $routes A flat RouteCollection * * @return DumperCollection A collection with routes grouped by hostname regex in sub-collections */ @@ -354,7 +354,7 @@ EOF; * Organizes the routes into a prefix tree. * * Routes order is preserved such that traversing the tree will traverse the - * routes in the origin order + * routes in the origin order. * * @param DumperCollection $collection A collection of routes * diff --git a/src/Symfony/Component/Routing/Route.php b/src/Symfony/Component/Routing/Route.php index 59f203139c..241c8ef36e 100644 --- a/src/Symfony/Component/Routing/Route.php +++ b/src/Symfony/Component/Routing/Route.php @@ -389,7 +389,7 @@ class Route implements \Serializable /** * Checks if a requirement is set for the given key. * - * @param string $name A variable name + * @param string $key A variable name * * @return Boolean true if a requirement is specified, false otherwise */ diff --git a/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php index 42bad2df32..9f5597541b 100644 --- a/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php +++ b/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php @@ -98,7 +98,7 @@ class AnnotationClassLoaderTest extends AbstractAnnotationLoaderTest $this->reader ->expects($this->once()) ->method('getMethodAnnotations') - ->will($this->returnValue(array($this->getAnnotedRoute($routeDatas)))) + ->will($this->returnValue(array($this->getAnnotatedRoute($routeDatas)))) ; $routeCollection = $this->loader->load($className); $route = $routeCollection->get($routeDatas['name']); @@ -109,7 +109,7 @@ class AnnotationClassLoaderTest extends AbstractAnnotationLoaderTest $this->assertSame(array_replace($routeDatas['defaults'], $methodArgs), $route->getDefaults(), '->load preserves defaults annotation'); } - private function getAnnotedRoute($datas) + private function getAnnotatedRoute($datas) { return new \Symfony\Component\Routing\Annotation\Route($datas); } diff --git a/src/Symfony/Component/Routing/Tests/RouteCompilerTest.php b/src/Symfony/Component/Routing/Tests/RouteCompilerTest.php index 93321051a2..42d8976455 100644 --- a/src/Symfony/Component/Routing/Tests/RouteCompilerTest.php +++ b/src/Symfony/Component/Routing/Tests/RouteCompilerTest.php @@ -225,7 +225,7 @@ class RouteCompilerTest extends \PHPUnit_Framework_TestCase ), ), array( - 'Route with variable at begining of hostname', + 'Route with variable at beginning of hostname', array('/hello', array(), array(), array(), '{locale}.example.{tld}'), '/hello', '#^/hello$#s', array('locale', 'tld'), array(), array( array('text', '/hello'), diff --git a/src/Symfony/Component/Routing/Tests/RouteTest.php b/src/Symfony/Component/Routing/Tests/RouteTest.php index 1a11d7440e..c89ad5d830 100644 --- a/src/Symfony/Component/Routing/Tests/RouteTest.php +++ b/src/Symfony/Component/Routing/Tests/RouteTest.php @@ -36,7 +36,7 @@ class RouteTest extends \PHPUnit_Framework_TestCase $this->assertEquals('/bar', $route->getPattern(), '->setPattern() adds a / at the beginning of the pattern if needed'); $this->assertEquals($route, $route->setPattern(''), '->setPattern() implements a fluent interface'); $route->setPattern('//path'); - $this->assertEquals('/path', $route->getPattern(), '->setPattern() does not allow two slahes "//" at the beginning of the pattern as it would be confused with a network path when generating the path from the route'); + $this->assertEquals('/path', $route->getPattern(), '->setPattern() does not allow two slashes "//" at the beginning of the pattern as it would be confused with a network path when generating the path from the route'); } public function testOptions() diff --git a/src/Symfony/Component/Yaml/Dumper.php b/src/Symfony/Component/Yaml/Dumper.php index 220cb39742..7193127411 100644 --- a/src/Symfony/Component/Yaml/Dumper.php +++ b/src/Symfony/Component/Yaml/Dumper.php @@ -28,7 +28,7 @@ class Dumper /** * Sets the indentation. * - * @param integer $num The amount of spaces to use for intendation of nested nodes. + * @param integer $num The amount of spaces to use for indentation of nested nodes. */ public function setIndentation($num) {