Merge pull request liip#243 from liip/deprecate-phpcr-loader

deprecate the phpcr loader as CmfMediaBundle provides a better one now.
LouTerrailloune · Sep 18, 2013 · 5f07948 · 5f07948
2 parents a67d638 + 8a58d95
commit 5f07948
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 30 deletions.
diff --git a/CHANGELOG.md 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
diff --git 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
diff --git 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