From 8a58d95a355f8d1c2c4e45f34976c32b46f0d282 Mon Sep 17 00:00:00 2001
From: David Buchmann <david.buchmann@liip.ch>
Date: Tue, 17 Sep 2013 19:00:31 +0200
Subject: [PATCH] deprecate the phpcr loader as CmfMediaBundle provides a
 better one now.

---
 CHANGELOG.md                                |  6 +++++
 Imagine/Data/Loader/DoctrinePHPCRLoader.php |  4 +++
 Resources/doc/data-loader/doctrine-phpcr.md | 29 ---------------------
 Resources/doc/data-loaders.md               |  7 ++++-
 4 files changed, 16 insertions(+), 30 deletions(-)
 create mode 100644 CHANGELOG.md
 delete mode 100644 Resources/doc/data-loader/doctrine-phpcr.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..f99573792
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,6 @@
+Changelog
+=========
+
+* **2013-09-17**: [PHPCR loader] DoctrinePHPCRLoader is now deprecated, as the
+  CmfMediaBundle provides a more reliable loader that is already provided as a
+  service. See http://symfony.com/doc/master/cmf/bundles/media.html#liipimagine
\ No newline at end of file
diff --git a/Imagine/Data/Loader/DoctrinePHPCRLoader.php b/Imagine/Data/Loader/DoctrinePHPCRLoader.php
index e5580733c..c56c91d0f 100644
--- a/Imagine/Data/Loader/DoctrinePHPCRLoader.php
+++ b/Imagine/Data/Loader/DoctrinePHPCRLoader.php
@@ -6,6 +6,10 @@
 use Imagine\Image\ImagineInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
+/**
+ * @deprecated This class is replaced by the loader of the CmfMediaBundle
+ * and will be removed in LiipImagineBundle 1.0
+ */
 class DoctrinePHPCRLoader extends FileSystemLoader
 {
     /**
diff --git a/Resources/doc/data-loader/doctrine-phpcr.md b/Resources/doc/data-loader/doctrine-phpcr.md
deleted file mode 100644
index aa68c92df..000000000
--- a/Resources/doc/data-loader/doctrine-phpcr.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# DoctrinePHPCRLoader
-
-Load images from PHPCR ODM
-
-This loader works the same as the GridFS loader with some minor changes in the
-service definition:
-
-``` xml
-<service id="liip_imagine.data.loader.phpcr" class="Liip\ImagineBundle\Imagine\Data\Loader\DoctrinePHPCRLoader">
-    <tag name="liip_imagine.data.loader" loader="doctrine_phpcr" />
-    <argument type="service" id="liip_imagine" />
-    <argument>%liip_imagine.formats%</argument>
-    <argument>%my_content_basepath%</argument>
-    <argument type="service" id="doctrine_phpcr.odm.document_manager" />
-    <argument>%symfony_cmf_create.image.model_class%</argument>
-</service>
-```
-
-Instead of liip_imagine.formats you can of course also provide a custom set of
-image formats to support.
-``my_content_basepath`` is used to limit what parts of your repository are
-exposed by imagine. This must be a path without trailing slash. For example
-``"/cms/content`` or if you want to expose everything, ``""`` (but *not* ``"/"``).
-
-Note there is an AbstractDoctrineLoader. It is quite easy to extend this abstract class
-to create a new Doctrine loader for the ORM or another ODM.
-
-- [Back to data loaders](../data-loaders.md)
-- [Back to the index](../index.md)
diff --git a/Resources/doc/data-loaders.md b/Resources/doc/data-loaders.md
index 438d7730b..e7507e8ee 100644
--- a/Resources/doc/data-loaders.md
+++ b/Resources/doc/data-loaders.md
@@ -1,9 +1,14 @@
 # Built-In DataLoader
 
-* [DoctrinePHPCR](data-loader/doctrine-phpcr.md)
 * [MongoDB GridFS](data-loader/gridfs.md)
 * [Stream](data-loader/stream.md)
 
+# Other data loaders
+
+* [Doctrine PHPCR-ODM](http://symfony.com/doc/master/cmf/bundles/media.html#liipimagine)
+  You can include the CmfMediaBundle alone if you just want to use the images
+  but no other CMF features.
+
 # Custom image loaders
 
 The ImagineBundle allows you to add your custom image loader classes. The only