mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-26 11:01:04 +00:00
Code Issues Projects Releases Wiki Activity

CS

Browse source
This commit is contained in:
Jeremy Benoist 2017-06-07 23:23:34 +02:00
parent 0c00e52516
commit eb570e49c8
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Wallabag/UserBundle/Entity/User.php
View file

@ -110,6 +110,8 @@ class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterf
private $trusted;
/**
* @var ArrayCollection
*
* @ORM\OneToMany(targetEntity="Wallabag\ApiBundle\Entity\Client", mappedBy="user", cascade={"remove"})
*/
protected $clients;
@ -306,10 +308,8 @@ class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterf
*/
public function getFirstClient()
{
if (empty($this->clients)) {
return $this->clients;
}
if (!empty($this->clients)) {
return $this->clients->first();
}
}
}

4
tests/Wallabag/AnnotationBundle/Controller/AnnotationControllerTest.php
View file

@ -85,7 +85,7 @@ class AnnotationControllerTest extends WallabagAnnotationTestCase
'text' => 'my annotation',
'quote' => 'my quote',
'ranges' => [
['start' => '', 'startOffset' => 24, 'end' => '', 'endOffset' => 31]
['start' => '', 'startOffset' => 24, 'end' => '', 'endOffset' => 31],
],
]);
$this->client->request('POST', $prefixUrl.'/'.$entry->getId().'.json', [], [], $headers, $content);
@ -130,7 +130,7 @@ class AnnotationControllerTest extends WallabagAnnotationTestCase
'text' => 'my annotation',
'quote' => $longQuote,
'ranges' => [
['start' => '', 'startOffset' => 24, 'end' => '', 'endOffset' => 31]
['start' => '', 'startOffset' => 24, 'end' => '', 'endOffset' => 31],
],
]);
$this->client->request('POST', $prefixUrl.'/'.$entry->getId().'.json', [], [], $headers, $content);

2
tests/Wallabag/CoreBundle/Command/ShowUserCommandTest.php
View file

@ -4,10 +4,8 @@ namespace Tests\Wallabag\CoreBundle\Command;
use Symfony\Bundle\FrameworkBundle\Console\Application;
use Symfony\Component\Console\Tester\CommandTester;
use Wallabag\CoreBundle\Command\CleanDuplicatesCommand;
use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
use Wallabag\CoreBundle\Command\ShowUserCommand;
use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\UserBundle\Entity\User;
class ShowUserCommandTest extends WallabagCoreTestCase