8000 bug #16334 Updated type guessers to use FQCNs for guessed types (hidd… · symfony/symfony@2419000 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2419000

Browse files
TobionTobion
committed
bug #16334 Updated type guessers to use FQCNs for guessed types (hiddewie)
This PR was squashed before being merged into the 2.8 branch (closes #16334). Discussion ---------- Updated type guessers to use FQCNs for guessed types | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #16332 | License | MIT | Doc PR | symfony/symfony-docs#5834 (if applicable) Commits ------- e871db7 Updated type guessers to use FQCNs for guessed types
2 parents 1054dd7 + e871db7 commit 2419000

File tree

3 files changed

+35
-35
lines changed

3 files changed

+35
-35
lines changed

‎src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function __construct(ManagerRegistry $registry)
3939
public function guessType($class, $property)
4040
{
4141
if (!$ret = $this->getMetadata($class)) {
42-
return new TypeGuess('text', array(), Guess::LOW_CONFIDENCE);
42+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TextType', array(), Guess::LOW_CONFIDENCE);
4343
}
4444

4545
list($metadata, $name) = $ret;
@@ -48,35 +48,35 @@ public function guessType($class, $property)
4848
$multiple = $metadata->isCollectionValuedAssociation($property);
4949
$mapping = $metadata->getAssociationMapping($property);
5050

51-
return new TypeGuess('entity', array('em' => $name, 'class' => $mapping['targetEntity'], 'multiple' => $multiple), Guess::HIGH_CONFIDENCE);
51+
return new TypeGuess('Symfony\Bridge\Doctrine\Form\Type\EntityType', array('em' => $name, 'class' => $mapping['targetEntity'], 'multiple' => $multiple), Guess::HIGH_CONFIDENCE);
5252
}
5353

5454
switch ($metadata->getTypeOfField($property)) {
5555
case Type::TARRAY:
56-
return new TypeGuess('collection', array(), Guess::MEDIUM_CONFIDENCE);
56+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\CollectionType', array(), Guess::MEDIUM_CONFIDENCE);
5757
case Type::BOOLEAN:
58-
return new TypeGuess('checkbox', array(), Guess::HIGH_CONFIDENCE);
58+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\CheckboxType', array(), Guess::HIGH_CONFIDENCE);
5959
case Type::DATETIME:
6060
case Type::DATETIMETZ:
6161
case 'vardatetime':
62-
return new TypeGuess('datetime', array(), Guess::HIGH_CONFIDENCE);
62+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateTimeType', array(), Guess::HIGH_CONFIDENCE);
6363
case Type::DATE:
64-
return new TypeGuess('date', array(), Guess::HIGH_CONFIDENCE);
64+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateType', array(), Guess::HIGH_CONFIDENCE);
6565
case Type::TIME:
66-
return new TypeGuess('time', array(), Guess::HIGH_CONFIDENCE);
66+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TimeType', array(), Guess::HIGH_CONFIDENCE);
6767
case Type::DECIMAL:
6868
case Type::FLOAT:
69-
return new TypeGuess('number', array(), Guess::MEDIUM_CONFIDENCE);
69+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\NumberType', array(), Guess::MEDIUM_CONFIDENCE);
7070
case Type::INTEGER:
7171
case Type::BIGINT:
7272
case Type::SMALLINT:
73-
return new TypeGuess('integer', array(), Guess::MEDIUM_CONFIDENCE);
73+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\IntegerType', array(), Guess::MEDIUM_CONFIDENCE);
7474
case Type::STRING:
75-
return new TypeGuess('text', array(), Guess::MEDIUM_CONFIDENCE);
75+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TextType', array(), Guess::MEDIUM_CONFIDENCE);
7676
case Type::TEXT:
77-
return new TypeGuess('textarea', array(), Guess::MEDIUM_CONFIDENCE);
77+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TextareaType', array(), Guess::MEDIUM_CONFIDENCE);
7878
default:
79-
return new TypeGuess('text', array(), Guess::LOW_CONFIDENCE);
79+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TextType', array(), Guess::LOW_CONFIDENCE);
8080
}
8181
}
8282

‎src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -91,79 +91,79 @@ public function guessTypeForConstraint(Constraint $constraint)
9191
case 'Symfony\Component\Validator\Constraints\Type':
9292
switch ($constraint->type) {
9393
case 'array':
94-
return new TypeGuess('collection', array(), Guess::MEDIUM_CONFIDENCE);
94+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\CollectionType', array(), Guess::MEDIUM_CONFIDENCE);
9595
case 'boolean':
9696
case 'bool':
97-
return new TypeGuess('checkbox', array(), Guess::MEDIUM_CONFIDENCE);
97+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\CheckboxType', array(), Guess::MEDIUM_CONFIDENCE);
9898

9999
case 'double':
100100
case 'float':
101101
case 'numeric':
102102
case 'real':
103-
return new TypeGuess('number', array(), Guess::MEDIUM_CONFIDENCE);
103+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\NumberType', array(), Guess::MEDIUM_CONFIDENCE);
104104

105105
case 'integer':
106106
case 'int':
107107
case 'long':
108-
return new TypeGuess('integer', array(), Guess::MEDIUM_CONFIDENCE);
108+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\IntegerType', array(), Guess::MEDIUM_CONFIDENCE);
109109

110110
case '\DateTime':
111-
return new TypeGuess('date', array(), Guess::MEDIUM_CONFIDENCE);
111+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateType', array(), Guess::MEDIUM_CONFIDENCE);
112112

113113
case 'string':
114-
return new TypeGuess('text', array(), Guess::LOW_CONFIDENCE);
114+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TextType', array(), Guess::LOW_CONFIDENCE);
115115
}
116116
break;
117117

