Skip to content

Commit b85eec4

Browse files
committed
Use symfony2.6 for dev (avoid deprecation issues)
1 parent f49e6c3 commit b85eec4

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
},
1414
"minimum-stability": "dev",
1515
"require-dev": {
16+
"symfony/symfony": "2.6",
1617
"symfony/process": "~2.3",
1718
"symfony/filesystem": "~2.3",
1819
"phpunit/phpunit": "~3.7.28",

src/PHPCR/Shell/DependencyInjection/Container.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function __construct($mode = self::MODE_STANDALONE)
3535

3636
public function registerHelpers()
3737
{
38-
$this->register('helper.question', 'Symfony\Component\Console\Helper\QuestionHelper');
38+
$this->register('helper.question', 'Symfony\Component\Console\Helper\DialogHelper');
3939
$this->register('helper.editor', 'PHPCR\Shell\Console\Helper\EditorHelper');
4040
$this->register('helper.path', 'PHPCR\Shell\Console\Helper\PathHelper');
4141
$this->register('helper.repository', 'PHPCR\Shell\Console\Helper\RepositoryHelper')

src/PHPCR/Shell/Serializer/NodeNormalizer.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,11 @@ public function normalize($node, $format = null, array $context = array())
4747
$propertyName = $property->getName();
4848

4949
if (in_array($property->getType(), array(PropertyType::REFERENCE, PropertyType::WEAKREFERENCE))) {
50-
$propertyValue = array_keys($propertyValue);
50+
$nodesUuids = array();
51+
foreach ((array) $propertyValue as $node) {
52+
$nodeUuids[] = $node->getIdentifier();
53+
}
54+
$propertyValue = $nodeUuids;
5155
}
5256

5357
$res[$propertyName] = array(

0 commit comments

Comments
 (0)