Fix latest merge

tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-setup.yml

@@ -182,4 +182,8 @@ xsendfile:
     enabled: false
     type: nginx
     mapping: []
+h264-pseudo-streaming:
+    enabled: false
+    type: nginx
+    mapping: []
 plugins: []

tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration.yml

@@ -182,4 +182,8 @@ xsendfile:
     enabled: false
     type: nginx
     mapping: []
+h264-pseudo-streaming:
+    enabled: false
+    type: nginx
+    mapping: []
 plugins: []

tests/Alchemy/Tests/Phrasea/Model/Manipulator/UserManipulatorTest.php

@@ -56,10 +56,16 @@ class UserManipulatorTest extends \PhraseanetTestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $geoname->expects($this->once())
+        $geoname->expects($this->any())
             ->method('get')
-            ->with($this->equalTo('country'))
+            ->will($this->returnCallback(function ($prop) {
-            ->will($this->returnValue(['code' => 'fr']));
+                switch ($prop) {
+                    case 'country':
+                        return ['code' => 'fr'];
+                    case 'name':
+                        return 'Orléans';
+                }
+            }));
 
         $geonamesConnector = $this->getMockBuilder('Alchemy\Geonames\Connector')
             ->disableOriginalConstructor()