Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit6ee3efa

Browse files
committed
minor#32066 Fine tune constructor types (Tobion)
This PR was merged into the 4.4 branch.Discussion----------Fine tune constructor types| Q | A| ------------- | ---| Branch? | 4.4| Bug fix? | no| New feature? | no <!-- please update src/**/CHANGELOG.md files -->| BC breaks? | no <!-- seehttps://symfony.com/bc -->| Deprecations? | no <!-- please 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#... <!-- required for new features -->Fine tunes some constructor types that have been added in#24722Form names as integer was only a workaround as forms names are used as array keys which get transformed to int. So it was added as a workaround in#6355 (comment)With typehints added in#24722 those were mostly auto-cast anyway, e.g. in FormBuilder. There are only a few integer form names remaining documented, in the main entry points of the Form component (`\Symfony\Component\Form\FormInterface::add`). Internally it's always a string now. So I could remove some int docs which alsofixes#30032 what@xabbuh tried to do.Some of these changes we're just not done before because of broken tests. It's mainly a missing explicit mock for `TranslationInterface::trans` which returned null. If we had return types hints in interfaces, this wouldn't happen.Commits-------507794a Fine tune constructor types
2 parentsa0aa941 +507794a commit6ee3efa

File tree

17 files changed

+39
-41
lines changed

17 files changed

+39
-41
lines changed

