Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove all YAML references #5932

Merged
merged 5 commits into from Jul 13, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions UPGRADE.md
@@ -1,5 +1,10 @@
# Upgrade to 3.0

## BC Break: Removed ``YAML`` mapping drivers.

If your code relies on ``YamlDriver`` or ``SimpleYamlDriver``, you should change to
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't that rather be

must change to

?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

annotation or XML drivers instead.

## BC Break: Changed methods in ``ClassMetadata``

* ``ClassMetadata::addInheritedProperty``
Expand Down
4 changes: 0 additions & 4 deletions composer.json
Expand Up @@ -24,13 +24,9 @@
"symfony/console": "~2.5|~3.0"
},
"require-dev": {
"symfony/yaml": "~2.3|~3.0",
"phpunit/phpunit": "^5.4",
"phpbench/phpbench": "^0.11.2"
},
"suggest": {
"symfony/yaml": "If you want to use YAML Metadata Mapping Driver"
},
"autoload": {
"psr-4": { "Doctrine\\ORM\\": "lib/Doctrine/ORM" }
},
Expand Down
2 changes: 1 addition & 1 deletion lib/Doctrine/ORM/Events.php
Expand Up @@ -114,7 +114,7 @@ private function __construct()

/**
* The loadClassMetadata event occurs after the mapping metadata for a class
* has been loaded from a mapping source (annotations/xml/yaml).
* has been loaded from a mapping source (annotations/xml).
*
* @var string
*/
Expand Down
43 changes: 0 additions & 43 deletions lib/Doctrine/ORM/Mapping/Driver/SimplifiedYamlDriver.php

This file was deleted.

8 changes: 4 additions & 4 deletions lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
Expand Up @@ -810,10 +810,10 @@ private function _getCascadeMappings(SimpleXMLElement $cascadeElement)
/* @var $action SimpleXmlElement */
foreach ($cascadeElement->children() as $action) {
// According to the JPA specifications, XML uses "cascade-persist"
// instead of "persist". Here, both variations
// are supported because both YAML and Annotation use "persist"
// and we want to make sure that this driver doesn't need to know
// anything about the supported cascading actions
// instead of "persist". Here, both variations are supported
// because Annotation use "persist" and we want to make sure that
// this driver doesn't need to know anything about the supported
// cascading actions
$cascades[] = str_replace('cascade-', '', $action->getName());
}

Expand Down