Skip to content

Commit

Permalink
minor #30344 be keen to newcomers (OskarStark)
Browse files Browse the repository at this point in the history
This PR was merged into the 3.4 branch.

Discussion
----------

be keen to newcomers

| 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 |
| License       | MIT
| Doc PR        | symfony/symfony-docs#11036

Commits
-------

c008ee0 be keen to newcomers
  • Loading branch information
fabpot committed Feb 22, 2019
2 parents 848a830 + c008ee0 commit 5ad1f37
Show file tree
Hide file tree
Showing 20 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion UPGRADE-4.0.md
Expand Up @@ -230,7 +230,7 @@ DependencyInjection
supported.

* The ``strict`` attribute in service arguments has been removed.
The attribute is ignored since 3.0, so you can simply remove it.
The attribute is ignored since 3.0, you can remove it.

* Top-level anonymous services in XML are no longer supported.

Expand Down
Expand Up @@ -24,8 +24,8 @@
* The compiler pass is meant to register the mappings with the metadata
* chain driver corresponding to one of the object managers.
*
* For concrete implementations that are easy to use, see the
* RegisterXyMappingsPass classes in the DoctrineBundle resp.
* For concrete implementations, see the RegisterXyMappingsPass classes
* in the DoctrineBundle resp.
* DoctrineMongodbBundle, DoctrineCouchdbBundle and DoctrinePhpcrBundle.
*
* @author David Buchmann <david@liip.ch>
Expand Down
Expand Up @@ -20,7 +20,7 @@
/**
* Wrapper around a Doctrine ObjectManager.
*
* Provides easy to use provisioning for Doctrine entity users.
* Provides provisioning for Doctrine entity users.
*
* @author Fabien Potencier <fabien@symfony.com>
* @author Johannes M. Schmitt <schmittjoh@gmail.com>
Expand Down
Expand Up @@ -225,7 +225,7 @@ protected function resolveServiceDefinition(ContainerBuilder $builder, $serviceI
return $builder->getDefinition($serviceId);
}

// Some service IDs don't have a Definition, they're simply an Alias
// Some service IDs don't have a Definition, they're aliases
if ($builder->hasAlias($serviceId)) {
return $builder->getAlias($serviceId);
}
Expand Down
Expand Up @@ -54,7 +54,7 @@ public function testCacheIsFreshAfterCacheClearedWithWarmup()
// Ensure that all *.meta files are fresh
$finder = new Finder();
$metaFiles = $finder->files()->in($this->kernel->getCacheDir())->name('*.php.meta');
// simply check that cache is warmed up
// check that cache is warmed up
$this->assertNotEmpty($metaFiles);
$configCacheFactory = new ConfigCacheFactory(true);

Expand Down
Expand Up @@ -332,10 +332,10 @@ public function performNoDeepMerging()
* Allows extra config keys to be specified under an array without
* throwing an exception.
*
* Those config values are simply ignored and removed from the
* resulting array. This should be used only in special cases where
* you want to send an entire configuration array through a special
* tree that processes only part of the array.
* Those config values are ignored and removed from the resulting
* array. This should be used only in special cases where you want
* to send an entire configuration array through a special tree that
* processes only part of the array.
*
* @param bool $remove Whether to remove the extra keys
*
Expand Down
Expand Up @@ -301,7 +301,7 @@ protected function mergeValues($leftSide, $rightSide)
}

foreach ($rightSide as $k => $v) {
// prototype, and key is irrelevant, so simply append the element
// prototype, and key is irrelevant, append the element
if (null === $this->keyAttribute) {
$leftSide[] = $v;
continue;
Expand Down
Expand Up @@ -17,7 +17,7 @@
/**
* {@inheritdoc}
*
* Noop proxy instantiator - simply produces the real service instead of a proxy instance.
* Noop proxy instantiator - produces the real service instead of a proxy instance.
*
* @author Marco Pivetta <ocramius@gmail.com>
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/DomCrawler/Crawler.php
Expand Up @@ -968,7 +968,7 @@ private function relativize($xpath)
$expressions = [];

// An expression which will never match to replace expressions which cannot match in the crawler
// We cannot simply drop
// We cannot drop
$nonMatchingExpression = 'a[name() = "b"]';

$xpathLen = \strlen($xpath);
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Finder/Finder.php
Expand Up @@ -29,7 +29,7 @@
*
* All rules may be invoked several times.
*
* All methods return the current Finder object to allow easy chaining:
* All methods return the current Finder object to allow chaining:
*
* $finder = Finder::create()->files()->name('*.php')->in(__DIR__);
*
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php
Expand Up @@ -78,7 +78,7 @@ public function __construct($choices, callable $value = null)
// If a deterministic value generator was passed, use it later
$this->valueCallback = $value;
} else {
// Otherwise simply generate incrementing integers as values
// Otherwise generate incrementing integers as values
$i = 0;
$value = function () use (&$i) {
return $i++;
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Form/ChoiceList/LazyChoiceList.php
Expand Up @@ -32,7 +32,7 @@ class LazyChoiceList implements ChoiceListInterface
/**
* The callable creating string values for each choice.
*
* If null, choices are simply cast to strings.
* If null, choices are cast to strings.
*
* @var callable|null
*/
Expand Down
6 changes: 3 additions & 3 deletions src/Symfony/Component/Form/Form.php
Expand Up @@ -42,9 +42,9 @@
*
* In most cases, format (1) and format (2) will be the same. For example,
* a checkbox field uses a Boolean value for both internal processing and
* storage in the object. In these cases you simply need to set a view
* transformer to convert between formats (2) and (3). You can do this by
* calling addViewTransformer().
* storage in the object. In these cases you need to set a view transformer
* to convert between formats (2) and (3). You can do this by calling
* addViewTransformer().
*
* In some cases though it makes sense to make format (1) configurable. To
* demonstrate this, let's extend our above date field to store the value
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Form/FormRenderer.php
Expand Up @@ -163,7 +163,7 @@ public function searchAndRenderBlock(FormView $view, $blockNameSuffix, array $va
// "form_widget" in this example (again, no matter in which theme).
// If the designer wants to explicitly fallback to "form_widget" in their
// custom "choice_widget", for example because they only want to wrap
// a <div> around the original implementation, they can simply call the
// a <div> around the original implementation, they can call the
// widget() function again to render the block for the parent type.
//
// The second kind is implemented in the following blocks.
Expand Down
Expand Up @@ -80,7 +80,7 @@ public function render($uri, Request $request, array $options = [])
return SubRequestHandler::handle($this->kernel, $subRequest, HttpKernelInterface::SUB_REQUEST, false);
} catch (\Exception $e) {
// we dispatch the exception event to trigger the logging
// the response that comes back is simply ignored
// the response that comes back is ignored
if (isset($options['ignore_errors']) && $options['ignore_errors'] && $this->dispatcher) {
$event = new GetResponseForExceptionEvent($this->kernel, $request, HttpKernelInterface::SUB_REQUEST, $e);

Expand Down
Expand Up @@ -157,7 +157,7 @@ private function generateLocaleName($locale, $displayLocale)
// the name sorting
// $name = $this->langBundle->getLanguageName($displayLocale, $lang, $region);

// Some languages are simply not translated
// Some languages are not translated
// Example: "az" (Azerbaijani) has no translation in "af" (Afrikaans)
if (null === ($name = $this->languageDataProvider->getName($lang, $displayLocale))) {
return;
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Validator/Constraints/Regex.php
Expand Up @@ -79,7 +79,7 @@ public function getHtmlPattern()
// Unescape the delimiter
$pattern = str_replace('\\'.$delimiter, $delimiter, substr($this->pattern, 1, -1));

// If the pattern is inverted, we can simply wrap it in
// If the pattern is inverted, we can wrap it in
// ((?!pattern).)*
if (!$this->match) {
return '((?!'.$pattern.').)*';
Expand Down
Expand Up @@ -86,8 +86,8 @@ public function hasPropertyMetadata($property);
/**
* Returns all metadata instances for the given named property.
*
* If your implementation does not support properties, simply throw an
* exception in this method (for example a <tt>BadMethodCallException</tt>).
* If your implementation does not support properties, throw an exception
* in this method (for example a <tt>BadMethodCallException</tt>).
*
* @param string $property The property name
*
Expand Down
Expand Up @@ -94,7 +94,7 @@ public function testValid()

(new StateMachineValidator())->validate($definition, 'foo');

// the test simply ensures that the validation does not fail (i.e. it does not throw any exceptions)
// the test ensures that the validation does not fail (i.e. it does not throw any exceptions)
$this->addToAssertionCount(1);

// The graph looks like:
Expand Down
Expand Up @@ -29,7 +29,7 @@ public function testSinglePlaceWorkflowValidatorAndSimpleWorkflow()

(new WorkflowValidator(true))->validate($definition, 'foo');

// the test simply ensures that the validation does not fail (i.e. it does not throw any exceptions)
// the test ensures that the validation does not fail (i.e. it does not throw any exceptions)
$this->addToAssertionCount(1);
}

Expand Down Expand Up @@ -64,7 +64,7 @@ public function testSameTransitionNameButNotSamePlace()

(new WorkflowValidator())->validate($definition, 'foo');

// the test simply ensures that the validation does not fail (i.e. it does not throw any exceptions)
// the test ensures that the validation does not fail (i.e. it does not throw any exceptions)
$this->addToAssertionCount(1);
}
}

0 comments on commit 5ad1f37

Please sign in to comment.