Move deprecations into constructors.

cakephp · Nov 4, 2017 · 3ddeac9 · 3ddeac9
1 parent 39ab9cc
commit 3ddeac9
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/src/View/Helper/RssHelper.php b/src/View/Helper/RssHelper.php
@@ -14,10 +14,9 @@
  */
 namespace Cake\View\Helper;
 
-deprecationWarning('RssHelper is deprecated and will be removed in 4.0.0');
-
 use Cake\Utility\Xml;
 use Cake\View\Helper;
+use Cake\View\View;
 
 /**
  * RSS Helper class for easy output RSS structures.
@@ -93,6 +92,15 @@ class RssHelper extends Helper
      */
     public $version = '2.0';
 
+    /**
+     * {@inheritDoc}
+     */
+    public function __construct(View $view, array $settings = [])
+    {
+        deprecationWarning('RssHelper is deprecated and will be removed in 4.0.0');
+        parent::__construct($view, $settings);
+    }
+
     /**
      * Returns an RSS document wrapped in `<rss />` tags
      *

diff --git a/src/View/Helper/SessionHelper.php b/src/View/Helper/SessionHelper.php
@@ -14,11 +14,6 @@
  */
 namespace Cake\View\Helper;
 
-deprecationWarning(
-    'SessionHelper is deprecated and will be removed in 4.0.0. ' .
-    'Use request->session() instead.'
-);
-
 use Cake\View\Helper;
 use Cake\View\View;
 
@@ -41,7 +36,11 @@ class SessionHelper extends Helper
      */
     public function __construct(View $View, array $config = [])
     {
-        trigger_error('SessionHelper has been deprecated. Use request->session() instead.', E_USER_DEPRECATED);
+        deprecationWarning(
+            'SessionHelper is deprecated and will be removed in 4.0.0. ' .
+            'Use request->session() instead.'
+        );
+
         parent::__construct($View, $config);
     }
 

diff --git a/tests/TestCase/View/Helper/RssHelperTest.php b/tests/TestCase/View/Helper/RssHelperTest.php
@@ -24,6 +24,8 @@
 
 /**
  * RssHelperTest class
+ *
+ * @group deprecated
  */
 class RssHelperTest extends TestCase
 {
@@ -42,13 +44,12 @@ public function setUp()
     {
         parent::setUp();
 
-        $errorLevel = error_reporting();
-        error_reporting(E_ALL ^ E_USER_DEPRECATED);
+        $oldLevel = error_reporting(E_ALL ^ E_USER_DEPRECATED);
 
         $this->View = new View();
         $this->Rss = new RssHelper($this->View);
 
-        error_reporting($errorLevel);
+        error_reporting($oldLevel);
     }
 
     /**