Luciano Andrade 7 rokov pred
rodič
commit
f8dffed229
2 zmenil súbory, kde vykonal 86 pridanie a 58 odobranie
  1. 5 2
      composer.json
  2. 81 56
      composer.lock

+ 5 - 2
composer.json

@@ -138,7 +138,8 @@
         "ik/webservice-bundle": "dev-workflow_update",
         "ik/workflow-bundle": "dev-workflow_update",
         "incenteev/composer-parameter-handler": "^2.0",
-        "jms/serializer-bundle": "^1.1",
+        "jms/serializer": "^1.9.0",
+        "jms/serializer-bundle": "^1.5.0",
         "php-amqplib/rabbitmq-bundle": "^1.12",
         "sensio/distribution-bundle": "^5.0.21",
         "sensio/framework-extra-bundle": "^3.0.2",
@@ -150,10 +151,12 @@
         "symfony/swiftmailer-bundle": "^2.3.10",
         "symfony/symfony": "3.3.*",
         "symfony/web-server-bundle": "^3.3",
+        "twig/extensions": "^1.5",
+        "twig/twig": "^2.0",
         "voryx/restgeneratorbundle": "dev-master"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.3.0",
+        "phpunit/phpunit": "^6.4",
         "sensio/generator-bundle": "^3.0",
         "symfony/phpunit-bridge": "^3.3"
     },

