remove error_reporting() handling/use deprecated()

remove error_reporting() from setUpBeforeClass() tearDownAfterClass() tearDown() + used deprecated() helper
cakephp · Oct 10, 2017 · a834bc4 · a834bc4
1 parent 5c8ed03
commit a834bc4
Showing 1 changed file with 4 additions and 32 deletions.
diff --git 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}());
     }