Pull merge.

[yaffs-website] / vendor / symfony / config / Tests / FileLocatorTest.php

diff --git a/vendor/symfony/config/Tests/FileLocatorTest.php b/vendor/symfony/config/Tests/FileLocatorTest.php
index 5b69f452697b4a82c73735d4f89d49a3f8049451..71205041315252dcee7f4df9d91fa616febb82ff 100644 (file)
--- a/vendor/symfony/config/Tests/FileLocatorTest.php
+++ b/vendor/symfony/config/Tests/FileLocatorTest.php
@@ -46,33 +46,33 @@ class FileLocatorTest extends TestCase
         $loader = new FileLocator(__DIR__.'/Fixtures');
 
         $this->assertEquals(
-            __DIR__.DIRECTORY_SEPARATOR.'FileLocatorTest.php',
+            __DIR__.\DIRECTORY_SEPARATOR.'FileLocatorTest.php',
             $loader->locate('FileLocatorTest.php', __DIR__),
             '->locate() returns the absolute filename if the file exists in the given path'
         );
 
         $this->assertEquals(
-            __DIR__.'/Fixtures'.DIRECTORY_SEPARATOR.'foo.xml',
+            __DIR__.'/Fixtures'.\DIRECTORY_SEPARATOR.'foo.xml',
             $loader->locate('foo.xml', __DIR__),
             '->locate() returns the absolute filename if the file exists in one of the paths given in the constructor'
         );
 
         $this->assertEquals(
-            __DIR__.'/Fixtures'.DIRECTORY_SEPARATOR.'foo.xml',
-            $loader->locate(__DIR__.'/Fixtures'.DIRECTORY_SEPARATOR.'foo.xml', __DIR__),
+            __DIR__.'/Fixtures'.\DIRECTORY_SEPARATOR.'foo.xml',
+            $loader->locate(__DIR__.'/Fixtures'.\DIRECTORY_SEPARATOR.'foo.xml', __DIR__),
             '->locate() returns the absolute filename if the file exists in one of the paths given in the constructor'
         );
 
         $loader = new FileLocator(array(__DIR__.'/Fixtures', __DIR__.'/Fixtures/Again'));
 
         $this->assertEquals(
-            array(__DIR__.'/Fixtures'.DIRECTORY_SEPARATOR.'foo.xml', __DIR__.'/Fixtures/Again'.DIRECTORY_SEPARATOR.'foo.xml'),
+            array(__DIR__.'/Fixtures'.\DIRECTORY_SEPARATOR.'foo.xml', __DIR__.'/Fixtures/Again'.\DIRECTORY_SEPARATOR.'foo.xml'),
             $loader->locate('foo.xml', __DIR__, false),
             '->locate() returns an array of absolute filenames'
         );
 
         $this->assertEquals(
-            array(__DIR__.'/Fixtures'.DIRECTORY_SEPARATOR.'foo.xml', __DIR__.'/Fixtures/Again'.DIRECTORY_SEPARATOR.'foo.xml'),
+            array(__DIR__.'/Fixtures'.\DIRECTORY_SEPARATOR.'foo.xml', __DIR__.'/Fixtures/Again'.\DIRECTORY_SEPARATOR.'foo.xml'),
             $loader->locate('foo.xml', __DIR__.'/Fixtures', false),
             '->locate() returns an array of absolute filenames'
         );
@@ -80,14 +80,14 @@ class FileLocatorTest extends TestCase
         $loader = new FileLocator(__DIR__.'/Fixtures/Again');
 
         $this->assertEquals(
-            array(__DIR__.'/Fixtures'.DIRECTORY_SEPARATOR.'foo.xml', __DIR__.'/Fixtures/Again'.DIRECTORY_SEPARATOR.'foo.xml'),
+            array(__DIR__.'/Fixtures'.\DIRECTORY_SEPARATOR.'foo.xml', __DIR__.'/Fixtures/Again'.\DIRECTORY_SEPARATOR.'foo.xml'),
             $loader->locate('foo.xml', __DIR__.'/Fixtures', false),
             '->locate() returns an array of absolute filenames'
         );
     }
 
     /**
-     * @expectedException \InvalidArgumentException
+     * @expectedException \Symfony\Component\Config\Exception\FileLocatorFileNotFoundException
      * @expectedExceptionMessage The file "foobar.xml" does not exist
      */
     public function testLocateThrowsAnExceptionIfTheFileDoesNotExists()
@@ -98,7 +98,7 @@ class FileLocatorTest extends TestCase
     }
 
     /**
-     * @expectedException \InvalidArgumentException
+     * @expectedException \Symfony\Component\Config\Exception\FileLocatorFileNotFoundException
      */
     public function testLocateThrowsAnExceptionIfTheFileDoesNotExistsInAbsolutePath()
     {