code style changes

mmasiukevich · mmasiukevich · commit 1a6262cbbf91 · 2020-06-20T22:34:38.000+02:00
diff --git a/.php_cs.cache b/.php_cs.cache
diff --git a/src/Api/Method/InlineQuery/AnswerInlineQuery.php b/src/Api/Method/InlineQuery/AnswerInlineQuery.php
@@ -12,10 +12,10 @@
 
 namespace ServiceBus\TelegramBot\Api\Method\InlineQuery;
 
+use function ServiceBus\Common\jsonEncode;
 use ServiceBus\TelegramBot\Api\Type\InlineQueryResult\InlineQueryResult;
 use ServiceBus\TelegramBot\Api\Type\SimpleSuccessResponse;
 use ServiceBus\TelegramBot\Interaction\TelegramMethod;
-use function ServiceBus\Common\jsonEncode;
 
 /**
  * Send answers to an inline query. No more than 50 results per query are allowed.
diff --git a/src/Api/Method/Location/EditMessageLiveLocation.php b/src/Api/Method/Location/EditMessageLiveLocation.php
@@ -12,14 +12,14 @@
 
 namespace ServiceBus\TelegramBot\Api\Method\Location;
 
+use function ServiceBus\Common\jsonEncode;
 use ServiceBus\TelegramBot\Api\Type\Chat\ChatId;
 use ServiceBus\TelegramBot\Api\Type\Keyboard\InlineKeyboardMarkup;
 use ServiceBus\TelegramBot\Api\Type\Location\Location;
 use ServiceBus\TelegramBot\Api\Type\Message\InlineMessageId;
 use ServiceBus\TelegramBot\Api\Type\Message\Message;
 use ServiceBus\TelegramBot\Api\Type\Message\MessageId;
 use ServiceBus\TelegramBot\Interaction\TelegramMethod;
-use function ServiceBus\Common\jsonEncode;
 
 /**
  * Edit live location messages. A location can be edited until its live_period expires or editing is explicitly
diff --git a/src/Api/Method/Location/StopMessageLiveLocation.php b/src/Api/Method/Location/StopMessageLiveLocation.php
@@ -12,13 +12,13 @@
 
 namespace ServiceBus\TelegramBot\Api\Method\Location;
 
+use function ServiceBus\Common\jsonEncode;
 use ServiceBus\TelegramBot\Api\Type\Chat\ChatId;
 use ServiceBus\TelegramBot\Api\Type\Keyboard\InlineKeyboardMarkup;
 use ServiceBus\TelegramBot\Api\Type\Message\InlineMessageId;
 use ServiceBus\TelegramBot\Api\Type\Message\Message;
 use ServiceBus\TelegramBot\Api\Type\Message\MessageId;
 use ServiceBus\TelegramBot\Interaction\TelegramMethod;
-use function ServiceBus\Common\jsonEncode;
 
 /**
  * Stop updating a live location message before live_period expires.
diff --git a/src/Api/Method/Message/SendMediaGroup.php b/src/Api/Method/Message/SendMediaGroup.php
@@ -12,12 +12,12 @@
 
 namespace ServiceBus\TelegramBot\Api\Method\Message;
 
+use function ServiceBus\Common\jsonEncode;
 use ServiceBus\TelegramBot\Api\Type\Chat\ChatId;
 use ServiceBus\TelegramBot\Api\Type\InputMedia\InputMedia;
 use ServiceBus\TelegramBot\Api\Type\Message\Message;
 use ServiceBus\TelegramBot\Api\Type\Message\MessageId;
 use ServiceBus\TelegramBot\Interaction\TelegramMethod;
-use function ServiceBus\Common\jsonEncode;
 
 /**
  * Send a group of photos or videos as an album.
diff --git a/src/Api/Method/Poll/SendPoll.php b/src/Api/Method/Poll/SendPoll.php
@@ -12,9 +12,9 @@
 
 namespace ServiceBus\TelegramBot\Api\Method\Poll;
 
+use function ServiceBus\Common\jsonEncode;
 use ServiceBus\TelegramBot\Api\Method\SendEntity;
 use ServiceBus\TelegramBot\Api\Type\Chat\ChatId;
-use function ServiceBus\Common\jsonEncode;
 
 /**
  * Send a native poll.
diff --git a/src/Api/Method/SendEntity.php b/src/Api/Method/SendEntity.php
@@ -12,12 +12,12 @@
 
 namespace ServiceBus\TelegramBot\Api\Method;
 
+use function ServiceBus\Common\jsonEncode;
 use ServiceBus\TelegramBot\Api\Type\Chat\ChatId;
 use ServiceBus\TelegramBot\Api\Type\Message\Message;
 use ServiceBus\TelegramBot\Api\Type\Message\MessageId;
 use ServiceBus\TelegramBot\Api\Type\ReplayMarkup;
 use ServiceBus\TelegramBot\Interaction\TelegramMethod;
-use function ServiceBus\Common\jsonEncode;
 
 /**
  *
diff --git a/src/Api/Type/Message/Message.php b/src/Api/Type/Message/Message.php
@@ -392,9 +392,9 @@ final class Message
 
     public function isCommand(): bool
     {
-        foreach($this->entities as $entity)
+        foreach ($this->entities as $entity)
         {
-            if($entity->isCommand() === true)
+            if (true === $entity->isCommand())
             {
                 return true;
             }
diff --git a/src/Interaction/InteractionsProvider.php b/src/Interaction/InteractionsProvider.php
@@ -13,6 +13,7 @@
 namespace ServiceBus\TelegramBot\Interaction;
 
 use function Amp\call;
+use function ServiceBus\Common\jsonDecode;
 use Amp\Promise;
 use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\Annotations\AnnotationRegistry;
@@ -28,7 +29,6 @@
 use ServiceBus\TelegramBot\TelegramCredentials;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Component\Validator\ValidatorBuilder;
-use function ServiceBus\Common\jsonDecode;
 
 /**
  *
diff --git a/src/Serializer/Normalizers/ChatIdNormalizer.php b/src/Serializer/Normalizers/ChatIdNormalizer.php
@@ -49,7 +49,7 @@ public function supportsNormalization($data, string $format = null): bool
      */
     public function denormalize($data, string $type, string $format = null, array $context = []): ?ChatId
     {
-        if('' !== (string) $data)
+        if ('' !== (string) $data)
         {
             return new ChatId((string) $data);
         }
diff --git a/src/Serializer/Normalizers/EmptyDataNormalizer.php b/src/Serializer/Normalizers/EmptyDataNormalizer.php
@@ -40,14 +40,14 @@ public function normalize($object, string $format = null, array $context = [])
      */
     public function supportsNormalization($data, string $format = null): bool
     {
-        if (\is_object($data) === true)
+        if (true === \is_object($data))
         {
             $class = \get_class($data);
 
-            if (isset($this->localStorage[$class]) === false)
+            if (false === isset($this->localStorage[$class]))
             {
                 $this->localStorage[$class] = \array_map(
-                    static function (\ReflectionProperty $property): string
+                    static function(\ReflectionProperty $property): string
                     {
                         return (string) $property->name;
                     },
diff --git a/src/Serializer/Normalizers/EnumNormalizer.php b/src/Serializer/Normalizers/EnumNormalizer.php
@@ -49,7 +49,7 @@ public function supportsNormalization($data, string $format = null): bool
      */
     public function denormalize($data, string $type, string $format = null, array $context = []): ?Enum
     {
-        if('' !== $data)
+        if ('' !== $data)
         {
             /**
              * @noinspection PhpUndefinedMethodInspection
diff --git a/src/Serializer/Normalizers/MoneyNormalizer.php b/src/Serializer/Normalizers/MoneyNormalizer.php
@@ -53,13 +53,13 @@ public function supportsNormalization($data, string $format = null): bool
      */
     public function denormalize($data, string $type, string $format = null, array $context = []): ?Money
     {
-        if(isset($data['currency'], $data['total_amount']))
+        if (isset($data['currency'], $data['total_amount']))
         {
             try
             {
                 return new Money($data['total_amount'], new Currency($data['currency']));
             }
-            catch(\Throwable $throwable)
+            catch (\Throwable $throwable)
             {
             }
         }
diff --git a/src/Serializer/Normalizers/PropertyNameConverter.php b/src/Serializer/Normalizers/PropertyNameConverter.php
@@ -39,11 +39,11 @@ public function normalize(string $propertyName): string
      */
     public function denormalize(string $propertyName): string
     {
-        if (isset($this->localStorage[$propertyName]) === false)
+        if (false === isset($this->localStorage[$propertyName]))
         {
             $joinedString = \preg_replace_callback(
                 '/_(.?)/',
-                static function (array $matches): string
+                static function(array $matches): string
                 {
                     return \ucfirst((string) $matches[1]);
                 },
diff --git a/src/Serializer/Normalizers/PropertyNormalizerWrapper.php b/src/Serializer/Normalizers/PropertyNormalizerWrapper.php
@@ -47,7 +47,7 @@ protected function extractAttributes(object $object, string $format = null, arra
     {
         $class = \get_class($object);
 
-        if (\array_key_exists($class, $this->localStorage) === false)
+        if (false === \array_key_exists($class, $this->localStorage))
         {
             $this->localStorage[$class] = parent::extractAttributes($object, $format, $context);
         }
@@ -62,7 +62,7 @@ protected function extractAttributes(object $object, string $format = null, arra
      */
     protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = [])
     {
-        if (isset($object->{$attribute}) === true)
+        if (true === isset($object->{$attribute}))
         {
             return $object->{$attribute};
         }
@@ -73,7 +73,7 @@ protected function getAttributeValue(object $object, string $attribute, string $
         }
         catch (\Error $error)
         {
-            if (\strpos($error->getMessage(), 'must not be accessed before initialization') !== false)
+            if (false !== \strpos($error->getMessage(), 'must not be accessed before initialization'))
             {
                 return null;
             }
@@ -89,7 +89,7 @@ protected function getAttributeValue(object $object, string $attribute, string $
      */
     protected function setAttributeValue(object $object, string $attribute, $value, string $format = null, array $context = []): void
     {
-        if (isset($object->{$attribute}) === true)
+        if (true === isset($object->{$attribute}))
         {
             $object->{$attribute} = $value;
 
diff --git a/src/Serializer/SymfonySerializer.php b/src/Serializer/SymfonySerializer.php
@@ -61,7 +61,7 @@ public function decode(array $payload, string $toClass): object
     {
         try
         {
-            if(true === \is_a($toClass, \IteratorAggregate::class, true))
+            if (true === \is_a($toClass, \IteratorAggregate::class, true))
             {
                 $payload = ['list' => $payload];
             }
@@ -71,7 +71,7 @@ public function decode(array $payload, string $toClass): object
 
             return $object;
         }
-        catch(\Throwable $throwable)
+        catch (\Throwable $throwable)
         {
             throw new SerializationFailed($throwable->getMessage(), (int) $throwable->getCode(), $throwable);
         }
diff --git a/tests/Serializer/ChatMembersUpdateTest.php b/tests/Serializer/ChatMembersUpdateTest.php
@@ -12,6 +12,7 @@
 
 namespace ServiceBus\TelegramBot\Tests\Serializer;
 
+use function ServiceBus\Common\jsonDecode;
 use PHPUnit\Framework\TestCase;
 use ServiceBus\TelegramBot\Api\Type\Chat\ChatType;
 use ServiceBus\TelegramBot\Api\Type\Chat\JoinedChatMembers;
@@ -20,7 +21,6 @@
 use ServiceBus\TelegramBot\Api\Type\User\User;
 use ServiceBus\TelegramBot\Api\Type\User\UserCollection;
 use ServiceBus\TelegramBot\Serializer\SymfonySerializer;
-use function ServiceBus\Common\jsonDecode;
 
 /**
  *
diff --git a/tests/Serializer/MessagesUpdateTest.php b/tests/Serializer/MessagesUpdateTest.php
@@ -12,14 +12,14 @@
 
 namespace ServiceBus\TelegramBot\Tests\Serializer;
 
+use function ServiceBus\Common\jsonDecode;
 use PHPUnit\Framework\TestCase;
 use ServiceBus\TelegramBot\Api\Type\Chat\ChatType;
 use ServiceBus\TelegramBot\Api\Type\Common\UnixTime;
 use ServiceBus\TelegramBot\Api\Type\Message\Message;
 use ServiceBus\TelegramBot\Api\Type\Update;
 use ServiceBus\TelegramBot\Api\Type\User\User;
 use ServiceBus\TelegramBot\Serializer\SymfonySerializer;
-use function ServiceBus\Common\jsonDecode;
 
 /**
  *
diff --git a/tests/Serializer/PollUpdatesTest.php b/tests/Serializer/PollUpdatesTest.php
@@ -12,11 +12,11 @@
 
 namespace ServiceBus\TelegramBot\Tests\Serializer;
 
+use function ServiceBus\Common\jsonDecode;
 use PHPUnit\Framework\TestCase;
 use ServiceBus\TelegramBot\Api\Type\Poll\Poll;
 use ServiceBus\TelegramBot\Api\Type\Update;
 use ServiceBus\TelegramBot\Serializer\SymfonySerializer;
-use function ServiceBus\Common\jsonDecode;
 
 /**
  *

Original file line number	Diff line number	Diff line change
`@@ -392,9 +392,9 @@ final class Message`
`392`	`392`
`393`	`393`	`public function isCommand(): bool`
`394`	`394`	`{`
`395`		`- foreach($this->entities as $entity)`
	`395`	`+ foreach ($this->entities as $entity)`
`396`	`396`	`{`
`397`		`- if($entity->isCommand() === true)`
	`397`	`+ if (true === $entity->isCommand())`
`398`	`398`	`{`
`399`	`399`	`return true;`
`400`	`400`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function supportsNormalization($data, string $format = null): bool`
`49`	`49`	`*/`
`50`	`50`	`public function denormalize($data, string $type, string $format = null, array $context = []): ?ChatId`
`51`	`51`	`{`
`52`		`- if('' !== (string) $data)`
	`52`	`+ if ('' !== (string) $data)`
`53`	`53`	`{`
`54`	`54`	`return new ChatId((string) $data);`
`55`	`55`	`}`