From c7b7d4e80edbf98545d651b2b81bee1b73c7bfb2 Mon Sep 17 00:00:00 2001
From: ElectricMaxxx <maximilian.berghoff@gmx.de>
Date: Fri, 23 Feb 2018 05:51:19 +0100
Subject: [PATCH] use phpcr-odm 2.0

---
 composer.json |  2 +-
 composer.lock | 33 +++++++++++++++++----------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/composer.json b/composer.json
index 645f28a0..f2485a87 100644
--- a/composer.json
+++ b/composer.json
@@ -54,7 +54,7 @@
         "doctrine/data-fixtures": "^1.0",
         "doctrine/doctrine-bundle": "^1.6",
         "doctrine/doctrine-cache-bundle": "^1.2",
-        "doctrine/phpcr-odm": "^1.4",
+        "doctrine/phpcr-odm": "^2.0",
         "egeloen/ckeditor-bundle": "dev-allow_symfony_4",
         "egeloen/json-builder": "dev-allow_symfony_4 as 3.0",
         "friendsofsymfony/rest-bundle": "^2.3",
diff --git a/composer.lock b/composer.lock
index 0858d0f5..094349c0 100644
--- a/composer.lock
+++ b/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": "4b87eee3e0b5b7d259949c79c6979b01",
+    "content-hash": "1245ed41b6644b511ef50118c19d22e0",
     "packages": [
         {
             "name": "aferrandini/urlizer",
@@ -1048,16 +1048,16 @@
         },
         {
             "name": "doctrine/phpcr-odm",
-            "version": "1.4.4",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/phpcr-odm.git",
-                "reference": "2f76cf6d9f270a1545756bd2472982514205a33e"
+                "reference": "aef2caec45d442d7aa93b231bdbcfdd986000cd3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/phpcr-odm/zipball/2f76cf6d9f270a1545756bd2472982514205a33e",
-                "reference": "2f76cf6d9f270a1545756bd2472982514205a33e",
+                "url": "https://api.github.com/repos/doctrine/phpcr-odm/zipball/aef2caec45d442d7aa93b231bdbcfdd986000cd3",
+                "reference": "aef2caec45d442d7aa93b231bdbcfdd986000cd3",
                 "shasum": ""
             },
             "require": {
@@ -1065,25 +1065,26 @@
                 "doctrine/common": "^2.4",
                 "doctrine/data-fixtures": "^1.0",
                 "doctrine/instantiator": "^1.0.1",
-                "php": "^5.3.9 || ^7.0",
+                "php": "^7.1",
                 "phpcr/phpcr": "^2.1.1",
                 "phpcr/phpcr-implementation": "^2.1",
-                "phpcr/phpcr-utils": "^1.2.8",
-                "symfony/console": "^2.3 || ^3.0 || ^4.0"
+                "phpcr/phpcr-utils": "^1.3.0",
+                "symfony/console": "^3.3 || ^4.0"
             },
             "conflict": {
-                "jackalope/jackalope-doctrine-dbal": "<1.1.5"
+                "jackalope/jackalope-doctrine-dbal": "<1.1.5",
+                "jms/serializer": "<1.3.0"
             },
             "require-dev": {
-                "liip/rmt": "^1.2",
-                "phpunit/phpunit": "^4.8 || ^5.0",
-                "symfony/phpunit-bridge": "^2.7 || ^3.0 || ^4.0",
-                "symfony/yaml": "^2.3 || ^3.0 || ^4.0"
+                "liip/rmt": "1.3.*@dev",
+                "phpunit/phpunit": "^6.0",
+                "symfony/phpunit-bridge": "^3.3 || ^4.0",
+                "symfony/yaml": "^3.3 || ^4.0"
             },
             "suggest": {
                 "jackalope/jackalope-doctrine-dbal": "^1.3",
                 "jackalope/jackalope-jackrabbit": "^1.3",
-                "symfony/yaml": "^2.3 || ^3.0 || ^4.0"
+                "symfony/yaml": "^3.2 || ^4.0"
             },
             "bin": [
                 "bin/phpcrodm",
@@ -1092,7 +1093,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -1125,7 +1126,7 @@
                 "odm",
                 "phpcr"
             ],
-            "time": "2018-01-31T16:10:08+00:00"
+            "time": "2018-01-31T16:30:44+00:00"
         },
         {
             "name": "easycorp/easy-log-handler",