8000 Merge branch '5.4' into 6.0 · symfony/symfony@6955222 · GitHub
[go: up one dir, main page]

Skip to content

Commit 6955222

Browse files
Merge branch '5.4' into 6.0
* 5.4: Add some missing types
2 parents 6c91640 + 78a7b3b commit 6955222

File tree

7 files changed

+6
-24
lines changed

7 files changed

+6
-24
lines changed

src/Symfony/Bridge/Doctrine/DataCollector/ObjectParameter.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@ public function __construct(object $object, ?\Throwable $error)
2626
$this->class = \get_class($object);
2727
}
2828

29-
/**
30-
* @return object
31-
*/
32-
public function getObject()
29+
public function getObject(): object
3330
{
3431
return $this->object;
3532
}

src/Symfony/Component/Console/Descriptor/DescriptorInterface.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,5 @@
2020
*/
2121
interface DescriptorInterface
2222
{
23-
/**
24-
* Describes an object if supported.
25-
*
26-
* @param object $object
27-
*/
28-
public function describe(OutputInterface $output, $object, array $options = []);
23+
public function describe(OutputInterface $output, object $object, array $options = []);
2924
}

src/Symfony/Component/Security/Core/Authorization/AccessDecisionManagerInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ interface AccessDecisionManagerInterface
2323
/**
2424
* Decides whether the access is possible or not.
2525
*
26-
* @param array $attributes An array of attributes associated with the method being invoked
27-
* @param object $object The object to secure
26+
* @param array $attributes An array of attributes associated with the method being invoked
27+
* @param mixed $object The object to secure
2828
*
2929
* @return bool true if the access is granted, false otherwise
3030
*/

src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,11 +273,9 @@ protected function instantiateObject(array &$data, string $class, array &$contex
273273
/**
274274
* Gets and caches attributes for the given object, format and context.
275275
*
276-
* @param object $object
277-
*
278276
* @return string[]
279277
*/
280-
protected function getAttributes($object, ?string $format, array $context)
278+
protected function getAttributes(object $object, ?string $format, array $context)
281279
{
282280
$class = $this->objectClassResolver ? ($this->objectClassResolver)($object) : \get_class($object);
283281
$key = $class.'-'.$context['cache_key'];

src/Symfony/Component/Validator/Context/ExecutionContext.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -349,10 +349,8 @@ public function isObjectInitialized(string $cacheKey): bool
349349

350350
/**
351351
* @internal
352-
*
353-
* @return string
354352
*/
355-
public function generateCacheKey(object $object)
353+
public function generateCacheKey(object $object): string
356354
{
357355
if (!isset($this->cachedObjectsRefs[$object])) {
358356
$this->cachedObjectsRefs[$object] = spl_object_hash($object);

src/Symfony/Component/Validator/ObjectInitializerInterface.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,5 @@
2222
*/
2323
interface ObjectInitializerInterface
2424
{
25-
/**
26-
* Initializes an object just before validation.
27-
*
28-
* @param object $object The object to validate
29-
*/
3025
public function initialize(object $object);
3126
}

src/Symfony/Component/Validator/Validator/ContextualValidatorInterface.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ public function validate(mixed $value, Constraint|array $constraints = null, str
5050
* Validates a property of an object against the constraints specified
5151
* for this property.
5252
*
53-
* @param object $object The object
5453
* @param string $propertyName The name of the validated property
5554
* @param string|GroupSequence|array<string|GroupSequence>|null $groups The validation groups to validate. If none is given, "Default" is assumed
5655
*

0 commit comments

Comments
 (0)
0