PHP-CS-Fixer

DamienHarper · Feb 6, 2019 · c4fa773 · c4fa773
1 parent 00761bc
commit c4fa773
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 12 deletions.
diff --git a/src/DoctrineAuditBundle/AuditReader.php b/src/DoctrineAuditBundle/AuditReader.php
@@ -54,7 +54,7 @@ public function getConfiguration(): AuditConfiguration
      *
      * @return AuditReader
      */
-    public function filterBy(string $filter): AuditReader
+    public function filterBy(string $filter): self
     {
         if (!\in_array($filter, [self::UPDATE, self::ASSOCIATE, self::DISSOCIATE, self::INSERT, self::REMOVE], true)) {
             $this->filter = null;
@@ -98,7 +98,7 @@ public function getAudits($entity, int $id = null, int $page = 1, int $pageSize
     {
         $connection = $this->entityManager->getConnection();
 
-        $schema = isset($this->entityManager->getClassMetadata($entity)->table['schema']) ? $this->entityManager->getClassMetadata($entity)->table['schema'] . '.' : '';
+        $schema = isset($this->entityManager->getClassMetadata($entity)->table['schema']) ? $this->entityManager->getClassMetadata($entity)->table['schema'].'.' : '';
 
         $auditTable = implode('', [
             $schema,
@@ -143,7 +143,7 @@ public function getAudit($entity, int $id)
     {
         $connection = $this->entityManager->getConnection();
 
-        $schema = isset($this->entityManager->getClassMetadata($entity)->table['schema']) ? $this->entityManager->getClassMetadata($entity)->table['schema'] . '.' : '';
+        $schema = isset($this->entityManager->getClassMetadata($entity)->table['schema']) ? $this->entityManager->getClassMetadata($entity)->table['schema'].'.' : '';
 
         $auditTable = implode('', [
             $schema,

diff --git a/src/DoctrineAuditBundle/Command/CleanAuditLogsCommand.php b/src/DoctrineAuditBundle/Command/CleanAuditLogsCommand.php
@@ -78,13 +78,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
             "You are about to clean audits older than %d months (up to <comment>%s</comment>): %d entities involved.\n Do you want to proceed?",
             $input->getArgument('keep'),
             $until->format('Y-m-d'),
-            count($entities)
+            \count($entities)
         );
 
         $confirm = $input->getOption('no-confirm') ? true : $io->confirm($message, false);
 
         if ($confirm) {
-            $progressBar = new ProgressBar($output, count($entities));
+            $progressBar = new ProgressBar($output, \count($entities));
             $progressBar->setBarWidth(70);
             $progressBar->setFormat("%message%\n".$progressBar->getFormatDefinition('debug'));
 

diff --git a/src/DoctrineAuditBundle/Controller/AuditController.php b/src/DoctrineAuditBundle/Controller/AuditController.php
@@ -2,8 +2,8 @@
 
 namespace DH\DoctrineAuditBundle\Controller;
 
-use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Routing\Annotation\Route;
 
 class AuditController extends AbstractController
 {

diff --git a/src/DoctrineAuditBundle/EventSubscriber/AuditSubscriber.php b/src/DoctrineAuditBundle/EventSubscriber/AuditSubscriber.php
@@ -36,6 +36,7 @@ public function __construct(AuditConfiguration $configuration)
 
     /**
      * Handles soft-delete events from Gedmo\SoftDeleteable filter.
+     *
      * @see https://symfony.com/doc/current/bundles/StofDoctrineExtensionsBundle/index.html
      *
      * @param LifecycleEventArgs $args
@@ -489,13 +490,13 @@ private function value(EntityManager $em, Type $type, $value)
             case Type::INTEGER:
             case Type::SMALLINT:
                 $convertedValue = (string) $value;
-                break;
 
+                break;
             case Type::FLOAT:
             case Type::BOOLEAN:
                 $convertedValue = $type->convertToPHPValue($value, $platform);
-                break;
 
+                break;
             default:
                 $convertedValue = $type->convertToDatabaseValue($value, $platform);
         }

diff --git a/src/DoctrineAuditBundle/User/TokenStorageUserProvider.php b/src/DoctrineAuditBundle/User/TokenStorageUserProvider.php
@@ -2,9 +2,9 @@
 
 namespace DH\DoctrineAuditBundle\User;
 
+use Symfony\Component\Security\Core\Role\SwitchUserRole;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Security\Core\User\UserInterface as BaseUserInterface;
-use Symfony\Component\Security\Core\Role\SwitchUserRole;
 
 class TokenStorageUserProvider implements UserProviderInterface
 {
@@ -18,8 +18,8 @@ public function __construct(Security $security)
     public function getUser(): ?UserInterface
     {
         $user = null;
-
         $token = $this->security->getToken();
+
         if (null !== $token) {
             $tokenUser = $token->getUser();
             if ($tokenUser instanceof BaseUserInterface) {
@@ -28,6 +28,7 @@ public function getUser(): ?UserInterface
                     foreach ($this->security->getToken()->getRoles() as $role) {
                         if ($role instanceof SwitchUserRole) {
                             $impersonatorUser = $role->getSource()->getUser();
+
                             break;
                         }
                     }

diff --git a/src/DoctrineAuditBundle/User/User.php b/src/DoctrineAuditBundle/User/User.php
@@ -5,12 +5,12 @@
 class User implements UserInterface
 {
     /**
-     * @var int|null
+     * @var null|int
      */
     protected $id;
 
     /**
-     * @var string|null
+     * @var null|string
      */
     protected $username;
 

diff --git a/src/DoctrineAuditBundle/User/UserInterface.php b/src/DoctrineAuditBundle/User/UserInterface.php
@@ -5,5 +5,6 @@
 interface UserInterface
 {
     public function getId(): ?int;
+
     public function getUsername(): ?string;
 }