Skip to content

Commit 552d167

Browse files
Merge branch '3.4'
* 3.4: [3.4] Remove useless docblocks [3.3] More docblock fixes [2.7] More docblock fixes [TwigBridge] Fix BC break due required twig environment Random fixes Docblock fixes [DI] Fix cannot bind env var Fix some signatures in PHP-DSLs [HttpKernel] Enhance deprecation message bumped Symfony version to 3.4.0 updated VERSION for 3.4.0-BETA3 updated CHANGELOG for 3.4.0-BETA3 [SecurityBundle] Fix the datacollector to properly support decision.object being null
2 parents 9cd8c12 + b88e6a2 commit 552d167

File tree

4 files changed

+9
-28
lines changed

4 files changed

+9
-28
lines changed

Constraints/AbstractComparisonValidator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function validate($value, Constraint $constraint)
6969
if ($value instanceof \DateTimeImmutable) {
7070
// If $value is immutable, convert the compared value to a
7171
// DateTimeImmutable too
72-
$comparedValue = new \DatetimeImmutable($comparedValue);
72+
$comparedValue = new \DateTimeImmutable($comparedValue);
7373
} elseif ($value instanceof \DateTimeInterface) {
7474
// Otherwise use DateTime
7575
$comparedValue = new \DateTime($comparedValue);

Mapping/Cache/Psr6Cache.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
*/
2222
class Psr6Cache implements CacheInterface
2323
{
24-
/**
25-
* @var CacheItemPoolInterface
26-
*/
2724
private $cacheItemPool;
2825

2926
public function __construct(CacheItemPoolInterface $cacheItemPool)

Mapping/Loader/LoaderChain.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,12 @@ public function loadClassMetadata(ClassMetadata $metadata)
5656

5757
return $success;
5858
}
59+
60+
/**
61+
* @return LoaderInterface[]
62+
*/
63+
public function getLoaders()
64+
{
65+
return $this->loaders;
66+
}
5967
}

Tests/Constraints/FileTest.php

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
class FileTest extends TestCase
1919
{
2020
/**
21-
* @param mixed $maxSize
22-
* @param int $bytes
23-
* @param bool $binaryFormat
2421
* @dataProvider provideValidSizes
2522
*/
2623
public function testMaxSize($maxSize, $bytes, $binaryFormat)
@@ -33,10 +30,6 @@ public function testMaxSize($maxSize, $bytes, $binaryFormat)
3330

3431
/**
3532
* @dataProvider provideValidSizes
36-
*
37-
* @param int|string $maxSize
38-
* @param int $bytes
39-
* @param string $binaryFormat
4033
*/
4134
public function testMaxSizeCanBeSetAfterInitialization($maxSize, $bytes, $binaryFormat)
4235
{
@@ -50,8 +43,6 @@ public function testMaxSizeCanBeSetAfterInitialization($maxSize, $bytes, $binary
5043
/**
5144
* @dataProvider provideInvalidSizes
5245
* @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
53-
*
54-
* @param int|string $maxSize
5546
*/
5647
public function testInvalidValueForMaxSizeThrowsExceptionAfterInitialization($maxSize)
5748
{
@@ -61,8 +52,6 @@ public function testInvalidValueForMaxSizeThrowsExceptionAfterInitialization($ma
6152

6253
/**
6354
* @dataProvider provideInvalidSizes
64-
*
65-
* @param int|string $maxSize
6655
*/
6756
public function testMaxSizeCannotBeSetToInvalidValueAfterInitialization($maxSize)
6857
{
@@ -77,7 +66,6 @@ public function testMaxSizeCannotBeSetToInvalidValueAfterInitialization($maxSize
7766
}
7867

7968
/**
80-
* @param mixed $maxSize
8169
* @dataProvider provideInValidSizes
8270
* @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
8371
*/
@@ -86,9 +74,6 @@ public function testInvalidMaxSize($maxSize)
8674
new File(array('maxSize' => $maxSize));
8775
}
8876

89-
/**
90-
* @return array
91-
*/
9277
public function provideValidSizes()
9378
{
9479
return array(
@@ -105,9 +90,6 @@ public function provideValidSizes()
10590
);
10691
}
10792

108-
/**
109-
* @return array
110-
*/
11193
public function provideInvalidSizes()
11294
{
11395
return array(
@@ -121,9 +103,6 @@ public function provideInvalidSizes()
121103
}
122104

123105
/**
124-
* @param mixed $maxSize
125-
* @param bool $guessedFormat
126-
* @param bool $binaryFormat
127106
* @dataProvider provideFormats
128107
*/
129108
public function testBinaryFormat($maxSize, $guessedFormat, $binaryFormat)
@@ -133,9 +112,6 @@ public function testBinaryFormat($maxSize, $guessedFormat, $binaryFormat)
133112
$this->assertSame($binaryFormat, $file->binaryFormat);
134113
}
135114

136-
/**
137-
* @return array
138-
*/
139115
public function provideFormats()
140116
{
141117
return array(

0 commit comments

Comments
 (0)