Skip to content

Commit 09a7472

Browse files
committed
keep BC with phpcr-odm 1.4 to not have to wait for 2.0 release
1 parent 9b38b0e commit 09a7472

File tree

3 files changed

+40
-10
lines changed

3 files changed

+40
-10
lines changed

composer.json

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,32 +19,26 @@
1919
"require-dev": {
2020
"symfony-cmf/core-bundle": "^2.0",
2121
"symfony-cmf/testing": "^2.0",
22-
"doctrine/phpcr-odm": "^2.0",
22+
"doctrine/phpcr-odm": "^1.4|^2.0",
2323
"symfony/phpunit-bridge": "^3.2",
2424
"matthiasnoback/symfony-dependency-injection-test": "~0.6",
2525
"matthiasnoback/symfony-config-test": "^1.3.1",
2626
"phpunit/php-code-coverage": "@stable",
27-
"sonata-project/admin-bundle": "^2.3.7|^3.0",
28-
"sonata-project/block-bundle": "^2.2.8|^3.0",
29-
"sonata-project/core-bundle": "^2.2.5|^3.0",
3027
"symfony/monolog-bundle": "^2.3|^3.0",
3128
"doctrine/orm": "^2.5",
3229
"doctrine/data-fixtures": "^1.0.0"
3330
},
3431
"minimum-stability": "dev",
3532
"prefer-stable": true,
3633
"suggest": {
37-
"doctrine/phpcr-odm": "To enable support for the PHPCR ODM documents (^1.3)",
34+
"doctrine/phpcr-odm": "To enable support for the PHPCR ODM documents (^1.4)",
3835
"doctrine/phpcr-bundle": "To enable support for the PHPCR ODM documents",
3936
"doctrine/orm": "To enable support for the ORM entities (^2.5)",
40-
4137
"symfony-cmf/content-bundle": "To optionally use the configured value for 'content_basepath' from the CoreBundle",
42-
"symfony-cmf/core-bundle": "To use the provided Doctrine\\Phpcr documents and for easier configuration (^1.1)",
43-
44-
"symfony-cmf/sonata-admin-integration": "To provide an admin interface for the PHPCR ODM documents (^1.1)"
38+
"symfony-cmf/core-bundle": "To use the RouteTypeType form type and for easier configuration (^2.0)"
4539
},
4640
"conflict": {
47-
"doctrine/phpcr-odm": "<2.0"
41+
"doctrine/phpcr-odm": "<1.4"
4842
},
4943
"autoload": {
5044
"psr-4": {

src/Doctrine/Phpcr/RedirectRoute.php

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,24 @@ public function getParentDocument()
9494
return $this->parent;
9595
}
9696

97+
/**
98+
* @deprecated For BC with the PHPCR-ODM 1.4 HierarchyInterface
99+
* @see setParentDocument
100+
*/
101+
public function setParent($parent)
102+
{
103+
return $this->setParentDocument($parent);
104+
}
105+
106+
/**
107+
* @deprecated For BC with the PHPCR-ODM 1.4 HierarchyInterface
108+
* @see getParentDocument
109+
*/
110+
public function getParent()
111+
{
112+
return $this->getParentDocument();
113+
}
114+
97115
/**
98116
* Rename a route by setting its new name.
99117
*

src/Doctrine/Phpcr/Route.php

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,24 @@ public function getParentDocument()
104104
return $this->parent;
105105
}
106106

107+
/**
108+
* @deprecated For BC with the PHPCR-ODM 1.4 HierarchyInterface
109+
* @see setParentDocument
110+
*/
111+
public function setParent($parent)
112+
{
113+
return $this->setParentDocument($parent);
114+
}
115+
116+
/**
117+
* @deprecated For BC with the PHPCR-ODM 1.4 HierarchyInterface
118+
* @see getParentDocument
119+
*/
120+
public function getParent()
121+
{
122+
return $this->getParentDocument();
123+
}
124+
107125
/**
108126
* Rename a route by setting its new name.
109127
*

0 commit comments

Comments
 (0)