diff --git a/src/Symfony/Bundle/DoctrineAbstractBundle/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bundle/DoctrineAbstractBundle/DependencyInjection/AbstractDoctrineExtension.php
index d1589399f8771..a248ba92f34fb 100644
--- a/src/Symfony/Bundle/DoctrineAbstractBundle/DependencyInjection/AbstractDoctrineExtension.php
+++ b/src/Symfony/Bundle/DoctrineAbstractBundle/DependencyInjection/AbstractDoctrineExtension.php
@@ -127,7 +127,7 @@ protected function setMappingDriverAlias($mappingConfig, $mappingName)
}
/**
- * Registter the mapping driver configuration for later use with the object managers metadata driver chain.
+ * Register the mapping driver configuration for later use with the object managers metadata driver chain.
*
* @param array $mappingConfig
* @param string $mappingName
@@ -298,7 +298,7 @@ protected function detectMetadataDriver($dir, ContainerBuilder $container)
}
/**
- * Prefixes the relative dependency injenction container path with the object manager prefix.
+ * Prefixes the relative dependency injection container path with the object manager prefix.
*
* @example $name is 'entity_manager' then the result would be 'doctrine.orm.entity_manager'
*
diff --git a/src/Symfony/Bundle/DoctrineBundle/CacheWarmer/ProxyCacheWarmer.php b/src/Symfony/Bundle/DoctrineBundle/CacheWarmer/ProxyCacheWarmer.php
index 1577ff3dd9294..8dc06639c18c1 100644
--- a/src/Symfony/Bundle/DoctrineBundle/CacheWarmer/ProxyCacheWarmer.php
+++ b/src/Symfony/Bundle/DoctrineBundle/CacheWarmer/ProxyCacheWarmer.php
@@ -38,7 +38,7 @@ public function __construct(Container $container)
}
/**
- * This cache warmer is not optional, without proxies fatal error occour!
+ * This cache warmer is not optional, without proxies fatal error occurs!
*
* @return false
*/
diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/GenerateEntitiesDoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/GenerateEntitiesDoctrineCommand.php
index 275f770d17333..c78b10a00fff8 100644
--- a/src/Symfony/Bundle/DoctrineBundle/Command/GenerateEntitiesDoctrineCommand.php
+++ b/src/Symfony/Bundle/DoctrineBundle/Command/GenerateEntitiesDoctrineCommand.php
@@ -43,7 +43,7 @@ protected function configure()
./app/console doctrine:generate:entities "MyCustomBundle" --entity="User"
-You have to specifiy the shortname (without namespace) of the entity you want to filter for.
+You have to specify the shortname (without namespace) of the entity you want to filter for.
EOT
);
}
@@ -66,7 +66,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
if (strpos($metadata->name, $foundBundle->getNamespace()) === false) {
throw new \RuntimeException(
- "Entity " . $metadata->name . " and bundle don't have a commont namespace, ".
+ "Entity " . $metadata->name . " and bundle don't have a common namespace, ".
"generation failed because the target directory cannot be detected.");
}
diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/GenerateRepositoriesDoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/GenerateRepositoriesDoctrineCommand.php
index 226137c9a90f8..7877de430fc42 100644
--- a/src/Symfony/Bundle/DoctrineBundle/Command/GenerateRepositoriesDoctrineCommand.php
+++ b/src/Symfony/Bundle/DoctrineBundle/Command/GenerateRepositoriesDoctrineCommand.php
@@ -60,7 +60,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
if ($metadata->customRepositoryClassName) {
if (strpos($metadata->customRepositoryClassName, $foundBundle->getName()) === false) {
throw new \RuntimeException(
- "Repository " . $metadata->customRepositoryClassName . " and bundle don't have a commont namespace, ".
+ "Repository " . $metadata->customRepositoryClassName . " and bundle don't have a common namespace, ".
"generation failed because the target directory cannot be detected.");
}
diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/RunDqlDoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/RunDqlDoctrineCommand.php
index d9eca99ef2f4d..a305f02bf53d6 100644
--- a/src/Symfony/Bundle/DoctrineBundle/Command/RunDqlDoctrineCommand.php
+++ b/src/Symfony/Bundle/DoctrineBundle/Command/RunDqlDoctrineCommand.php
@@ -42,7 +42,7 @@ protected function configure()
./app/console doctrine:query:dql "SELECT u FROM UserBundle:User u" --hydrate=array
-Additionaly you can specify the first result and maximum amount of results to show:
+Additionally you can specify the first result and maximum amount of results to show:
./app/console doctrine:query:dql "SELECT u FROM UserBundle:User u" --first-result=0 --max-result=30
EOT
diff --git a/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php b/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
index b6029828af106..af1341dd347af 100755
--- a/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
+++ b/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
@@ -108,7 +108,7 @@ protected function mergeDbalConfig(array $configs, $container)
'wrapper-class' => 'wrapperClass', // doctrine conv.
'charset' => 'charset',
);
- $supportedContrainerParams = array(
+ $supportedContainerParams = array(
'platform-service' => 'platform_service',
'platform_service' => 'platform_service',
'logging' => 'logging',
@@ -173,8 +173,8 @@ protected function mergeDbalConfig(array $configs, $container)
foreach ($connection as $k => $v) {
if (isset($supportedConnectionParams[$k])) {
$mergedConfig['connections'][$connectionName]['driver'][$supportedConnectionParams[$k]] = $v;
- } else if (isset($supportedContrainerParams[$k])) {
- $mergedConfig['connections'][$connectionName]['container'][$supportedContrainerParams[$k]] = $v;
+ } else if (isset($supportedContainerParams[$k])) {
+ $mergedConfig['connections'][$connectionName]['container'][$supportedContainerParams[$k]] = $v;
}
}
}
@@ -447,8 +447,8 @@ protected function loadOrmEntityManager(array $entityManager, ContainerBuilder $
*
* There are two distinct configuration possibilities for mapping information:
*
- * 1. Specifiy a bundle and optionally details where the entity and mapping information reside.
- * 2. Specifiy an arbitrary mapping location.
+ * 1. Specify a bundle and optionally details where the entity and mapping information reside.
+ * 2. Specify an arbitrary mapping location.
*
* @example
*
diff --git a/src/Symfony/Bundle/DoctrineBundle/Tests/CacheWarmer/ProxyCacheWarmerTest.php b/src/Symfony/Bundle/DoctrineBundle/Tests/CacheWarmer/ProxyCacheWarmerTest.php
index 802a60800b184..aba2dd53dca0f 100644
--- a/src/Symfony/Bundle/DoctrineBundle/Tests/CacheWarmer/ProxyCacheWarmerTest.php
+++ b/src/Symfony/Bundle/DoctrineBundle/Tests/CacheWarmer/ProxyCacheWarmerTest.php
@@ -16,7 +16,7 @@
class ProxyCacheWarmerTest extends \Symfony\Bundle\DoctrineBundle\Tests\TestCase
{
/**
- * This is not necessarily a good test, it doesnt generate any proxies
+ * This is not necessarily a good test, it doesn't generate any proxies
* because there are none in the AnnotationsBundle. However that is
* rather a task of doctrine to test. We touch the lines here and
* verify that the container is called correctly for the relevant information.
diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/CacheWarmer/HydratorCacheWarmer.php b/src/Symfony/Bundle/DoctrineMongoDBBundle/CacheWarmer/HydratorCacheWarmer.php
index 4cdbd446f0c15..830c4db7776c7 100644
--- a/src/Symfony/Bundle/DoctrineMongoDBBundle/CacheWarmer/HydratorCacheWarmer.php
+++ b/src/Symfony/Bundle/DoctrineMongoDBBundle/CacheWarmer/HydratorCacheWarmer.php
@@ -39,7 +39,7 @@ public function __construct(Container $container)
}
/**
- * This cache warmer is not optional, without hydrators fatal error occour!
+ * This cache warmer is not optional, without hydrators fatal error occurs!
*
* @return false
*/
diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/CacheWarmer/ProxyCacheWarmer.php b/src/Symfony/Bundle/DoctrineMongoDBBundle/CacheWarmer/ProxyCacheWarmer.php
index f8648c251a9d7..9f11f482d24ce 100644
--- a/src/Symfony/Bundle/DoctrineMongoDBBundle/CacheWarmer/ProxyCacheWarmer.php
+++ b/src/Symfony/Bundle/DoctrineMongoDBBundle/CacheWarmer/ProxyCacheWarmer.php
@@ -39,7 +39,7 @@ public function __construct(Container $container)
}
/**
- * This cache warmer is not optional, without proxies fatal error occour!
+ * This cache warmer is not optional, without proxies fatal error occurs!
*
* @return false
*/
diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/Command/GenerateDocumentsDoctrineODMCommand.php b/src/Symfony/Bundle/DoctrineMongoDBBundle/Command/GenerateDocumentsDoctrineODMCommand.php
index 915385da5acd9..7eece24e66375 100644
--- a/src/Symfony/Bundle/DoctrineMongoDBBundle/Command/GenerateDocumentsDoctrineODMCommand.php
+++ b/src/Symfony/Bundle/DoctrineMongoDBBundle/Command/GenerateDocumentsDoctrineODMCommand.php
@@ -43,7 +43,7 @@ protected function configure()
./app/console doctrine:generate:documents "MyCustomBundle" --document="User"
-You have to specifiy the shortname (without namespace) of the document you want to filter for.
+You have to specify the shortname (without namespace) of the document you want to filter for.
EOT
);
}
@@ -66,7 +66,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
if (strpos($metadata->name, $foundBundle->getNamespace()) === false) {
throw new \RuntimeException(
- "Document " . $metadata->name . " and bundle don't have a commont namespace, ".
+ "Document " . $metadata->name . " and bundle don't have a common namespace, ".
"generation failed because the target directory cannot be detected.");
}
diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/Command/GenerateRepositoriesDoctrineODMCommand.php b/src/Symfony/Bundle/DoctrineMongoDBBundle/Command/GenerateRepositoriesDoctrineODMCommand.php
index 72ec006fe7d32..e753bf7678e11 100644
--- a/src/Symfony/Bundle/DoctrineMongoDBBundle/Command/GenerateRepositoriesDoctrineODMCommand.php
+++ b/src/Symfony/Bundle/DoctrineMongoDBBundle/Command/GenerateRepositoriesDoctrineODMCommand.php
@@ -60,7 +60,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
if ($metadata->customRepositoryClassName) {
if (strpos($metadata->customRepositoryClassName, $foundBundle->getName()) === false) {
throw new \RuntimeException(
- "Repository " . $metadata->customRepositoryClassName . " and bundle don't have a commont namespace, ".
+ "Repository " . $metadata->customRepositoryClassName . " and bundle don't have a common namespace, ".
"generation failed because the target directory cannot be detected.");
}
diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/DependencyInjection/DoctrineMongoDBExtension.php b/src/Symfony/Bundle/DoctrineMongoDBBundle/DependencyInjection/DoctrineMongoDBExtension.php
index dcea9dea9ece0..4703ad5582234 100644
--- a/src/Symfony/Bundle/DoctrineMongoDBBundle/DependencyInjection/DoctrineMongoDBExtension.php
+++ b/src/Symfony/Bundle/DoctrineMongoDBBundle/DependencyInjection/DoctrineMongoDBExtension.php
@@ -299,8 +299,8 @@ protected function getConnections(array $config, ContainerBuilder $container)
*
* There are two distinct configuration possibilities for mapping information:
*
- * 1. Specifiy a bundle and optionally details where the entity and mapping information reside.
- * 2. Specifiy an arbitrary mapping location.
+ * 1. Specify a bundle and optionally details where the entity and mapping information reside.
+ * 2. Specify an arbitrary mapping location.
*
* @example
*
diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/CacheWarmer/ProxyCacheWarmerTest.php b/src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/CacheWarmer/ProxyCacheWarmerTest.php
index 0c75ae63d9289..7c5dfaf340cff 100644
--- a/src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/CacheWarmer/ProxyCacheWarmerTest.php
+++ b/src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/CacheWarmer/ProxyCacheWarmerTest.php
@@ -16,7 +16,7 @@
class ProxyCacheWarmerTest extends \Symfony\Bundle\DoctrineMongoDBBundle\Tests\TestCase
{
/**
- * This is not necessarily a good test, it doesnt generate any proxies
+ * This is not necessarily a good test, it doesn't generate any proxies
* because there are none in the AnnotationsBundle. However that is
* rather a task of doctrine to test. We touch the lines here and
* verify that the container is called correctly for the relevant information.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php
index c68c0ef87c583..3b472b80a5f0c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php
@@ -43,7 +43,7 @@ public function __construct(KernelInterface $kernel, LoggerInterface $logger = n
*
* @param string $controller A short notation controller (a:b:c)
*
- * @param string A controler (class::method)
+ * @param string A controller (class::method)
*/
public function parse($controller)
{
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 1d8dac0b97c80..4bed906a8369a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -365,7 +365,7 @@ private function registerTemplatingConfiguration(array $config, ContainerBuilder
$container->setParameter('templating.engines', $config['engines']);
$engines = array_map(function($engine) { return new Reference('templating.engine.'.$engine); }, $config['engines']);
- // Use a deligation unless only a single engine was registered
+ // Use a delegation unless only a single engine was registered
if (1 === count($engines)) {
$container->setAlias('templating', (string) reset($engines));
} else {
diff --git a/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php b/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
index 2923903658fc0..5710ec89bbdb6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
+++ b/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
@@ -41,7 +41,7 @@ public function __construct(HttpKernelInterface $kernel)
/**
* Forwards the Request to the backend and returns the Response.
*
- * @param Requset $request A Request instance
+ * @param Request $request A Request instance
* @param Boolean $raw Whether to catch exceptions or not
* @param Response $response A Response instance (the stale entry if present, null otherwise)
*
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/ConfigurationTest.php
index c5a6d50b16f74..7757043ee2bae 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/ConfigurationTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -48,6 +48,6 @@ public function testMainConfigTreeWithFactories()
$config = $processor->process($tree, array($config));
$this->assertFalse(array_key_exists('factory', $config), 'The factory key is silently removed without an exception');
- $this->assertEquals(array(), $config['factories'], 'The factories key is jsut an empty array');
+ $this->assertEquals(array(), $config['factories'], 'The factories key is just an empty array');
}
}
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/TwigEngineTest.php b/src/Symfony/Bundle/TwigBundle/Tests/TwigEngineTest.php
index aecc643abe779..3aa61758aa816 100644
--- a/src/Symfony/Bundle/TwigBundle/Tests/TwigEngineTest.php
+++ b/src/Symfony/Bundle/TwigBundle/Tests/TwigEngineTest.php
@@ -40,7 +40,7 @@ public function testEvalutateAddsAppGlobal()
$this->assertSame($app, $globals['app']);
}
- public function testEvalutateWithoutAvailableRequest()
+ public function testEvaluateWithoutAvailableRequest()
{
$environment = $this->getTwigEnvironment();
$container = new Container();
diff --git a/src/Symfony/Component/Config/Definition/ArrayNode.php b/src/Symfony/Component/Config/Definition/ArrayNode.php
index 8fef7ade45c8f..87a7b820992c3 100644
--- a/src/Symfony/Component/Config/Definition/ArrayNode.php
+++ b/src/Symfony/Component/Config/Definition/ArrayNode.php
@@ -238,7 +238,7 @@ public function getDefaultValue()
* Sets the node prototype.
*
* @param PrototypeNodeInterface $node
- * @throws \RuntimeException if the node doesnt have concrete children
+ * @throws \RuntimeException if the node doesn't have concrete children
*/
public function setPrototype(PrototypeNodeInterface $node)
{
@@ -279,7 +279,7 @@ public function addChild(NodeInterface $node)
* @param mixed $value
* @return mixed The finalised value
* @throws UnsetKeyException
- * @throws InvalidConfigurationException if the node doesnt have enough children
+ * @throws InvalidConfigurationException if the node doesn't have enough children
*/
protected function finalizeValue($value)
{
diff --git a/src/Symfony/Component/Config/Definition/BaseNode.php b/src/Symfony/Component/Config/Definition/BaseNode.php
index 5c58e9278a3fd..43ff3f4df9c47 100644
--- a/src/Symfony/Component/Config/Definition/BaseNode.php
+++ b/src/Symfony/Component/Config/Definition/BaseNode.php
@@ -53,7 +53,7 @@ public function __construct($name, NodeInterface $parent = null)
}
/**
- * Adds an equivilent value.
+ * Adds an equivalent value.
*
* @param mixed $originalValue
* @param mixed $equivalentValue
@@ -173,7 +173,8 @@ public final function merge($leftSide, $rightSide)
* Normalizes a value, applying all normalization closures.
*
* @param mixed $value Value to normalize.
- * @return mied The normalized value.
+ *
+ * @return mixed The normalized value.
*/
public final function normalize($value)
{
diff --git a/src/Symfony/Component/Config/Definition/Builder/MergeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/MergeBuilder.php
index 2dbb9204f3f3c..e05d3c2e619cc 100644
--- a/src/Symfony/Component/Config/Definition/Builder/MergeBuilder.php
+++ b/src/Symfony/Component/Config/Definition/Builder/MergeBuilder.php
@@ -1,73 +1,73 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Config\Definition\Builder;
-
-/**
- * This class builds merge conditions.
- *
- * @author Johannes M. Schmitt
- */
-class MergeBuilder
-{
- public $parent;
- public $allowFalse;
- public $allowOverwrite;
-
- /**
- * Constructor
- *
- * @param Symfony\Component\Config\Definition\Builder\NodeBuilder $parent The parent node
- */
- public function __construct($parent)
- {
- $this->parent = $parent;
- $this->allowFalse = false;
- $this->allowOverwrite = true;
- }
-
- /**
- * Sets whether the node can be unset.
- *
- * @param boolean $allow
- * @return Symfony\Component\Config\Definition\Builder\MergeBuilder
- */
- public function allowUnset($allow = true)
- {
- $this->allowFalse = $allow;
-
- return $this;
- }
-
- /**
- * Sets whether the node can be overwritten.
- *
- * @param boolean $deny Whether the overwritting is forbidden or not
- *
- * @return Symfony\Component\Config\Definition\Builder\MergeBuilder
- */
- public function denyOverwrite($deny = true)
- {
- $this->allowOverwrite = !$deny;
-
- return $this;
- }
-
- /**
- * Returns the parent node.
- *
- * @return Symfony\Component\Config\Definition\Builder\NodeBuilder
- */
- public function end()
- {
- return $this->parent;
- }
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Definition\Builder;
+
+/**
+ * This class builds merge conditions.
+ *
+ * @author Johannes M. Schmitt
+ */
+class MergeBuilder
+{
+ public $parent;
+ public $allowFalse;
+ public $allowOverwrite;
+
+ /**
+ * Constructor
+ *
+ * @param Symfony\Component\Config\Definition\Builder\NodeBuilder $parent The parent node
+ */
+ public function __construct($parent)
+ {
+ $this->parent = $parent;
+ $this->allowFalse = false;
+ $this->allowOverwrite = true;
+ }
+
+ /**
+ * Sets whether the node can be unset.
+ *
+ * @param boolean $allow
+ * @return Symfony\Component\Config\Definition\Builder\MergeBuilder
+ */
+ public function allowUnset($allow = true)
+ {
+ $this->allowFalse = $allow;
+
+ return $this;
+ }
+
+ /**
+ * Sets whether the node can be overwritten.
+ *
+ * @param boolean $deny Whether the overwriting is forbidden or not
+ *
+ * @return Symfony\Component\Config\Definition\Builder\MergeBuilder
+ */
+ public function denyOverwrite($deny = true)
+ {
+ $this->allowOverwrite = !$deny;
+
+ return $this;
+ }
+
+ /**
+ * Returns the parent node.
+ *
+ * @return Symfony\Component\Config\Definition\Builder\NodeBuilder
+ */
+ public function end()
+ {
+ return $this->parent;
+ }
}
\ No newline at end of file
diff --git a/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php
index 38de5f226b6ca..c7044dc9f3b52 100644
--- a/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php
+++ b/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php
@@ -399,7 +399,7 @@ protected function merge()
/**
* Sets whether the node can be overwritten.
*
- * @param boolean $deny Whether the overwritting is forbidden or not
+ * @param boolean $deny Whether the overwriting is forbidden or not
*
* @return Symfony\Component\Config\Definition\Builder\NodeBuilder
*/
diff --git a/src/Symfony/Component/Config/FileLocator.php b/src/Symfony/Component/Config/FileLocator.php
index 916cf19e77922..b0bd5f9963558 100644
--- a/src/Symfony/Component/Config/FileLocator.php
+++ b/src/Symfony/Component/Config/FileLocator.php
@@ -38,7 +38,7 @@ public function __construct($paths = array())
*
* @param mixed $name The file name to locate
* @param string $currentPath The current path
- * @param Boolean $first Wether to return the first occurence or an array of filenames
+ * @param Boolean $first Whether to return the first occurrence or an array of filenames
*
* @return string|array The full path to the file|An array of file paths
*
diff --git a/src/Symfony/Component/Config/FileLocatorInterface.php b/src/Symfony/Component/Config/FileLocatorInterface.php
index aa0c7d0f48338..91d4b1d675a7c 100644
--- a/src/Symfony/Component/Config/FileLocatorInterface.php
+++ b/src/Symfony/Component/Config/FileLocatorInterface.php
@@ -21,7 +21,7 @@ interface FileLocatorInterface
*
* @param mixed $name The file name to locate
* @param string $currentPath The current path
- * @param Boolean $first Wether to return the first occurence or an array of filenames
+ * @param Boolean $first Whether to return the first occurrence or an array of filenames
*
* @return string|array The full path to the file|An array of file paths
*
diff --git a/src/Symfony/Component/CssSelector/XPathExpr.php b/src/Symfony/Component/CssSelector/XPathExpr.php
index 264c9ac0a3168..5a1926e140e92 100644
--- a/src/Symfony/Component/CssSelector/XPathExpr.php
+++ b/src/Symfony/Component/CssSelector/XPathExpr.php
@@ -122,7 +122,7 @@ public function __toString()
/**
* Adds a condition to this XPath expression.
- * Any pre-existant condition will be ANDed to it.
+ * Any pre-existent condition will be ANDed to it.
*
* @param string $condition The condition to add.
*/
@@ -137,7 +137,7 @@ public function addCondition($condition)
/**
* Adds a prefix to this XPath expression.
- * It will be prepended to any pre-existant prefixes.
+ * It will be prepended to any pre-existent prefixes.
*
* @param string $prefix The prefix to add.
*/
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
index a72c0c777fae1..99d4c0bbf8c2e 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
@@ -53,7 +53,7 @@ public function process(ContainerBuilder $container)
}
/**
- * Updates references to remove aliasess.
+ * Updates references to remove aliases.
*
* @param ContainerBuilder $container The container
* @param string $currentId The alias identifier being replaced
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php
index 0e9fa5a1ce6f6..e240f1c4a90a1 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php
@@ -224,7 +224,8 @@ protected function addAttributes($attributes)
* Adds options
*
* @param array $options An array of options
- * @return string A space seperated list of options
+ *
+ * @return string A space separated list of options
*/
protected function addOptions($options)
{
diff --git a/src/Symfony/Component/DependencyInjection/InterfaceInjector.php b/src/Symfony/Component/DependencyInjection/InterfaceInjector.php
index 6299150d3503c..c0ac7529821f3 100755
--- a/src/Symfony/Component/DependencyInjection/InterfaceInjector.php
+++ b/src/Symfony/Component/DependencyInjection/InterfaceInjector.php
@@ -25,7 +25,7 @@ class InterfaceInjector
protected $processedDefinitions = array();
/**
- * Contructs interface injector by specifying the target class name
+ * Constructs interface injector by specifying the target class name
*
* @param string $class
*/
diff --git a/src/Symfony/Component/EventDispatcher/Event.php b/src/Symfony/Component/EventDispatcher/Event.php
index 5577788dd9ee8..eab166f962768 100644
--- a/src/Symfony/Component/EventDispatcher/Event.php
+++ b/src/Symfony/Component/EventDispatcher/Event.php
@@ -61,7 +61,7 @@ public function getName()
* Sets the processed flag to true.
*
* This method must be called by listeners when
- * it has processed the event (it is only meaninful
+ * it has processed the event (it is only meaningful
* when the event has been notified with the notifyUntil()
* dispatcher method.
*/
diff --git a/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php b/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php
index 1b2f7f5d46ed8..6addeb4926eac 100644
--- a/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php
+++ b/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php
@@ -54,7 +54,7 @@ function notify(EventInterface $event);
* A listener tells the dispatcher that it has processed the event
* by calling the setProcessed() method on it.
*
- * It can then return a value that will be fowarded to the caller.
+ * It can then return a value that will be forwarded to the caller.
*
* @param EventInterface $event An EventInterface instance
*
diff --git a/src/Symfony/Component/EventDispatcher/EventInterface.php b/src/Symfony/Component/EventDispatcher/EventInterface.php
index 4c7057a768660..963e6a830bf4e 100644
--- a/src/Symfony/Component/EventDispatcher/EventInterface.php
+++ b/src/Symfony/Component/EventDispatcher/EventInterface.php
@@ -36,7 +36,7 @@ function getName();
* Sets the processed flag to true.
*
* This method must be called by listeners when
- * it has processed the event (it is only meaninful
+ * it has processed the event (it is only meaningful
* when the event has been notified with the notifyUntil()
* dispatcher method.
*/
diff --git a/src/Symfony/Component/Form/EntityChoiceField.php b/src/Symfony/Component/Form/EntityChoiceField.php
index e60af98ddfdf5..73cbc52477775 100644
--- a/src/Symfony/Component/Form/EntityChoiceField.php
+++ b/src/Symfony/Component/Form/EntityChoiceField.php
@@ -283,7 +283,7 @@ protected function getEntities()
* Returns the entity for the given key
*
* If the underlying entities have composite identifiers, the choices
- * are intialized. The key is expected to be the index in the choices
+ * are initialized. The key is expected to be the index in the choices
* array in this case.
*
* If they have single identifiers, they are either fetched from the
@@ -320,7 +320,7 @@ protected function getEntity($key)
* underlying class
*
* @param string $property The name of the property
- * @return \ReflectionProperty The reflection instsance
+ * @return \ReflectionProperty The reflection instance
*/
protected function getReflProperty($property)
{
diff --git a/src/Symfony/Component/HttpFoundation/File/File.php b/src/Symfony/Component/HttpFoundation/File/File.php
index 50464ea2a3759..306764f932617 100644
--- a/src/Symfony/Component/HttpFoundation/File/File.php
+++ b/src/Symfony/Component/HttpFoundation/File/File.php
@@ -85,7 +85,7 @@ class File
'application/vnd.curl' => 'curl',
'application/vnd.data-vision.rdz' => 'rdz',
'application/vnd.dreamfactory' => 'dfac',
- 'application/vnd.fsc.weblauch' => 'fsc',
+ 'application/vnd.fsc.weblaunch' => 'fsc',
'application/vnd.genomatix.tuxedo' => 'txd',
'application/vnd.hbci' => 'hbci',
'application/vnd.hhe.lesson-player' => 'les',
diff --git a/src/Symfony/Component/HttpKernel/Bundle/Bundle.php b/src/Symfony/Component/HttpKernel/Bundle/Bundle.php
index 890431c4482c6..fb535613a52f3 100644
--- a/src/Symfony/Component/HttpKernel/Bundle/Bundle.php
+++ b/src/Symfony/Component/HttpKernel/Bundle/Bundle.php
@@ -54,7 +54,7 @@ public function shutdown()
* is forced to be the underscore version of the bundle name
* (sensio_blog for a SensioBlogBundle for instance).
*
- * This method can be overriden to register compilation passes,
+ * This method can be overridden to register compilation passes,
* other extensions, ...
*
* @param ContainerBuilder $container A ContainerBuilder instance
diff --git a/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php b/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
index 40bd0676ee92c..c45a597decded 100644
--- a/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
+++ b/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
@@ -466,7 +466,7 @@ protected function hydrateObjectIdentities(Statement $stmt, array $oidLookup, ar
}
/**
- * Constructs the query used for looking up object identites and associated
+ * Constructs the query used for looking up object identities and associated
* ACEs, and security identities.
*
* @param array $batch
diff --git a/src/Symfony/Component/Security/Acl/Model/ObjectIdentityRetrievalStrategyInterface.php b/src/Symfony/Component/Security/Acl/Model/ObjectIdentityRetrievalStrategyInterface.php
index 26f77e47cd5b2..551cb466e9b13 100644
--- a/src/Symfony/Component/Security/Acl/Model/ObjectIdentityRetrievalStrategyInterface.php
+++ b/src/Symfony/Component/Security/Acl/Model/ObjectIdentityRetrievalStrategyInterface.php
@@ -19,7 +19,7 @@
interface ObjectIdentityRetrievalStrategyInterface
{
/**
- * Retrievies the object identity from a domain object
+ * Retrieves the object identity from a domain object
*
* @param object $domainObject
* @return ObjectIdentityInterface
diff --git a/src/Symfony/Component/Security/Acl/Model/PermissionGrantingStrategyInterface.php b/src/Symfony/Component/Security/Acl/Model/PermissionGrantingStrategyInterface.php
index 800874ec15c21..3108e687db0ac 100644
--- a/src/Symfony/Component/Security/Acl/Model/PermissionGrantingStrategyInterface.php
+++ b/src/Symfony/Component/Security/Acl/Model/PermissionGrantingStrategyInterface.php
@@ -36,8 +36,8 @@ function isGranted(AclInterface $acl, array $masks, array $sids, $administrative
* @param string $field
* @param array $masks
* @param array $sids
- * @param Boolean $adminstrativeMode
+ * @param Boolean $administrativeMode
* @return Boolean
*/
- function isFieldGranted(AclInterface $acl, $field, array $masks, array $sids, $adminstrativeMode = false);
+ function isFieldGranted(AclInterface $acl, $field, array $masks, array $sids, $administrativeMode = false);
}
\ No newline at end of file
diff --git a/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php b/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php
index 4df51f0ed0ee0..3adc1be544a09 100644
--- a/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php
@@ -29,7 +29,7 @@
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
/**
- * SwitchUserListener allows a user to impersonate another one temporarly
+ * SwitchUserListener allows a user to impersonate another one temporarily
* (like the Unix su command).
*
* @author Fabien Potencier
diff --git a/src/Symfony/Component/Security/Http/Logout/CookieClearingLogoutHandler.php b/src/Symfony/Component/Security/Http/Logout/CookieClearingLogoutHandler.php
index 91fdc3d758f42..e4673afec1850 100644
--- a/src/Symfony/Component/Security/Http/Logout/CookieClearingLogoutHandler.php
+++ b/src/Symfony/Component/Security/Http/Logout/CookieClearingLogoutHandler.php
@@ -16,7 +16,7 @@
use Symfony\Component\HttpFoundation\Request;
/**
- * This handler cleares the passed cookies when a user logs out.
+ * This handler clears the passed cookies when a user logs out.
*
* @author Johannes M. Schmitt
*/