Skip to content

Commit dde610f

Browse files
committed
Merge branch '4.1' into 4.2
* 4.1: Fix: Adjust DocBlock \"ParserTest->getParserTestData()\" -> only some more tests access the container getting it from the kernel [Lock] Pedantic improvements for lock [EventDispatcher] Fixed phpdoc on interface update year in license files [Console] Fix help text for single command applications Fix random test failure on lock improve error message when using test client without the BrowserKit component [Event Dispatcher] fixed 29703: TraceableEventDispatcher reset now sets callStack to null with test to dispatch after reset. Fixed minor typos Fix: Method can also return null [Stopwatch] Fixed phpdoc for category name
2 parents b405d16 + bc7d977 commit dde610f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2018 Fabien Potencier
1+
Copyright (c) 2004-2019 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

Loader/YamlFileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ private function parseDefinition($id, $service, $file, array $defaults)
565565
* @param string $id A service identifier
566566
* @param string $file A parsed file
567567
*
568-
* @throws InvalidArgumentException When errors are occuried
568+
* @throws InvalidArgumentException When errors occur
569569
*
570570
* @return string|array A parsed callable
571571
*/

0 commit comments

Comments
 (0)