Permalink
Browse files

Merge branch '2.2' into 2.3

* 2.2:
  fixed some typos
  fixed @expectedException class names

Conflicts:
	src/Symfony/Component/Config/Tests/Definition/ArrayNodeTest.php
	src/Symfony/Component/Console/Tests/Command/CommandTest.php
	src/Symfony/Component/Locale/Tests/Stub/StubLocaleTest.php
	src/Symfony/Component/Locale/Tests/Stub/StubNumberFormatterTest.php
  • Loading branch information...
fabpot committed Nov 25, 2013
2 parents e5f3ef7 + 0a5217e commit 181f15a84fcf4d58685f884e3fd8b415b99fe94b
Showing with 1 addition and 1 deletion.
  1. +1 −1 Tests/ClassCollectionLoaderTest.php
@@ -189,7 +189,7 @@ public function getFixNamespaceDeclarationsDataWithoutTokenizer()
}
/**
- * @expectedException InvalidArgumentException
+ * @expectedException \InvalidArgumentException
*/
public function testUnableToLoadClassException()
{

0 comments on commit 181f15a

Please sign in to comment.