Manually fix symfony components to stick to php5.4 compliance. We may…

… have to bump php to 5.5 requirement in next version.
pydio · Jul 19, 2016 · c86f299 · c86f299
1 parent 71870b4
commit c86f299
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/ArrayNode.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/ArrayNode.php
@@ -332,7 +332,8 @@ protected function normalizeValue($value)
      */
     protected function remapXml($value)
     {
-        foreach ($this->xmlRemappings as list($singular, $plural)) {
+        foreach ($this->xmlRemappings as $transition) {
+            list($singular, $plural) = $transition;
             if (!isset($value[$singular])) {
                 continue;
             }

diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Loader/FileLoader.php b/core/src/core/classes/guzzle/vendor/symfony/config/Loader/FileLoader.php
@@ -101,10 +101,13 @@ public function import($resource, $type = null, $ignoreErrors = false, $sourceRe
 
             try {
                 $ret = $loader->load($resource, $type);
-            } finally {
+            } catch (\Exception $e) {
                 unset(self::$loading[$resource]);
+                throw $e;
             }
 
+                unset(self::$loading[$resource]);
+
             return $ret;
         } catch (FileLoaderImportCircularReferenceException $e) {
             throw $e;

diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Util/XmlUtilsTest.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Util/XmlUtilsTest.php
@@ -172,11 +172,16 @@ public function testLoadWrongEmptyXMLWithErrorHandler()
             } catch (\InvalidArgumentException $e) {
                 $this->assertEquals(sprintf('File %s does not contain valid XML, it is empty.', $file), $e->getMessage());
             }
-        } finally {
+        } catch (\Exception $e) {
             restore_error_handler();
             error_reporting($errorReporting);
+
+            throw $e;
         }
 
+            restore_error_handler();
+            error_reporting($errorReporting);
+
         $disableEntities = libxml_disable_entity_loader(true);
         libxml_disable_entity_loader($disableEntities);
 

diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/InlineTest.php b/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/InlineTest.php
@@ -71,8 +71,10 @@ public function testDumpNumericValueWithLocale()
 
             $this->assertEquals('1.2', Inline::dump(1.2));
             $this->assertContains('fr', strtolower(setlocale(LC_NUMERIC, 0)));
-        } finally {
             setlocale(LC_NUMERIC, $locale);
+        } catch (\Exception $e) {
+            setlocale(LC_NUMERIC, $locale);
+            throw $e;
         }
     }