Skip to content

Commit 6336efc

Browse files
Merge branch '3.4' into 4.3
* 3.4: [DependencyInjection] Fix broken references in tests Avoid using of kernel after shutdown Simplify PHP CS Fixer configuration [FrameworkBundle] [HttpKernel] fixed correct EOL and EOM month Fix MockFileSessionStorageTest::sessionDir being used after it's unset bumped Symfony version to 3.4.34 updated VERSION for 3.4.33 update CONTRIBUTORS for 3.4.33 updated CHANGELOG for 3.4.33 [Stopwatch] Fixed a bug in stopwatch event getStartTime [Stopwatch] Fixed bug in getDuration when counting multiple ongoing periods Adding some validations tags on validators.et.xlf add missing translation for 94 (it)
2 parents f93b420 + 3cb9879 commit 6336efc

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Command/AboutCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ private static function formatFileSize(string $path): string
122122

123123
private static function isExpired(string $date): bool
124124
{
125-
$date = \DateTime::createFromFormat('m/Y', $date);
125+
$date = \DateTime::createFromFormat('d/m/Y', '01/'.$date);
126126

127127
return false !== $date && new \DateTime() > $date->modify('last day of this month 23:59:59');
128128
}

Test/KernelTestCase.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ abstract class KernelTestCase extends TestCase
4040
private function doTearDown()
4141
{
4242
static::ensureKernelShutdown();
43+
static::$kernel = null;
4344
}
4445

4546
/**

0 commit comments

Comments
 (0)