Modifications after review

symfony · Mar 6, 2020 · d8bae7b · d8bae7b
1 parent cd61555
commit d8bae7b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/...onent/Config/Tests/Fixtures/Util/test.xml → ...nfig/Tests/Fixtures/Util/not_readable.xml b/...onent/Config/Tests/Fixtures/Util/test.xml → ...nfig/Tests/Fixtures/Util/not_readable.xml
diff --git a/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php b/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php
@@ -38,8 +38,8 @@ public function testLoadFile()
             if ('\\' === \DIRECTORY_SEPARATOR) {
                 $this->markTestSkipped('chmod is not supported on Windows');
             }
-            chmod($fixtures.'test.xml', 000);
-            XmlUtils::loadFile($fixtures.'test.xml');
+            chmod($fixtures.'not_readable.xml', 000);
+            XmlUtils::loadFile($fixtures.'not_readable.xml');
             $this->fail();
         } catch (\InvalidArgumentException $e) {
             $this->assertStringContainsString('is not readable', $e->getMessage());

diff --git a/src/Symfony/Component/Config/Util/XmlUtils.php b/src/Symfony/Component/Config/Util/XmlUtils.php
@@ -123,17 +123,17 @@ public static function parse($content, $schemaOrCallable = null)
     public static function loadFile($file, $schemaOrCallable = null)
     {
         if (!is_file($file)) {
-            throw new \InvalidArgumentException(sprintf('Resource %s is not a file.', $file));
+            throw new \InvalidArgumentException(sprintf('Resource "%s" is not a file.', $file));
         }
 
         if (!is_readable($file)) {
-            throw new \InvalidArgumentException(sprintf('File %s is not readable.', $file));
+            throw new \InvalidArgumentException(sprintf('File "%s" is not readable.', $file));
         }
 
-        $content = file_get_contents($file);
+        $content = @file_get_contents($file);
 
         if ('' === trim($content)) {
-            throw new \InvalidArgumentException(sprintf('File %s does not contain valid XML, it is empty.', $file));
+            throw new \InvalidArgumentException(sprintf('File "%s" does not contain valid XML, it is empty.', $file));
         }
 
         try {