Update php version (#20)

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: ['7.1', '7.2', '7.3']
+        php-version: ['7.2', '7.3', '7.4', '8.0']
     steps:
       - uses: actions/checkout@v2
       - name: Setup PHP ${{ matrix.php-version }}

composer.json

@@ -12,21 +12,22 @@
         }
     ],
     "require": {
-        "php": ">=7.1",
+        "php": ">=7.2.5",
         "ext-curl": "*",
         "ext-json": "*",
-        "jms/serializer": "1.14.*",
+        "jms/serializer": "3.*",
-        "symfony/validator": "4.3.*",
+        "symfony/validator": "5.4.*",
-        "doctrine/annotations": "1.12.*",
+        "doctrine/annotations": "1.13.*",
         "doctrine/cache": "1.11.*",
-        "guzzlehttp/guzzle": "6.*"
+        "guzzlehttp/guzzle": "6.*",
+        "symfony/intl": "^5.4"
     },
     "require-dev": {
         "phpmd/phpmd": "2.*",
         "squizlabs/php_codesniffer": "3.4.*",
-        "symfony/dotenv": "4.3.*",
+        "symfony/dotenv": "5.4.*",
-        "phpunit/phpunit": "7.*",
+        "phpunit/phpunit": "8.5.*",
-        "phpstan/phpstan": "0.11.*"
+        "phpstan/phpstan": "0.12.*"
     },
     "support": {
         "email": "support@retailcrm.pro"

phpstan.neon

@@ -1,6 +1,7 @@
+includes:
+	- phpstan-baseline.neon
+
 parameters:
-    autoload_files:
-        - %currentWorkingDirectory%/vendor/autoload.php
     level: 7
     paths:
         - %currentWorkingDirectory%/src

src/Bot/HttpClient.php

@@ -232,7 +232,7 @@ class HttpClient
             $message = '';
 
             foreach ($errors as $error) {
-                $message .= (string)$error;
+                $message .= $error->getMessage();
             }
 
             throw new InvalidArgumentException($message);

src/Bot/Model/Entity/Channel/Channel.php

@@ -233,7 +233,7 @@ class Channel implements ModelInterface
     /**
      * @param string $name
      */
-    public function setName(string $name)
+    public function setName($name)
     {
         $this->name = $name;
     }

src/Serializer.php

@@ -40,14 +40,16 @@ class Serializer
         $serializer = SerializerBuilder::create()->build();
         $context = self::getContext(false);
 
-        switch ($serialize) {
+        if ($context instanceof SerializationContext) {
-            case self::S_ARRAY:
+            switch ($serialize) {
-                $serialized = $serializer->toArray($request, $context);
+                case self::S_ARRAY:
-                break;
+                    $serialized = $serializer->toArray($request, $context);
-            case self::S_JSON:
+                    break;
-            default:
+                case self::S_JSON:
-                $serialized = $serializer->serialize($request, $serialize, $context);
+                default:
-                break;
+                    $serialized = $serializer->serialize($request, $serialize, $context);
+                    break;
+            }
         }
 
         return $serialized;
@@ -68,15 +70,17 @@ class Serializer
         $serializer = SerializerBuilder::create()->build();
         $context = self::getContext(true);
 
-        switch ($from) {
+        if ($context instanceof DeserializationContext) {
-            case self::S_ARRAY:
+            switch ($from) {
-                $deserialized = $serializer
+                case self::S_ARRAY:
-                    ->fromArray(array_filter($data), self::normalizeNamespace($entityType), $context);
+                    $deserialized = $serializer
-                break;
+                        ->fromArray(array_filter($data), self::normalizeNamespace($entityType), $context);
-            case self::S_JSON:
+                    break;
-                $deserialized = $serializer
+                case self::S_JSON:
-                    ->deserialize($data, self::normalizeNamespace($entityType), $from, $context);
+                    $deserialized = $serializer
-                break;
+                        ->deserialize($data, self::normalizeNamespace($entityType), $from, $context);
+                    break;
+            }
         }
 
         return $deserialized instanceof ModelInterface ? $deserialized : new ErrorOnlyResponse();
@@ -93,9 +97,9 @@ class Serializer
             $context = new DeserializationContext();
         } else {
             $context = new SerializationContext();
-        }
 
-        $context->setSerializeNull(false);
+            $context->setSerializeNull(false);
+        }
 
         return $context;
     }
@@ -103,7 +107,7 @@ class Serializer
     /**
      * @param string $namespace
      *
-     * @return bool|string
+     * @return string
      */
     private static function normalizeNamespace(string $namespace)
     {

tests/bootstrap.php

@@ -14,6 +14,7 @@ use Symfony\Component\Dotenv\Dotenv;
 $dotenv = new Dotenv();
 
 try {
+    $dotenv->usePutenv(true);
     $dotenv->load(__DIR__ . '/../.env');
 } catch (Exception $exception) {
     echo "WARNING: Can't load .env file. Using default environment.";