From a834bc4a641199a57d1bc652e1e8b2848e63ebf9 Mon Sep 17 00:00:00 2001
From: saeid <saeideng@yahoo.com>
Date: Tue, 3 Oct 2017 01:22:24 +0330
Subject: [PATCH] remove error_reporting() handling/use deprecated()

remove error_reporting() from

setUpBeforeClass()
tearDownAfterClass()
tearDown()

+
used deprecated() helper
---
 tests/TestCase/Controller/ControllerTest.php | 36 +++-----------------
 1 file changed, 4 insertions(+), 32 deletions(-)

diff --git a/tests/TestCase/Controller/ControllerTest.php b/tests/TestCase/Controller/ControllerTest.php
index 53a77ce613b..d7b5af675d6 100644
--- a/tests/TestCase/Controller/ControllerTest.php
+++ b/tests/TestCase/Controller/ControllerTest.php
@@ -236,12 +236,6 @@ class ControllerTest extends TestCase
         'core.posts'
     ];
 
-    /**
-     * error level property
-     *
-     */
-    private static $errorLevel;
-
     /**
      * reset environment.
      *
@@ -264,29 +258,6 @@ public function tearDown()
     {
         parent::tearDown();
         Plugin::unload();
-        error_reporting(self::$errorLevel);
-    }
-
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        parent::setUpBeforeClass();
-        self::$errorLevel = error_reporting();
-    }
-
-    /**
-     * tearDownAfterClass
-     *
-     * @return void
-     */
-    public static function tearDownAfterClass()
-    {
-        parent::tearDownAfterClass();
-        error_reporting(self::$errorLevel);
     }
 
     /**
@@ -1128,9 +1099,10 @@ public function testBeforeRenderViewVariables()
     public function testDeprecatedViewProperty($property, $getter, $setter, $value)
     {
         $controller = new AnotherTestController();
-        error_reporting(E_ALL ^ E_USER_DEPRECATED);
-        $controller->$property = $value;
-        $this->assertSame($value, $controller->$property);
+        $this->deprecated(function () use ($controller, $property, $value) {
+            $controller->$property = $value;
+            $this->assertSame($value, $controller->$property);
+        });
         $this->assertSame($value, $controller->viewBuilder()->{$getter}());
     }