add serializer bundle v3 (#2)

lamoda · Mar 12, 2020 · 12c850b · 12c850b
1 parent f7cf5b5
commit 12c850b
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 31 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,19 +1,32 @@
 language: php
-
+## php 7.1 isn't supported by jms/serialize
 php:
-- 7.1
 - 7.2
+- 7.3
+- 7.4
 - nightly
 
 sudo: false
 
+env:
+    matrix:
+        - DEPENDENCIES="high"
+        - DEPENDENCIES="low"
+    global:
+        - DEFAULT_COMPOSER_FLAGS="--prefer-dist --no-interaction --no-ansi --no-progress --no-suggest"
+
 matrix:
     fast_finish: true
     allow_failures:
     - php: nightly
 
 before_install:
-- travis_retry composer self-update
+    - travis_retry composer self-update
 
 install:
-- composer --prefer-dist install
+    - if [[ "$DEPENDENCIES" = 'high' ]]; then COMPOSER_MEMORY_LIMIT=-1 travis_retry composer update $DEFAULT_COMPOSER_FLAGS; fi
+    - if [[ "$DEPENDENCIES" = 'low' ]]; then COMPOSER_MEMORY_LIMIT=-1 travis_retry composer update $DEFAULT_COMPOSER_FLAGS --prefer-lowest; fi
+
+cache:
+    directories:
+        - $HOME/.composer/cache
diff --git a/composer.json b/composer.json
@@ -11,17 +11,17 @@
     ],
     "minimum-stability": "stable",
     "require": {
-        "php": "^7.1",
-        "lamoda/atol-client": "^1.0",
+        "php": "^7.2",
+        "lamoda/atol-client": "^1.2.0",
         "symfony/dependency-injection": "^3.4 || ^4.0",
         "symfony/http-kernel": "^3.4 || ^4.0",
         "symfony/config": "^3.4 || ^4.0",
         "symfony/yaml": "^3.4 || ^4.0",
-        "jms/serializer-bundle": "^2.3",
+        "jms/serializer-bundle": "^3.3",
         "guzzlehttp/guzzle": "^6.0"
     },
     "require-dev": {
-        "symfony/symfony": "~2.8 || ~3.4 || ~4.0",
+        "symfony/symfony": "~2.8 || ~3.4 || ^4.2.9",
         "phpunit/phpunit": "^5.7.10",
         "friendsofphp/php-cs-fixer": "^2.11"
     },
@@ -34,10 +34,5 @@
         "psr-4": {
             "Lamoda\\AtolClientBundle\\Tests\\": "tests/"
         }
-    },
-    "config": {
-        "platform": {
-            "php": "7.1"
-        }
     }
 }
diff --git a/src/Resources/config/services.yml b/src/Resources/config/services.yml
@@ -5,35 +5,26 @@ services:
   # JMS (de)serialze format: "atol_client".
   # $someValue <-> '"some_value"'.
   atol_client.serializer.visitor.deserialize.atol_client:
-    class: JMS\Serializer\JsonDeserializationVisitor
-    arguments: ['@atol_client.serializer.naming']
+    class: JMS\Serializer\Visitor\Factory\JsonDeserializationVisitorFactory
     tags: [{ name: 'jms_serializer.deserialization_visitor', format: 'atol_client' }]
 
   atol_client.serializer.visitor.serialize.atol_client:
-    class: JMS\Serializer\JsonSerializationVisitor
-    arguments: ['@atol_client.serializer.naming']
+    class: JMS\Serializer\Visitor\Factory\JsonSerializationVisitorFactory
     tags: [{ name: 'jms_serializer.serialization_visitor', format: 'atol_client' }]
 
   # (De)serialization object <-> array.
   atol_client.serializer.visitor.serialize.array:
-    class: JMS\Serializer\JsonSerializationVisitor
-    arguments: ['@atol_client.serializer.naming']
+    class: JMS\Serializer\Visitor\Factory\JsonSerializationVisitorFactory
     tags: [{ name: 'jms_serializer.serialization_visitor', format: 'atol_client' }]
 
   atol_client.serializer.visitor.deserialize.array:
-    class: JMS\Serializer\JsonDeserializationVisitor
-    arguments: ['@atol_client.serializer.naming']
+    class: JMS\Serializer\Visitor\Factory\JsonDeserializationVisitorFactory
     tags: [{ name: 'jms_serializer.deserialization_visitor', format: 'atol_client' }]
 
   atol_client.validator.attributes:
     class: Lamoda\AtolClient\V3\Validator\EmailOrPhoneValidator
     tags: [{ name: validator.constraint_validator }]
 
-  # $someValue <-> 'some_value':
-  atol_client.serializer.naming:
-      class: "%jms_serializer.serialized_name_annotation_strategy.class%"
-      arguments: ["@jms_serializer.camel_case_naming_strategy"]
-
   # Converts request and response from and to json.
   atol_client.object_converter:
     class: Lamoda\AtolClient\Converter\ObjectConverter

diff --git a/tests/App/config/config_multiple_clients.yaml b/tests/App/config/config_multiple_clients.yaml
@@ -25,6 +25,12 @@ atol_client:
             callback_url: null
 
 services:
-    test.atol_client.v3: '@atol_client.v3.default'
-    test.atol_client.v3.second: '@atol_client.v3.second'
-    test.atol_client.v4.third: '@atol_client.v4.third'
+    test.atol_client.v3:
+        alias: 'atol_client.v3.default'
+        public: true
+    test.atol_client.v3.second:
+        alias: 'atol_client.v3.second'
+        public: true
+    test.atol_client.v4.third:
+        alias: 'atol_client.v4.third'
+        public: true
diff --git a/tests/App/config/config_single_client_v3.yaml b/tests/App/config/config_single_client_v3.yaml
@@ -7,4 +7,6 @@ atol_client:
     callback_url: null
 
 services:
-    test.atol_client.v3: '@atol_client.v3'
+    test.atol_client.v3:
+        alias: 'atol_client.v3'
+        public: true
diff --git a/tests/App/config/config_single_client_v4.yaml b/tests/App/config/config_single_client_v4.yaml
@@ -7,4 +7,6 @@ atol_client:
     callback_url: null
 
 services:
-    test.atol_client.v4: '@atol_client.v4'
+    test.atol_client.v4:
+        alias: 'atol_client.v4'
+        public: true