fix leftover changes from previous merge

2015-09-09 19:53:06 +02:00 · 2015-09-09 19:53:06 +02:00 · b38e448f42
commit b38e448f42
parent 7c3748ce01
2 changed files with 1 additions and 3 deletions
--- a/src/Symfony/Component/Intl/Resources/stubs/Collator.php
+++ b/src/Symfony/Component/Intl/Resources/stubs/Collator.php
@ -15,8 +15,6 @@ use Symfony\Component\Intl\Collator\Collator as IntlCollator;
 * Stub implementation for the Collator class of the intl extension.
 *
 * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @see StubCollator
 */
 class Collator extends IntlCollator
 {
--- a/src/Symfony/Component/Security/Http/Tests/RememberMe/AbstractRememberMeServicesTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/RememberMe/AbstractRememberMeServicesTest.php
@ -250,7 +250,7 @@ class AbstractRememberMeServicesTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
     * @expectedExceptionMessage cookie delimiter
     */
    public function testThereShouldBeNoCookieDelimiterInCookieParts()