From 6c8629a622673c4aa48eba3e3bf6a5b488256a4c Mon Sep 17 00:00:00 2001
From: Lukas Kahwe Smith <smith@pooteeweet.org>
Date: Mon, 10 Aug 2015 16:51:43 +0200
Subject: [PATCH] make it possible to create and reference nodes within a
 single transaction

---
 composer.json                                 |  4 +-
 src/Jackalope/Jackrabbit/Factory.php          |  4 --
 .../Jackrabbit/Util/ValueConverter.php        | 38 -------------------
 3 files changed, 2 insertions(+), 44 deletions(-)
 delete mode 100644 src/Jackalope/Jackrabbit/Util/ValueConverter.php

diff --git a/composer.json b/composer.json
index 4c26f254..cb26b9a9 100644
--- a/composer.json
+++ b/composer.json
@@ -21,14 +21,14 @@
         "ext-curl":"*",
         "phpcr/phpcr": "~2.1.2",
         "phpcr/phpcr-utils": "^1.2.8",
-        "jackalope/jackalope": "~1.2.3"
+        "jackalope/jackalope": "~1.2.4"
     },
     "provide": {
         "jackalope/jackalope-transport": "1.1.0"
     },
     "require-dev": {
         "psr/log": "~1.0",
-        "phpcr/phpcr-api-tests": "2.1.9",
+        "phpcr/phpcr-api-tests": "2.1.10",
         "symfony/console": "~2.0"
     },
     "autoload": {
diff --git a/src/Jackalope/Jackrabbit/Factory.php b/src/Jackalope/Jackrabbit/Factory.php
index a083dab9..1f457564 100644
--- a/src/Jackalope/Jackrabbit/Factory.php
+++ b/src/Jackalope/Jackrabbit/Factory.php
@@ -2,8 +2,6 @@
 
 namespace Jackalope\Jackrabbit;
 
-use Jackalope\Jackrabbit\Util\ValueConverter;
-
 /**
  * Jackalope implementation factory.
  *
@@ -21,8 +19,6 @@ public function get($name, array $params = array())
             case 'Query\QOM\QueryObjectModelFactory':
                 $name = 'Jackrabbit\Query\QOM\QueryObjectModelFactory';
                 break;
-            case 'PHPCR\Util\ValueConverter':
-                return new ValueConverter();
         }
 
         return parent::get($name, $params);
diff --git a/src/Jackalope/Jackrabbit/Util/ValueConverter.php b/src/Jackalope/Jackrabbit/Util/ValueConverter.php
deleted file mode 100644
index 34a1d103..00000000
--- a/src/Jackalope/Jackrabbit/Util/ValueConverter.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-namespace Jackalope\Jackrabbit\Util;
-
-use PHPCR\NodeInterface;
-use PHPCR\PropertyType;
-use PHPCR\Util\ValueConverter as BaseValueConverter;
-use PHPCR\ValueFormatException;
-
-class ValueConverter extends BaseValueConverter
-{
-    /**
-     * {@inheritDoc}
-     *
-     * Overwritten to validate that unpersisted nodes are not referenced.
-     *
-     * This is needed because of this jackrabbit issue:
-     * https://issues.apache.org/jira/browse/JCR-1614
-     */
-    public function convertType($value, $type, $srctype = PropertyType::UNDEFINED)
-    {
-        if (is_array($value)) {
-            return parent::convertType($value, $type, $srctype);
-        }
-        if (PropertyType::UNDEFINED == $srctype) {
-            $srctype = $this->determineType($value);
-        }
-
-        if ((PropertyType::REFERENCE == $srctype || PropertyType::WEAKREFERENCE == $srctype)
-            && $value instanceof NodeInterface
-        ) {
-            if ($value->isNew()) {
-                throw new ValueFormatException('Node ' . $value->getPath() . ' must be persisted before being referenceable');
-            }
-        }
-
-        return parent::convertType($value, $type, $srctype);
-    }
-}