+ 81 - 56
composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "a9c13a43b7ddad1a3f7449179d243470",
+    "content-hash": "1d1ff0d480e691e7b5e3ecd7f2cae78c",
     "packages": [
         {
             "name": "behat/transliterator",
@@ -1861,46 +1861,55 @@
         },
         {
             "name": "jms/serializer",
-            "version": "1.0.0",
+            "version": "1.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/schmittjoh/serializer.git",
-                "reference": "a29d9a204efc3ca3f39a9d182a83fd34462fef3f"
+                "reference": "f4683f41ebf21e60667447bb49939bee35807c3c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://satis.infra.flowdat.com/dist/jms/serializer/jms-serializer-a29d9a204efc3ca3f39a9d182a83fd34462fef3f-zip-ba514d.zip",
-                "reference": "a29d9a204efc3ca3f39a9d182a83fd34462fef3f",
-                "shasum": "81030d6006d9ea9825f1f130edacfcb0d926a9ca"
+                "url": "https://satis.infra.flowdat.com/dist/jms/serializer/jms-serializer-f4683f41ebf21e60667447bb49939bee35807c3c-zip-c27e23.zip",
+                "reference": "f4683f41ebf21e60667447bb49939bee35807c3c",
+                "shasum": "d9e20c4edc52c75590b759106047ef76a8a95134"
             },
             "require": {
-                "doctrine/annotations": "1.*",
-                "doctrine/instantiator": "~1.0.3",
+                "doctrine/annotations": "^1.0",
+                "doctrine/instantiator": "^1.0.3",
                 "jms/metadata": "~1.1",
                 "jms/parser-lib": "1.*",
-                "php": ">=5.4.0",
-                "phpcollection/phpcollection": "~0.1"
+                "php": ">=5.5.0",
+                "phpcollection/phpcollection": "~0.1",
+                "phpoption/phpoption": "^1.1"
+            },
+            "conflict": {
+                "jms/serializer-bundle": "<1.2.1",
+                "twig/twig": "<1.12"
             },
             "require-dev": {
                 "doctrine/orm": "~2.1",
-                "doctrine/phpcr-odm": "~1.0.1",
-                "jackalope/jackalope-doctrine-dbal": "1.0.*",
-                "phpunit/phpunit": "~4.0",
+                "doctrine/phpcr-odm": "^1.3|^2.0",
+                "ext-pdo_sqlite": "*",
+                "jackalope/jackalope-doctrine-dbal": "^1.1.5",
+                "phpunit/phpunit": "^4.8|^5.0",
                 "propel/propel1": "~1.7",
-                "symfony/filesystem": "2.*",
-                "symfony/form": "~2.1",
-                "symfony/translation": "~2.0",
-                "symfony/validator": "~2.0",
-                "symfony/yaml": "2.*",
-                "twig/twig": ">=1.8,<2.0-dev"
+                "symfony/expression-language": "^2.6|^3.0",
+                "symfony/filesystem": "^2.1",
+                "symfony/form": "~2.1|^3.0",
+                "symfony/translation": "^2.1|^3.0",
+                "symfony/validator": "^2.2|^3.0",
+                "symfony/yaml": "^2.1|^3.0",
+                "twig/twig": "~1.12|~2.0"
             },
             "suggest": {
+                "doctrine/cache": "Required if you like to use cache functionality.",
+                "doctrine/collections": "Required if you like to use doctrine collection types as ArrayCollection.",
                 "symfony/yaml": "Required if you'd like to serialize data to YAML format."
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "0.17-dev"
+                    "dev-master": "1.9-dev"
                 }
             },
             "autoload": {
@@ -1910,9 +1919,13 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "Apache2"
+                "Apache-2.0"
             ],
             "authors": [
+                {
+                    "name": "Asmir Mustafic",
+                    "email": "goetas@gmail.com"
+                },
                 {
                     "name": "Johannes M. Schmitt",
                     "email": "schmittjoh@gmail.com"
@@ -1927,25 +1940,25 @@
                 "serialization",
                 "xml"
             ],
-            "time": "2015-06-16T11:50:24+00:00"
+            "time": "2017-09-28T15:17:28+00:00"
         },
         {
             "name": "jms/serializer-bundle",
-            "version": "1.1.0",
+            "version": "1.5.0",
             "target-dir": "JMS/SerializerBundle",
             "source": {
                 "type": "git",
                 "url": "https://github.com/schmittjoh/JMSSerializerBundle.git",
-                "reference": "3e396c980545350c2efb65a50041d2a9f9d6562e"
+                "reference": "85ee039a2b7f89d77c403e33cee7b43a875c31e5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://satis.infra.flowdat.com/dist/jms/serializer-bundle/jms-serializer-bundle-3e396c980545350c2efb65a50041d2a9f9d6562e-zip-0ba03f.zip",
-                "reference": "3e396c980545350c2efb65a50041d2a9f9d6562e",
-                "shasum": "e39801b03a69da68e68f93252f201ce7ea44da26"
+                "url": "https://satis.infra.flowdat.com/dist/jms/serializer-bundle/jms-serializer-bundle-85ee039a2b7f89d77c403e33cee7b43a875c31e5-zip-e99b92.zip",
+                "reference": "85ee039a2b7f89d77c403e33cee7b43a875c31e5",
+                "shasum": "8ceb3e6f31ad9b250fe9070661ee2d4b4d52c0f2"
             },
             "require": {
-                "jms/serializer": "^1.0.0",
+                "jms/serializer": "^1.7",
                 "php": ">=5.4.0",
                 "phpoption/phpoption": "^1.1.0",
                 "symfony/framework-bundle": "~2.3|~3.0"
@@ -1953,9 +1966,11 @@
             "require-dev": {
                 "doctrine/doctrine-bundle": "*",
                 "doctrine/orm": "*",
+                "phpunit/phpunit": "^4.2|^5.0",
                 "symfony/browser-kit": "*",
                 "symfony/class-loader": "*",
                 "symfony/css-selector": "*",
+                "symfony/expression-language": "~2.6|~3.0",
                 "symfony/finder": "*",
                 "symfony/form": "*",
                 "symfony/process": "*",
@@ -1970,7 +1985,7 @@
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-master": "1.5-dev"
                 }
             },
             "autoload": {
@@ -1980,7 +1995,7 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "Apache2"
+                "Apache-2.0"
             ],
             "authors": [
                 {
@@ -1997,7 +2012,7 @@
                 "serialization",
                 "xml"
             ],
-            "time": "2015-11-10T12:26:42+00:00"
+            "time": "2017-05-10T10:17:17+00:00"
         },
         {
             "name": "knplabs/knp-menu",
@@ -4340,30 +4355,40 @@
         },
         {
             "name": "twig/extensions",
-            "version": "v1.0.0",
+            "version": "v1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig-extensions.git",
-                "reference": "921799aaf05f88af749d72912d6b154dfeb9a03e"
+                "reference": "d6d74d6f3213a9574c460c4390c25a1a67c17cc3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://satis.infra.flowdat.com/dist/twig/extensions/twig-extensions-921799aaf05f88af749d72912d6b154dfeb9a03e-zip-7de064.zip",
-                "reference": "921799aaf05f88af749d72912d6b154dfeb9a03e",
-                "shasum": "37a964aef3599be669a213f0ab7bd6bb8b60c1ec"
+                "url": "https://satis.infra.flowdat.com/dist/twig/extensions/twig-extensions-d6d74d6f3213a9574c460c4390c25a1a67c17cc3-zip-c91cfb.zip",
+                "reference": "d6d74d6f3213a9574c460c4390c25a1a67c17cc3",
+                "shasum": "f0c63150d50bbbf52c6de4b9825474856fcdee8b"
             },
             "require": {
-                "twig/twig": "1.*"
+                "twig/twig": "~1.27|~2.0"
+            },
+            "require-dev": {
+                "symfony/phpunit-bridge": "~3.3@dev",
+                "symfony/translation": "~2.3|~3.0"
+            },
+            "suggest": {
+                "symfony/translation": "Allow the time_diff output to be translated"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.5-dev"
                 }
             },
             "autoload": {
                 "psr-0": {
                     "Twig_Extensions_": "lib/"
+                },
+                "psr-4": {
+                    "Twig\\Extensions\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -4377,30 +4402,30 @@
                 }
             ],
             "description": "Common additional features for Twig that do not directly belong in core",