‎src/Symfony/Component/Config/Definition/BaseNode.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@ abstract class BaseNode implements NodeInterface
4747
*/
4848
publicfunction__construct(?string$name,NodeInterface$parent =null,string$pathSeparator =self::DEFAULT_PATH_SEPARATOR)
4949
{
50-
if (false !==strpos($name = (string)$name,$pathSeparator)) {
50+
if (null ===$name) {
51+
$name ='';
52+
}
53+
if (false !==strpos($name,$pathSeparator)) {
5154
thrownew \InvalidArgumentException('The name must not contain "'.$pathSeparator.'".');
5255
}
5356

‎src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ abstract class NodeDefinition implements NodeParentInterface
4141
publicfunction__construct(?string$name,NodeParentInterface$parent =null)
4242
{
4343
$this->parent =$parent;
44-
$this->name =$name;
44+
$this->name =$name ??'';
4545
}
4646

4747
/**

‎src/Symfony/Component/Config/Resource/GlobResource.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class GlobResource implements \IteratorAggregate, SelfCheckingResourceInterface
3939
*
4040
* @throws \InvalidArgumentException
4141
*/
42-
publicfunction__construct(?string$prefix,string$pattern,bool$recursive,bool$forExclusion =false,array$excludedPrefixes = [])
42+
publicfunction__construct(string$prefix,string$pattern,bool$recursive,bool$forExclusion =false,array$excludedPrefixes = [])
4343
{
4444
$this->prefix =realpath($prefix) ?: (file_exists($prefix) ?$prefix :false);
4545
$this->pattern =$pattern;

‎src/Symfony/Component/Config/Tests/Loader/FileLoaderTest.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ public function testImportWithFileLocatorDelegation()
7171
publicfunctiontestImportWithGlobLikeResource()
7272
{
7373
$locatorMock =$this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();
74+
$locatorMock->expects($this->once())->method('locate')->willReturn('');
7475
$loader =newTestFileLoader($locatorMock);
7576

7677
$this->assertSame('[foo]',$loader->import('[foo]'));
@@ -79,6 +80,7 @@ public function testImportWithGlobLikeResource()
7980
publicfunctiontestImportWithNoGlobMatch()
8081
{
8182
$locatorMock =$this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();
83+
$locatorMock->expects($this->once())->method('locate')->willReturn('');
8284
$loader =newTestFileLoader($locatorMock);
8385

8486
$this->assertNull($loader->import('./*.abc'));

‎src/Symfony/Component/DomCrawler/AbstractUriElement.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ abstract class AbstractUriElement
2424
protected$node;
2525

2626
/**
27-
* @var string The method to use for the element
27+
* @var string|null The method to use for the element
2828
*/
2929
protected$method;
3030

@@ -36,7 +36,7 @@ abstract class AbstractUriElement
3636
/**
3737
* @param \DOMElement $node A \DOMElement instance
3838
* @param string $currentUri The URI of the page where the link is embedded (or the base href)
39-
* @param string $method The method to use for the link (GET by default)
39+
* @param string|null $method The method to use for the link (GET by default)
4040
*
4141
* @throws \InvalidArgumentException if the node is not a link
4242
*/
@@ -70,7 +70,7 @@ public function getNode()
7070
*/
7171
publicfunctiongetMethod()
7272
{
73-
return$this->method;
73+
return$this->method ??'GET';
7474
}
7575

7676
/**

‎src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public function validate($form, Constraint $formConstraint)
137137
// Mark the form with an error if it contains extra fields
138138
if (!$config->getOption('allow_extra_fields') &&\count($form->getExtraData()) >0) {
139139
$this->context->setConstraint($formConstraint);
140-
$this->context->buildViolation($config->getOption('extra_fields_message'))
140+
$this->context->buildViolation($config->getOption('extra_fields_message',''))
141141
->setParameter('{{ extra_fields }}','"'.implode('", "',array_keys($form->getExtraData())).'"')
142142
->setInvalidValue($form->getExtraData())
143143
->setCode(Form::NO_SUCH_FIELD_ERROR)

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ class Form implements \IteratorAggregate, FormInterface, ClearableErrorsInterfac
146146
private$lockSetData =false;
147147

148148
/**
149-
* @var string|int|null
149+
* @var string|null
150150
*/
151151
private$name;
152152

@@ -847,6 +847,8 @@ public function add($child, $type = null, array $options = [])
847847
thrownewUnexpectedTypeException($child,'string, integer or Symfony\Component\Form\FormInterface');
848848
}
849849

850+
$child = (string)$child;
851+
850852
if (null !==$type && !\is_string($type) && !$typeinstanceof FormTypeInterface) {
851853
thrownewUnexpectedTypeException($type,'string or Symfony\Component\Form\FormTypeInterface');
852854
}

‎src/Symfony/Component/Form/FormConfigBuilder.php‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -107,23 +107,23 @@ class FormConfigBuilder implements FormConfigBuilderInterface
107107
/**
108108
* Creates an empty form configuration.
109109
*
110-
* @param string|int $name The form name
110+
* @param string|null $name The form name
111111
* @param string|null $dataClass The class of the form's data
112112
* @param EventDispatcherInterface $dispatcher The event dispatcher
113113
* @param array $options The form options
114114
*
115115
* @throws InvalidArgumentException if the data class is not a valid class or if
116116
* the name contains invalid characters
117117
*/
118-
publicfunction__construct($name, ?string$dataClass,EventDispatcherInterface$dispatcher,array$options = [])
118+
publicfunction__construct(?string$name, ?string$dataClass,EventDispatcherInterface$dispatcher,array$options = [])
119119
{
120120
self::validateName($name);
121121

122122
if (null !==$dataClass && !class_exists($dataClass) && !interface_exists($dataClass,false)) {
123123
thrownewInvalidArgumentException(sprintf('Class "%s" not found. Is the "data_class" form option set correctly?',$dataClass));
124124
}
125125

126-
$this->name =(string)$name;
126+
$this->name =$name ??'';
127127
$this->dataClass =$dataClass;
128128
$this->dispatcher =$dispatcher;
129129
$this->options =$options;
@@ -767,15 +767,17 @@ public function getFormConfig()
767767
/**
768768
* Validates whether the given variable is a valid form name.
769769
*
770-
* @param string|int|null $name The tested form name
770+
* @param string|null $name The tested form name
771771
*
772772
* @throws UnexpectedTypeException if the name is not a string or an integer
773773
* @throws InvalidArgumentException if the name contains invalid characters
774+
*
775+
* @internal since Symfony 4.4
774776
*/
775777
publicstaticfunctionvalidateName($name)
776778
{
777-
if (null !==$name && !\is_string($name) && !\is_int($name)) {
778-
thrownewUnexpectedTypeException($name,'string, integer or null');
779+
if (null !==$name && !\is_string($name)) {
780+
thrownewUnexpectedTypeException($name,'string or null');
779781
}
780782

781783
if (!self::isValidName($name)) {
@@ -792,12 +794,8 @@ public static function validateName($name)
792794
* * starts with a letter, digit or underscore
793795
* * contains only letters, digits, numbers, underscores ("_"),
794796
* hyphens ("-") and colons (":")
795-
*
796-
* @param string|null $name The tested form name
797-
*
798-
* @return bool Whether the name is valid
799797
*/
800-
publicstaticfunctionisValidName($name)
798+
finalpublicstaticfunctionisValidName(?string$name):bool
801799
{
802800
return'' ===$name ||null ===$name ||preg_match('/^[a-zA-Z0-9_][a-zA-Z0-9_\-:]*$/D',$name);
803801
}

‎src/Symfony/Component/Form/FormError.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ class FormError
4747
*
4848
* @see \Symfony\Component\Translation\Translator
4949
*/
50-
publicfunction__construct(?string$message,string$messageTemplate =null,array$messageParameters = [],int$messagePluralization =null,$cause =null)
50+
publicfunction__construct(string$message,string$messageTemplate =null,array$messageParameters = [],int$messagePluralization =null,$cause =null)
5151
{
52-
$this->message =(string)$message;
52+
$this->message =$message;
5353
$this->messageTemplate =$messageTemplate ?:$message;
5454
$this->messageParameters =$messageParameters;
5555
$this->messagePluralization =$messagePluralization;

‎src/Symfony/Component/Form/FormFactory.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function createNamedBuilder($name, $type = 'Symfony\Component\Form\Extens
7373

7474
$type =$this->registry->getType($type);
7575

76-
$builder =$type->createBuilder($this,$name,$options);
76+
$builder =$type->createBuilder($this,(string)$name,$options);
7777

7878
// Explicitly call buildForm() in order to be able to override either
7979
// createBuilder() or buildForm() in the resolved form type

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp