Merge branch '2.3' into 2.4

fabpot · fabpot · commit 924d06adf680 · 2014-09-23T07:24:59.000+02:00
* 2.3:
  typo fixed in AbstractProcessTest (getoutput() =&gt; getOutput())
  Avoid question mark and asterisk in folder names to prevent windows filesystem issues.
  [Translation] [Config] Clear libxml errors after parsing XML file

Conflicts:
	src/Symfony/Component/Config/Util/XmlUtils.php
diff --git a/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php b/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php
@@ -58,6 +58,16 @@ public function testLoadFile()
         }
 
         $this->assertInstanceOf('DOMDocument', XmlUtils::loadFile($fixtures.'valid.xml', array($mock, 'validate')));
+        $this->assertSame(array(), libxml_get_errors());
+    }
+
+    public function testLoadFileWithInternalErrorsEnabled()
+    {
+        libxml_use_internal_errors(true);
+
+        $this->assertSame(array(), libxml_get_errors());
+        $this->assertInstanceOf('DOMDocument', XmlUtils::loadFile(__DIR__.'/../Fixtures/Util/invalid_schema.xml'));
+        $this->assertSame(array(), libxml_get_errors());
     }
 
     /**
diff --git a/src/Symfony/Component/Config/Util/XmlUtils.php b/src/Symfony/Component/Config/Util/XmlUtils.php
@@ -95,10 +95,11 @@ public static function loadFile($file, $schemaOrCallable = null)
                 }
                 throw new \InvalidArgumentException(implode("\n", $messages), 0, $e);
             }
-
-            libxml_use_internal_errors($internalErrors);
         }
 
+        libxml_clear_errors();
+        libxml_use_internal_errors($internalErrors);
+
         return $dom;
     }
 
diff --git a/src/Symfony/Component/Finder/Tests/FinderTest.php b/src/Symfony/Component/Finder/Tests/FinderTest.php
@@ -575,11 +575,11 @@ public function testIteratorKeys(Adapter\AdapterInterface $adapter)
     public function testRegexSpecialCharsLocationWithPathRestrictionContainingStartFlag(Adapter\AdapterInterface $adapter)
     {
         $finder = $this->buildFinder($adapter);
-        $finder->in(__DIR__.DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'r+e.g?e*x[c]a(r)s')
+        $finder->in(__DIR__.DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'r+e.gex[c]a(r)s')
             ->path('/^dir/');
 
-        $expected = array('r+e.g?e*x[c]a(r)s'.DIRECTORY_SEPARATOR.'dir',
-                          'r+e.g?e*x[c]a(r)s'.DIRECTORY_SEPARATOR.'dir'.DIRECTORY_SEPARATOR.'bar.dat',);
+        $expected = array('r+e.gex[c]a(r)s'.DIRECTORY_SEPARATOR.'dir',
+                          'r+e.gex[c]a(r)s'.DIRECTORY_SEPARATOR.'dir'.DIRECTORY_SEPARATOR.'bar.dat',);
         $this->assertIterator($this->toAbsoluteFixtures($expected), $finder);
     }
 
diff --git a/src/Symfony/Component/Finder/Tests/Fixtures/r+e.gex[c]a(r)s/dir/bar.dat b/src/Symfony/Component/Finder/Tests/Fixtures/r+e.gex[c]a(r)s/dir/bar.dat
diff --git a/src/Symfony/Component/Process/Tests/AbstractProcessTest.php b/src/Symfony/Component/Process/Tests/AbstractProcessTest.php
@@ -763,7 +763,7 @@ public function testSignal()
         usleep(500000);
         $process->signal(SIGUSR1);
 
-        while ($process->isRunning() && false === strpos($process->getoutput(), 'Caught SIGUSR1')) {
+        while ($process->isRunning() && false === strpos($process->getOutput(), 'Caught SIGUSR1')) {
             usleep(10000);
         }
 
diff --git a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php
@@ -116,6 +116,7 @@ private function parseFile($file)
 
         $dom->normalizeDocument();
 
+        libxml_clear_errors();
         libxml_use_internal_errors($internalErrors);
 
         return array(simplexml_import_dom($dom), strtoupper($dom->encoding));
@@ -124,7 +125,7 @@ private function parseFile($file)
     /**
      * Returns the XML errors of the internal XML parser
      *
-     * @param bool    $internalErrors
+     * @param bool $internalErrors
      *
      * @return array An array of errors
      */
