mirrors/shlink
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2025-02-20 01:09:56 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fixed PHPStan errors due to API inconsistency in EntityManager and EntityManagerInterface

Browse source
This commit is contained in:
Alejandro Celaya 2017-12-27 17:22:51 +01:00
parent ea80b6d48a
commit 2012cc453c
2 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
module/Core/src/Service/Tag/TagService.php
View file

@ -4,8 +4,7 @@ declare(strict_types=1);
namespace Shlinkio\Shlink\Core\Service\Tag; namespace Shlinkio\Shlink\Core\Service\Tag;
use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\Collection;
use Doctrine\ORM\EntityManager; use Doctrine\ORM;
use Doctrine\ORM\EntityManagerInterface;
use Shlinkio\Shlink\Core\Entity\Tag; use Shlinkio\Shlink\Core\Entity\Tag;
use Shlinkio\Shlink\Core\Exception\EntityDoesNotExistException; use Shlinkio\Shlink\Core\Exception\EntityDoesNotExistException;
use Shlinkio\Shlink\Core\Repository\TagRepository; use Shlinkio\Shlink\Core\Repository\TagRepository;
@ -16,11 +15,11 @@ class TagService implements TagServiceInterface
use TagManagerTrait; use TagManagerTrait;
/** /**
* @var EntityManager|EntityManagerInterface * @var ORM\EntityManagerInterface
*/ */
private $em; private $em;
public function __construct(EntityManagerInterface $em) public function __construct(ORM\EntityManagerInterface $em)
{ {
$this->em = $em; $this->em = $em;
} }
@ -64,6 +63,7 @@ class TagService implements TagServiceInterface
* @param string $newName * @param string $newName
* @return Tag * @return Tag
* @throws EntityDoesNotExistException * @throws EntityDoesNotExistException
* @throws ORM\OptimisticLockException
*/ */
public function renameTag($oldName, $newName) public function renameTag($oldName, $newName)
{ {
@ -75,7 +75,10 @@ class TagService implements TagServiceInterface
} }
$tag->setName($newName); $tag->setName($newName);
$this->em->flush($tag);
/** @var ORM\EntityManager $em */
$em = $this->em;
$em->flush($tag);
return $tag; return $tag;
} }

15
module/Core/src/Service/VisitsTracker.php
View file

@ -3,8 +3,7 @@ declare(strict_types=1);
namespace Shlinkio\Shlink\Core\Service; namespace Shlinkio\Shlink\Core\Service;
use Doctrine\ORM\EntityManager; use Doctrine\ORM;
use Doctrine\ORM\EntityManagerInterface;
use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\ServerRequestInterface;
use Shlinkio\Shlink\Common\Exception\InvalidArgumentException; use Shlinkio\Shlink\Common\Exception\InvalidArgumentException;
use Shlinkio\Shlink\Common\Util\DateRange; use Shlinkio\Shlink\Common\Util\DateRange;
@ -15,11 +14,11 @@ use Shlinkio\Shlink\Core\Repository\VisitRepository;
class VisitsTracker implements VisitsTrackerInterface class VisitsTracker implements VisitsTrackerInterface
{ {
/** /**
* @var EntityManager|EntityManagerInterface * @var ORM\EntityManagerInterface
*/ */
private $em; private $em;
public function __construct(EntityManagerInterface $em) public function __construct(ORM\EntityManagerInterface $em)
{ {
$this->em = $em; $this->em = $em;
} }
@ -29,6 +28,8 @@ class VisitsTracker implements VisitsTrackerInterface
* *
* @param string $shortCode * @param string $shortCode
* @param ServerRequestInterface $request * @param ServerRequestInterface $request
* @throws ORM\ORMInvalidArgumentException
* @throws ORM\OptimisticLockException
*/ */
public function track($shortCode, ServerRequestInterface $request) public function track($shortCode, ServerRequestInterface $request)
{ {
@ -43,8 +44,10 @@ class VisitsTracker implements VisitsTrackerInterface
->setReferer($request->getHeaderLine('Referer')) ->setReferer($request->getHeaderLine('Referer'))
->setRemoteAddr($this->findOutRemoteAddr($request)); ->setRemoteAddr($this->findOutRemoteAddr($request));
$this->em->persist($visit); /** @var ORM\EntityManager $em */
$this->em->flush($visit); $em = $this->em;
$em->persist($visit);
$em->flush($visit);
} }
/** /**