Skip to content
This repository was archived by the owner on Sep 16, 2021. It is now read-only.

Commit 492cae1

Browse files
authored
Merge pull request #284 from symfony-cmf/php-5.6
allow phpcr-odm 1.4 and go to php 5.6
2 parents 8363c95 + 4f671b3 commit 492cae1

File tree

4 files changed

+47
-4
lines changed

4 files changed

+47
-4
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
language: php
22

33
php:
4-
- 5.5
54
- 5.6
65
- 7.0
76
- hhvm
@@ -21,7 +20,7 @@ matrix:
2120
include:
2221
- php: 7.1
2322
env: DEPS=dev SYMFONY_VERSION=3.3.*
24-
- php: 5.5
23+
- php: 5.6
2524
env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
2625
- php: 7.1
2726
env: SYMFONY_VERSION=3.1.*

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
}
1313
],
1414
"require": {
15-
"php": "^5.5.9|^7.0",
15+
"php": "^5.6|^7.0",
1616
"symfony/framework-bundle": "^2.8|^3.0",
1717
"symfony-cmf/core-bundle": "^2.0@dev",
1818
"doctrine/phpcr-bundle": "^1.1",
19-
"doctrine/phpcr-odm": "^2.0",
19+
"doctrine/phpcr-odm": "^1.4|^2.0",
2020
"knplabs/knp-menu-bundle": "^2.0.0",
2121
"knplabs/knp-menu": "^2.0.0"
2222
},

src/Doctrine/Phpcr/Menu.php

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,28 @@ public function getParentDocument()
3939
return $this->getParentObject();
4040
}
4141

42+
/**
43+
* @deprecated For BC with the PHPCR-ODM 1.4 HierarchyInterface
44+
* @see setParentDocument
45+
*/
46+
public function setParent($parent)
47+
{
48+
@trigger_error('The '.__METHOD__.'() method is deprecated and will be removed in version 3.0. Use setParentDocument() instead.', E_USER_DEPRECATED);
49+
50+
return $this->setParentDocument($parent);
51+
}
52+
53+
/**
54+
* @deprecated For BC with the PHPCR-ODM 1.4 HierarchyInterface
55+
* @see getParentDocument
56+
*/
57+
public function getParent()
58+
{
59+
@trigger_error('The '.__METHOD__.'() method is deprecated and will be removed in version 3.0. Use getParentDocument() instead.', E_USER_DEPRECATED);
60+
61+
return $this->getParentDocument();
62+
}
63+
4264
/**
4365
* Convenience method to set parent and name at the same time.
4466
*

src/Doctrine/Phpcr/MenuNode.php

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,28 @@ public function getParentDocument()
3939
return $this->getParentObject();
4040
}
4141

42+
/**
43+
* @deprecated For BC with the PHPCR-ODM 1.4 HierarchyInterface
44+
* @see setParentDocument
45+
*/
46+
public function setParent($parent)
47+
{
48+
@trigger_error('The '.__METHOD__.'() method is deprecated and will be removed in version 3.0. Use setParentDocument() instead.', E_USER_DEPRECATED);
49+
50+
return $this->setParentDocument($parent);
51+
}
52+
53+
/**
54+
* @deprecated For BC with the PHPCR-ODM 1.4 HierarchyInterface
55+
* @see getParentDocument
56+
*/
57+
public function getParent()
58+
{
59+
@trigger_error('The '.__METHOD__.'() method is deprecated and will be removed in version 3.0. Use getParentDocument() instead.', E_USER_DEPRECATED);
60+
61+
return $this->getParentDocument();
62+
}
63+
4264
/**
4365
* Convenience method to set parent and name at the same time.
4466
*

0 commit comments

Comments
 (0)