118118
case 'Symfony\Component\Validator\Constraints\Country':
119-
return new TypeGuess('country', array(), Guess::HIGH_CONFIDENCE);
119+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\CountryType', array(), Guess::HIGH_CONFIDENCE);
120120

121121
case 'Symfony\Component\Validator\Constraints\Currency':
122-
return new TypeGuess('currency', array(), Guess::HIGH_CONFIDENCE);
122+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\CurrencyType', array(), Guess::HIGH_CONFIDENCE);
123123

124124
case 'Symfony\Component\Validator\Constraints\Date':
125-
return new TypeGuess('date', array('input' => 'string'), Guess::HIGH_CONFIDENCE);
125+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateType', array('input' => 'string'), Guess::HIGH_CONFIDENCE);
126126

127127
case 'Symfony\Component\Validator\Constraints\DateTime':
128-
return new TypeGuess('datetime', array('input' => 'string'), Guess::HIGH_CONFIDENCE);
128+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateTimeType', array('input' => 'string'), Guess::HIGH_CONFIDENCE);
129129

130130
case 'Symfony\Component\Validator\Constraints\Email':
131-
return new TypeGuess('email', array(), Guess::HIGH_CONFIDENCE);
131+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\EmailType', array(), Guess::HIGH_CONFIDENCE);
132132

133133
case 'Symfony\Component\Validator\Constraints\File':
134134
case 'Symfony\Component\Validator\Constraints\Image':
135-
return new TypeGuess('file', array(), Guess::HIGH_CONFIDENCE);
135+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\FileType', array(), Guess::HIGH_CONFIDENCE);
136136

137137
case 'Symfony\Component\Validator\Constraints\Language':
138-
return new TypeGuess('language', array(), Guess::HIGH_CONFIDENCE);
138+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\LanguageType', array(), Guess::HIGH_CONFIDENCE);
139139

140140
case 'Symfony\Component\Validator\Constraints\Locale':
141-
return new TypeGuess('locale', array(), Guess::HIGH_CONFIDENCE);
141+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\LocaleType', array(), Guess::HIGH_CONFIDENCE);
142142

143143
case 'Symfony\Component\Validator\Constraints\Time':
144-
return new TypeGuess('time', array('input' => 'string'), Guess::HIGH_CONFIDENCE);
144+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TimeType', array('input' => 'string'), Guess::HIGH_CONFIDENCE);
145145

146146
case 'Symfony\Component\Validator\Constraints\Url':
147-
return new TypeGuess('url', array(), Guess::HIGH_CONFIDENCE);
147+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\UrlType', array(), Guess::HIGH_CONFIDENCE);
148148

149149
case 'Symfony\Component\Validator\Constraints\Ip':
150-
return new TypeGuess('text', array(), Guess::MEDIUM_CONFIDENCE);
150+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TextType', array(), Guess::MEDIUM_CONFIDENCE);
151151

152152
case 'Symfony\Component\Validator\Constraints\Length':
153153
case 'Symfony\Component\Validator\Constraints\Regex':
154-
return new TypeGuess('text', array(), Guess::LOW_CONFIDENCE);
154+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TextType', array(), Guess::LOW_CONFIDENCE);
155155

156156
case 'Symfony\Component\Validator\Constraints\Range':
157-
return new TypeGuess('number', array(), Guess::LOW_CONFIDENCE);
157+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\NumberType', array(), Guess::LOW_CONFIDENCE);
158158

159159
case 'Symfony\Component\Validator\Constraints\Count':
160-
return new TypeGuess('collection', array(), Guess::LOW_CONFIDENCE);
160+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\CollectionType', array(), Guess::LOW_CONFIDENCE);
161161

162162
case 'Symfony\Component\Validator\Constraints\True':
163163
case 'Symfony\Component\Validator\Constraints\False':
164164
case 'Symfony\Component\Validator\Constraints\IsTrue':
165165
case 'Symfony\Component\Validator\Constraints\IsFalse':
166-
return new TypeGuess('checkbox', array(), Guess::MEDIUM_CONFIDENCE);
166+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\CheckboxType', array(), Guess::MEDIUM_CONFIDENCE);
167167
}
168168
}
169169

‎src/Symfony/Component/Form/Tests/FormFactoryTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ public function testCreateBuilderForPropertyCreatesFormWithHighestConfidence()
585585
->method('guessType')
586586
->with('Application\Author', 'firstName')
587587
->will($this->returnValue(new TypeGuess(
588-
'password',
588+
'Symfony\Component\Form\Extension\Core\Type\PasswordType',
589589
array('attr' => array('maxlength' => 7)),
590590
Guess::HIGH_CONFIDENCE
591591
)));
@@ -594,7 +594,7 @@ public function testCreateBuilderForPropertyCreatesFormWithHighestConfidence()
594594

595595
$factory->expects($this->once())
596596
->method('createNamedBuilder')
597-
->with('firstName', 'password', null, array('attr' => array('maxlength' => 7)))
597+
->with('firstName', 'Symfony\Component\Form\Extension\Core\Type\PasswordType', null, array('attr' => array('maxlength' => 7)))
598598
->will($this->returnValue('builderInstance'));
599599

600600
$this->builder = $factory->createBuilderForProperty('Application\Author', 'firstName');

0 commit comments

Comments
 (0)
0