Browse Source

Update deps

Jordi Boggiano 8 years ago
parent
commit
d694a3dc36

+ 0 - 0
app/Resources/FOSUserBundle/views/ChangePassword/changePassword_content.html.twig → app/Resources/FOSUserBundle/views/ChangePassword/change_password_content.html.twig


File diff suppressed because it is too large
+ 175 - 163
composer.lock


+ 6 - 6
src/Packagist/WebBundle/Tests/Controller/WebControllerTest.php

@@ -172,9 +172,9 @@ class WebControllerTest extends WebTestCase
      */
     public function testSearchOrderBysCombinationAction()
     {
-        $userMock = $this->getMock('Packagist\WebBundle\Entity\User');
-        $userMock1 = $this->getMock('Packagist\WebBundle\Entity\User');
-        $userMock2 = $this->getMock('Packagist\WebBundle\Entity\User');
+        $userMock = $this->createMock('Packagist\WebBundle\Entity\User');
+        $userMock1 = $this->createMock('Packagist\WebBundle\Entity\User');
+        $userMock2 = $this->createMock('Packagist\WebBundle\Entity\User');
 
         $userMock->method('getId')->will($this->returnValue(1));
         $userMock1->method('getId')->will($this->returnValue(2));
@@ -367,9 +367,9 @@ class WebControllerTest extends WebTestCase
     protected function commonTestSearchActionOrderBysFavers(
         array $orderBys = array()
     ) {
-        $userMock = $this->getMock('Packagist\WebBundle\Entity\User');
-        $userMock1 = $this->getMock('Packagist\WebBundle\Entity\User');
-        $userMock2 = $this->getMock('Packagist\WebBundle\Entity\User');
+        $userMock = $this->createMock('Packagist\WebBundle\Entity\User');
+        $userMock1 = $this->createMock('Packagist\WebBundle\Entity\User');
+        $userMock2 = $this->createMock('Packagist\WebBundle\Entity\User');
 
         $userMock->method('getId')->will($this->returnValue(1));
         $userMock1->method('getId')->will($this->returnValue(2));

Some files were not shown because too many files changed in this diff