8000 minor #29712 Fixed minor typos (javiereguiluz) · symfony/symfony@042f604 · GitHub
[go: up one dir, main page]
Skip to content

Commit 042f604

Browse files
ogizanagiogizanagi
committed
minor #29712 Fixed minor typos (javiereguiluz)
This PR was merged into the 3.4 branch. Discussion ---------- Fixed minor typos | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no <!-- don't forget to update src/**/CHANGELOG.md files --> | BC breaks? | no <!-- see https://symfony.com/bc --> | Deprecations? | no <!-- don't forget to update UPGRADE-*.md and src/**/CHANGELOG.md files --> | Tests pass? | yes <!-- please add some, will be required by reviewers --> | Fixed tickets | - <!-- #-prefixed issue number(s), if any --> | License | MIT | Doc PR | - Commits ------- 9b400bc Fixed minor typos
2 parents 7448d85 + 9b400bc commit 042f604

File tree

8 files changed

+14
-14
lines changed

8 files changed

+14
-14
lines changed

‎src/Symfony/Bridge/Doctrine/RegistryInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function getEntityManagers();
5252
* it makes sense to get a new one to replace the closed one.
5353
*
5454
* Be warned that you will get a brand new entity manager as
55-
* the existing one is not useable anymore. This means that any
55+
* the existing one is not usable anymore. This means that any
5656
* other object with a dependency on this entity manager will
5757
* hold an obsolete reference. You can inject the registry instead
5858
* to avoid this problem.

‎src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function testFixManagersAutoMappingsWithTwoAutomappings()
6464
);
6565

6666
$bundles = array(
67-
'FristBundle' => 'My\FristBundle',
67+
'FirstBundle' => 'My\FirstBundle',
6868
'SecondBundle' => 'My\SecondBundle',
6969
);
7070

@@ -98,7 +98,7 @@ public function getAutomappingData()
9898
array(),
9999
array(
100100
'mappings' => array(
101-
'FristBundle' => array(
101+
'FirstBundle' => array(
102102
'mapping' => true,
103103
'is_bundle' => true,
104104
),
@@ -132,7 +132,7 @@ public function getAutomappingData()
132132
),
133133
array(
134134
'mappings' => array(
135-
'FristBundle' => array(
135+
'FirstBundle' => array(
136136
'mapping' => true,
137137
'is_bundle' => true,
138138
),
@@ -153,7 +153,7 @@ public function testFixManagersAutoMappings(array $originalEm1, array $originalE
153153
);
154154

155155
$bundles = array(
156-
'FristBundle' => 'My\FristBundle',
156+
'FirstBundle' => 'My\FirstBundle',
157157
'SecondBundle' => 'My\SecondBundle',
158158
);
159159

‎src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line 8000 numberDiff line change
@@ -595,7 +595,7 @@ private function parseDefinition($id, $service, $file, array $defaults)
595595
* @param string $id A service identifier
596596
* @param string $file A parsed file
597597
*
598-
* @throws InvalidArgumentException When errors are occuried
598+
* @throws InvalidArgumentException When errors occur
599599
*
600600
* @return string|array A parsed callable
601601
*/

‎src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function process(ContainerBuilder $container)
6363
* @param array $patterns The class patterns to expand
6464
* @param array $classes The existing classes to match against the patterns
6565
*
66-
* @return array A list of classes derivated from the patterns
66+
* @return array A list of classes derived from the patterns
6767
*/
6868
private function expandClasses(array $patterns, array $classes)
6969
{

‎src/Symfony/Component/Translation/Catalogue/TargetOperation.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ protected function processDomain($domain)
3737
// For 'all' messages, the code can't be simplified as ``$this->messages[$domain]['all'] = $target->all($domain);``,
3838
// because doing so will drop messages like {x: x ∈ source ∧ x ∉ target.all ∧ x ∈ target.fallback}
3939
//
40-
// For 'new' messages, the code can't be simplied as ``array_diff_assoc($this->target->all($domain), $this->source->all($domain));``
40+
// For 'new' messages, the code can't be simplified as ``array_diff_assoc($this->target->all($domain), $this->source->all($domain));``
4141
// because doing so will not exclude messages like {x: x ∈ target ∧ x ∉ source.all ∧ x ∈ source.fallback}
4242
//
43-
// For 'obsolete' messages, the code can't be simplifed as ``array_diff_assoc($this->source->all($domain), $this->target->all($domain))``
43+
// For 'obsolete' messages, the code can't be simplified as ``array_diff_assoc($this->source->all($domain), $this->target->all($domain))``
4444
// because doing so will not exclude messages like {x: x ∈ source ∧ x ∉ target.all ∧ x ∈ target.fallback}
4545

4646
foreach ($this->source->all($domain) as $id => $message) {

‎src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public function testDifferentTranslatorsForSameLocaleDoNotOverwriteEachOthersCac
123123
{
124124
/*
125125
* Similar to the previous test. After we used the second translator, make
126-
* sure there's still a useable cache for the first one.
126+
* sure there's still a usable cache for the first one.
127127
*/
128128

129129
$locale = 'any_locale';
@@ -142,7 +142,7 @@ public function testDifferentTranslatorsForSameLocaleDoNotOverwriteEachOthersCac
142142
$translator->addResource($format, array($msgid => 'FAIL'), $locale);
143143
$translator->trans($msgid);
144144

145-
// Now the first translator must still have a useable cache.
145+
// Now the first translator must still have a usable cache.
146146
$translator = new Translator($locale, null, $this->tmpDir, $debug);
147147
$translator->addLoader($format, $this->createFailingLoader());
148148
$translator->addResource($format, array($msgid => 'OK'), $locale);

‎src/Symfony/Component/Translation/TranslatorInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function trans($id, array $parameters = array(), $domain = null, $locale
3838
* Translates the given choice message by choosing a translation according to a number.
3939
*
4040
* @param string $id The message id (may also be an object that can be cast to string)
41-
* @param int $number The number to use to find the indice of the message
41+
* @param int $number The number to use to find the index of the message
4242
* @param array $parameters An array of parameters for the message
4343
* @param string|null $domain The domain for the message or null to use the default
4444
* @param string|null $locale The locale or null to use the default

‎src/Symfony/Component/VarDumper/Cloner/VarCloner.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ protected function doClone($var)
3232
$queue = array(array($var)); // This breadth-first queue is the return value
3333
$indexedArrays = array(); // Map of queue indexes that hold numerically indexed arrays
3434
$hardRefs = array(); // Map of original zval hashes to stub objects
35-
$objRefs = array(); // Map of original object handles to their stub object couterpart
36-
$resRefs = array(); // Map of original resource handles to their stub object couterpart
35+
$objRefs = array(); // Map of original object handles to their stub object counterpart
36+
$resRefs = array(); // Map of original resource handles to their stub object counterpart
3737
$values = array(); // Map of stub objects' hashes to original values
3838
$maxItems = $this->maxItems;
3939
$maxString = $this->maxString;

0 commit comments

Comments
 (0)
0