Merge remote-tracking branch 'origin/develop' into develop

Author: cdujeu

core/src/core/classes/guzzle/vendor/symfony/config/Definition/ArrayNode.php

@@ -332,9 +332,7 @@ protected function normalizeValue($value)
      */
     protected function remapXml($value)
     {
-        foreach ($this->xmlRemappings as $transformation) {
-            list($singular, $plural) = $transformation;
-
+        foreach ($this->xmlRemappings as list($singular, $plural)) {
             if (!isset($value[$singular])) {
                 continue;
             }

core/src/core/classes/guzzle/vendor/symfony/config/Loader/FileLoader.php

@@ -101,13 +101,10 @@ public function import($resource, $type = null, $ignoreErrors = false, $sourceRe
 
             try {
                 $ret = $loader->load($resource, $type);
-            } catch (\Exception $e) {
+            } finally {
                 unset(self::$loading[$resource]);
-                throw $e;
             }
 
-            unset(self::$loading[$resource]);
-
             return $ret;
         } catch (FileLoaderImportCircularReferenceException $e) {
             throw $e;

core/src/core/classes/guzzle/vendor/symfony/config/Tests/Util/XmlUtilsTest.php

@@ -172,16 +172,11 @@ public function testLoadWrongEmptyXMLWithErrorHandler()
             } catch (\InvalidArgumentException $e) {
                 $this->assertEquals(sprintf('File %s does not contain valid XML, it is empty.', $file), $e->getMessage());
             }
-        } catch (\Exception $e) {
+        } finally {
             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);
 

core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/InlineTest.php

@@ -71,10 +71,8 @@ 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;
         }
     }
 

core/src/plugins/access.ajxp_conf/ajxp_confActions.xml

@@ -59,21 +59,11 @@
                 <serverCallback methodName="listAllActions" restParams="/" developerComment="Takes in input a list of plugin parameters and builds the corresponding XML to create a standard form."/>
             </processing>
         </action>
-        <action name="list_all_repositories">
-            <processing>
-                <serverCallback methodName="listAllActions" restParams="/" developerComment="Returns all repository (output format is XML)"/>
-            </processing>
-        </action>
         <action name="list_all_repositories_json">
             <processing>
                 <serverCallback methodName="listAllActions" restParams="/" developerComment="Returns all repository (output format is JSON)"/>
             </processing>
         </action>
-        <action name="list_all_users">
-            <processing>
-                <serverCallback methodName="listAllActions" restParams="/" developerComment="Returns all users"/>
-            </processing>
-        </action>
         <action name="generate_api_docs">
             <processing>
                 <serverCallback methodName="switchAction" restParams="/version" developerComment="Generate API docs">