Added deprecation messages

Author: wouterj

DependencyInjection/Compiler/RequestAwarePass.php

@@ -31,7 +31,7 @@ public function process(ContainerBuilder $container)
     {
         $services = $container->findTaggedServiceIds('cmf_request_aware');
         foreach ($services as $id => $attributes) {
-            trigger_error("Service $id is using the deprecated tag cmf_request_aware");
+            @trigger_error('The cmf_request_aware tag used by "'.$id.'" is deprecated since 1.1 and will be removed in 2.0. Use the "request_stack" service instead.', E_USER_DEPRECATED);
 
             $definition = $container->getDefinition($id);
             $definition

Templating/Helper/CmfHelper.php

@@ -62,7 +62,11 @@ class CmfHelper extends Helper
     public function __construct(SecurityContextInterface $publishWorkflowChecker = null, $registry = null, $managerName = null)
     {
         $this->publishWorkflowChecker = $publishWorkflowChecker;
-        $this->setDoctrineRegistry($registry, $managerName);
+
+        if (null !== $registry) {
+            @trigger_error('The second and third argument of '.__METHOD__.' is deprecated since 1.3 and will be removed in 2.0. Execute setDoctrineRegistry() instead.', E_USER_DEPRECATED);
+            $this->setDoctrineRegistry($registry, $managerName);
+        }
     }
 
     /**

Tests/Functional/Templating/Helper/CmfHelperHierarchyTest.php

@@ -38,7 +38,8 @@ public function setUp()
             ->will($this->returnValue(true))
         ;
 
-        $this->helper = new CmfHelper($this->pwc, $dbManager->getRegistry(), 'default');
+        $this->helper = new CmfHelper($this->pwc);
+        $this->helper->setDoctrineRegistry($dbManager->getRegistry(), 'default');
     }
 
     public function testGetDescendants()

Tests/Unit/Templating/Helper/CmfHelperTest.php

@@ -57,7 +57,8 @@ public function setUp()
             ->will($this->returnValue($this->uow))
         ;
 
-        $this->extension = new CmfHelper($this->pwc, $this->managerRegistry, 'foo');
+        $this->extension = new CmfHelper($this->pwc);
+        $this->extension->setDoctrineRegistry($this->managerRegistry, 'foo');
     }
 
     public function testGetNodeName()
@@ -210,7 +211,8 @@ public function testFindManyLimitOffset()
      */
     public function testFindManyNoWorkflow()
     {
-        $this->extension = new CmfHelper(null, $this->managerRegistry, 'foo');
+        $extension = new CmfHelper(null);
+        $extension->setDoctrineRegistry($this->managerRegistry, 'foo');
 
         $documentA = new \stdClass();
 
@@ -220,7 +222,7 @@ public function testFindManyNoWorkflow()
             ->will($this->returnValue($documentA))
         ;
 
-        $this->extension->findMany(array('/foo', '/bar'), false, false);
+        $extension->findMany(array('/foo', '/bar'), false, false);
     }
 
     public function testIsPublished()
@@ -244,8 +246,10 @@ public function testIsPublished()
      */
     public function testIsPublishedNoWorkflow()
     {
-        $this->extension = new CmfHelper(null, $this->managerRegistry, 'foo');
-        $this->extension->isPublished(new \stdClass());
+        $extension = new CmfHelper(null);
+        $extension->setDoctrineRegistry($this->managerRegistry, 'foo');
+
+        $extension->isPublished(new \stdClass());
     }
 
     public function testIsLinkable()