-            "homepage": "https://github.com/fabpot/Twig-extensions",
+            "homepage": "http://twig.sensiolabs.org/doc/extensions/index.html",
             "keywords": [
-                "debug",
                 "i18n",
                 "text"
             ],
-            "time": "2013-02-28T14:21:30+00:00"
+            "time": "2017-05-24T06:24:07+00:00"
         },
         {
             "name": "twig/twig",
-            "version": "v1.32.0",
+            "version": "v2.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "9935b662e24d6e634da88901ab534cc12e8c728f"
+                "reference": "29bb02dde09ff56291d30f7687eb8696918023af"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://satis.infra.flowdat.com/dist/twig/twig/twig-twig-9935b662e24d6e634da88901ab534cc12e8c728f-zip-a001f3.zip",
-                "reference": "9935b662e24d6e634da88901ab534cc12e8c728f",
-                "shasum": "dd1978eac33c823ebf0e6050e0c948cdb7b25c84"
+                "url": "https://satis.infra.flowdat.com/dist/twig/twig/twig-twig-29bb02dde09ff56291d30f7687eb8696918023af-zip-d29079.zip",
+                "reference": "29bb02dde09ff56291d30f7687eb8696918023af",
+                "shasum": "e39501374aa23d98f11643c344c32fae9c411555"
             },
             "require": {
-                "php": ">=5.2.7"
+                "php": "^7.0",
+                "symfony/polyfill-mbstring": "~1.0"
             },
             "require-dev": {
                 "psr/container": "^1.0",
@@ -4410,7 +4435,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.32-dev"
+                    "dev-master": "2.2-dev"
                 }
             },
             "autoload": {
@@ -4445,7 +4470,7 @@
             "keywords": [
                 "templating"
             ],
-            "time": "2017-02-27T00:07:03+00:00"
+            "time": "2017-02-27T00:16:20+00:00"
         },
         {
             "name": "voryx/restgeneratorbundle",
@@ -5191,17 +5216,17 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "6.3.0",
+            "version": "6.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "9501bab711403a1ab5b8378a8adb4ec3db3debdb"
+                "reference": "a1bcaca096998de32c29535fdd2dea0c475e8f61"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://satis.infra.flowdat.com/dist/phpunit/phpunit/phpunit-phpunit-9501bab711403a1ab5b8378a8adb4ec3db3debdb-zip-aa2c1f.zip",
-                "reference": "9501bab711403a1ab5b8378a8adb4ec3db3debdb",
-                "shasum": "7600873a2de4bec7e1d79299a324523fd81da37e"
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a1bcaca096998de32c29535fdd2dea0c475e8f61",
+                "reference": "a1bcaca096998de32c29535fdd2dea0c475e8f61",
+                "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
@@ -5245,7 +5270,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "6.3.x-dev"
+                    "dev-master": "6.4.x-dev"
                 }
             },
             "autoload": {
@@ -5271,7 +5296,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2017-08-04T05:20:39+00:00"
+            "time": "2017-10-06T03:14:57+00:00"
         },
         {
             "name": "phpunit/phpunit-mock-objects",