Skip to content

Commit 7c47e34

Browse files
cannicanni
committed
[CS Fix] Consistent coding-style of concatenation operator usage
1 parent 54b32f1 commit 7c47e34

File tree

107 files changed

+305
-305
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+305
-305
lines changed

‎UPGRADE-2.1.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -901,7 +901,7 @@
901901
public function guessPattern($class, $property)
902902
{
903903
if (/* condition */) {
904-
return new ValueGuess('.{' . $minLength . ',}', Guess::LOW_CONFIDENCE);
904+
return new ValueGuess('.{'.$minLength.',}', Guess::LOW_CONFIDENCE);
905905
}
906906
}
907907
```
@@ -1189,7 +1189,7 @@
11891189
public function isPropertyValid(ExecutionContext $context)
11901190
{
11911191
// ...
1192-
$propertyPath = $context->getPropertyPath() . '.property';
1192+
$propertyPath = $context->getPropertyPath().'.property';
11931193
$context->setPropertyPath($propertyPath);
11941194
$context->addViolation('Error Message', array(), null);
11951195
}

‎UPGRADE-2.2.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@
464464
$path .= '.';
465465
}
466466
467-
$context->getGraphWalker()->walkReference($someObject, $group, $path . 'myProperty', false);
467+
$context->getGraphWalker()->walkReference($someObject, $group, $path.'myProperty', false);
468468
}
469469
}
470470
```

‎src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ protected function detectMetadataDriver($dir, ContainerBuilder $container)
304304
protected function loadObjectManagerCacheDriver(array $objectManager, ContainerBuilder $container, $cacheName)
305305
{
306306
$cacheDriver = $objectManager[$cacheName.'_driver'];
307-
$cacheDriverService = $this->getObjectManagerElementName($objectManager['name'] . '_' . $cacheName);
307+
$cacheDriverService = $this->getObjectManagerElementName($objectManager['name'].'_'.$cacheName);
308308

309309
switch ($cacheDriver['type']) {
310310
case 'service':

‎src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,21 @@ public function process(ContainerBuilder $container)
5151
*/
5252
private function updateValidatorMappingFiles(ContainerBuilder $container, $mapping, $extension)
5353
{
54-
if ( ! $container->hasParameter('validator.mapping.loader.' . $mapping . '_files_loader.mapping_files')) {
54+
if ( ! $container->hasParameter('validator.mapping.loader.'.$mapping.'_files_loader.mapping_files')) {
5555
return;
5656
}
5757

58-
$files = $container->getParameter('validator.mapping.loader.' . $mapping . '_files_loader.mapping_files');
59-
$validationPath = 'Resources/config/validation.' . $this->managerType . '.' . $extension;
58+
$files = $container->getParameter('validator.mapping.loader.'.$mapping.'_files_loader.mapping_files');
59+
$validationPath = 'Resources/config/validation.'.$this->managerType.'.'.$extension;
6060

6161
foreach ($container->getParameter('kernel.bundles') as $bundle) {
6262
$reflection = new \ReflectionClass($bundle);
63-
if (is_file($file = dirname($reflection->getFilename()) . '/' . $validationPath)) {
63+
if (is_file($file = dirname($reflection->getFilename()).'/'.$validationPath)) {
6464
$files[] = realpath($file);
6565
$container->addResource(new FileResource($file));
6666
}
6767
}
6868

69-
$container->setParameter('validator.mapping.loader.' . $mapping . '_files_loader.mapping_files', $files);
69+
$container->setParameter('validator.mapping.loader.'.$mapping.'_files_loader.mapping_files', $files);
7070
}
7171
}

‎src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public function testCollapsedEntityField()
120120
*/
121121
public function testCollapsedEntityFieldWithChoices()
122122
{
123-
$choices = $this->em->createQuery('SELECT c FROM ' . self::ENTITY_CLASS . ' c')->getResult();
123+
$choices = $this->em->createQuery('SELECT c FROM '.self::ENTITY_CLASS.' c')->getResult();
124124
$this->setMaxRunningTime(1);
125125

126126
for ($i = 0; $i < 40; ++$i) {
@@ -139,7 +139,7 @@ public function testCollapsedEntityFieldWithChoices()
139139
*/
140140
public function testCollapsedEntityFieldWithPreferredChoices()
141141
{
142-
$choices = $this->em->createQuery('SELECT c FROM ' . self::ENTITY_CLASS . ' c')->getResult();
142+
$choices = $this->em->createQuery('SELECT c FROM '.self::ENTITY_CLASS.' c')->getResult();
143143
$this->setMaxRunningTime(1);
144144

145145
for ($i = 0; $i < 40; ++$i) {

‎src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public function validate($entity, Constraint $constraint)
9595
if (count($relatedId) > 1) {
9696
throw new ConstraintDefinitionException(
9797
"Associated entities are not allowed to have more than one identifier field to be " .
98-
"part of a unique constraint in: " . $class->getName() . "#" . $fieldName
98+
"part of a unique constraint in: ".$class->getName()."#".$fieldName
9999
);
100100
}
101101
$criteria[$fieldName] = array_pop($relatedId);

‎src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public function __construct($class, $labelPath = null, $choices = null, $queryOb
8484
{
8585
$this->class = $class;
8686

87-
$queryClass = $this->class . 'Query';
87+
$queryClass = $this->class.'Query';
8888
$query = new $queryClass();
8989

9090
$this->identifier = $query->getTableMap()->getPrimaryKeys();
@@ -198,7 +198,7 @@ public function getChoicesForValues(array $values)
198198
{
199199
if (!$this->loaded) {
200200
if (1 === count($this->identifier)) {
201-
$filterBy = 'filterBy' . current($this->identifier)->getPhpName();
201+
$filterBy = 'filterBy'.current($this->identifier)->getPhpName();
202202

203203
return (array) $this->query->create()
204204
->$filterBy($values)

‎src/Symfony/Bridge/Propel1/Security/User/PropelUserProvider.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class PropelUserProvider implements UserProviderInterface
5353
public function __construct($class, $property = null)
5454
{
5555
$this->class = $class;
56-
$this->queryClass = $class . 'Query';
56+
$this->queryClass = $class.'Query';
5757
$this->property = $property;
5858
}
5959

@@ -66,7 +66,7 @@ public function loadUserByUsername($username)
6666
$query = $queryClass::create();
6767

6868
if (null !== $this->property) {
69-
$filter = 'filterBy' . ucfirst($this->property);
69+
$filter = 'filterBy'.ucfirst($this->property);
7070
$query->$filter($username);
7171
} else {
7272
$query->filterByUsername($username);

‎src/Symfony/Bridge/Twig/Node/SearchAndRenderBlockNode.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function compile(\Twig_Compiler $compiler)
2929

3030
if (isset($arguments[0])) {
3131
$compiler->subcompile($arguments[0]);
32-
$compiler->raw(', \'' . $blockNameSuffix . '\'');
32+
$compiler->raw(', \''.$blockNameSuffix.'\'');
3333

3434
if (isset($arguments[1])) {
3535
if ('label' === $blockNameSuffix) {

‎src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public function isSelectedChoiceProvider()
134134
*/
135135
public function testIsChoiceSelected($expected, $choice, $value)
136136
{
137-
$choice = new ChoiceView($choice, $choice, $choice . ' label');
137+
$choice = new ChoiceView($choice, $choice, $choice.' label');
138138

139139
$this->assertSame($expected, $this->extension->isSelectedChoice($choice, $value));
140140
}

0 commit comments

Comments
 (0)