diff --git a/src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php
@@ -24,6 +24,22 @@ public function testLoad()
 
         $this->assertEquals('en', $catalogue->getLocale());
         $this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());
+        $this->assertSame(array(), libxml_get_errors());
+    }
+
+    public function testLoadWithInternalErrorsEnabled()
+    {
+        libxml_use_internal_errors(true);
+
+        $this->assertSame(array(), libxml_get_errors());
+
+        $loader = new XliffFileLoader();
+        $resource = __DIR__.'/../fixtures/resources.xlf';
+        $catalogue = $loader->load($resource, 'en', 'domain1');
+
+        $this->assertEquals('en', $catalogue->getLocale());
+        $this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());
+        $this->assertSame(array(), libxml_get_errors());
     }
 
     public function testLoadWithResname()

Original file line number	Diff line number	Diff line change
`@@ -95,10 +95,11 @@ public static function loadFile($file, $schemaOrCallable = null)`
`95`	`95`	`}`
`96`	`96`	`throw new \InvalidArgumentException(implode("\n", $messages), 0, $e);`
`97`	`97`	`}`
`98`		`-`
`99`		`- libxml_use_internal_errors($internalErrors);`
`100`	`98`	`}`
`101`	`99`
	`100`	`+ libxml_clear_errors();`
	`101`	`+ libxml_use_internal_errors($internalErrors);`
	`102`	`+`
`102`	`103`	`return $dom;`
`103`	`104`	`}`
`104`	`105`
Original file line number	Diff line number	Diff line change
`@@ -575,11 +575,11 @@ public function testIteratorKeys(Adapter\AdapterInterface $adapter)`
`575`	`575`	`public function testRegexSpecialCharsLocationWithPathRestrictionContainingStartFlag(Adapter\AdapterInterface $adapter)`
`576`	`576`	`{`
`577`	`577`	`$finder = $this->buildFinder($adapter);`
`578`		`- $finder->in(__DIR__.DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'r+e.g?e*x[c]a(r)s')`
	`578`	`+ $finder->in(__DIR__.DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'r+e.gex[c]a(r)s')`
`579`	`579`	`->path('/^dir/');`
`580`	`580`
`581`		`- $expected = array('r+e.g?e*x[c]a(r)s'.DIRECTORY_SEPARATOR.'dir',`
`582`		`- 'r+e.g?e*x[c]a(r)s'.DIRECTORY_SEPARATOR.'dir'.DIRECTORY_SEPARATOR.'bar.dat',);`
	`581`	`+ $expected = array('r+e.gex[c]a(r)s'.DIRECTORY_SEPARATOR.'dir',`
	`582`	`+ 'r+e.gex[c]a(r)s'.DIRECTORY_SEPARATOR.'dir'.DIRECTORY_SEPARATOR.'bar.dat',);`
`583`	`583`	`$this->assertIterator($this->toAbsoluteFixtures($expected), $finder);`
`584`	`584`	`}`
`585`	`585`
Original file line number	Diff line number	Diff line change
`@@ -763,7 +763,7 @@ public function testSignal()`
`763`	`763`	`usleep(500000);`
`764`	`764`	`$process->signal(SIGUSR1);`
`765`	`765`
`766`		`- while ($process->isRunning() && false === strpos($process->getoutput(), 'Caught SIGUSR1')) {`
	`766`	`+ while ($process->isRunning() && false === strpos($process->getOutput(), 'Caught SIGUSR1')) {`
`767`	`767`	`usleep(10000);`
`768`	`768`	`}`
`769`	`769`
Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,7 @@ private function parseFile($file)`
`116`	`116`
`117`	`117`	`$dom->normalizeDocument();`
`118`	`118`
	`119`	`+ libxml_clear_errors();`
`119`	`120`	`libxml_use_internal_errors($internalErrors);`
`120`	`121`
`121`	`122`	`return array(simplexml_import_dom($dom), strtoupper($dom->encoding));`
`@@ -124,7 +125,7 @@ private function parseFile($file)`
`124`	`125`	`/**`
`125`	`126`	`* Returns the XML errors of the internal XML parser`
`126`	`127`	`*`
`127`		`- * @param bool $internalErrors`
	`128`	`+ * @param bool $internalErrors`
`128`	`129`	`*`
`129`	`130`	`* @return array An array of errors`
`130`	`131`	`*/`