Fix CS

symfony · Feb 4, 2020 · 54e1cf9 · 54e1cf9
1 parent 1a8d20d
commit 54e1cf9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/Application.php b/Application.php
@@ -805,7 +805,7 @@ public function renderException(\Exception $e, OutputInterface $output)
 
     public function renderThrowable(\Throwable $e, OutputInterface $output): void
     {
-        if (__CLASS__ !== \get_class($this) && __CLASS__ === (new \ReflectionMethod($this, 'renderThrowable'))->getDeclaringClass()->getName() && __CLASS__ !== (new \ReflectionMethod($this, 'renderException'))->getDeclaringClass()->getName()) {
+        if (__CLASS__ !== static::class && __CLASS__ === (new \ReflectionMethod($this, 'renderThrowable'))->getDeclaringClass()->getName() && __CLASS__ !== (new \ReflectionMethod($this, 'renderException'))->getDeclaringClass()->getName()) {
             @trigger_error(sprintf('The "%s::renderException()" method is deprecated since Symfony 4.4, use "renderThrowable()" instead.', __CLASS__), E_USER_DEPRECATED);
 
             if (!$e instanceof \Exception) {
@@ -844,7 +844,7 @@ protected function doRenderException(\Exception $e, OutputInterface $output)
 
     protected function doRenderThrowable(\Throwable $e, OutputInterface $output): void
     {
-        if (__CLASS__ !== \get_class($this) && __CLASS__ === (new \ReflectionMethod($this, 'doRenderThrowable'))->getDeclaringClass()->getName() && __CLASS__ !== (new \ReflectionMethod($this, 'doRenderException'))->getDeclaringClass()->getName()) {
+        if (__CLASS__ !== static::class && __CLASS__ === (new \ReflectionMethod($this, 'doRenderThrowable'))->getDeclaringClass()->getName() && __CLASS__ !== (new \ReflectionMethod($this, 'doRenderException'))->getDeclaringClass()->getName()) {
             @trigger_error(sprintf('The "%s::doRenderException()" method is deprecated since Symfony 4.4, use "doRenderThrowable()" instead.', __CLASS__), E_USER_DEPRECATED);
 
             if (!$e instanceof \Exception) {

diff --git a/Command/Command.php b/Command/Command.php
@@ -255,7 +255,7 @@ public function run(InputInterface $input, OutputInterface $output)
             $statusCode = $this->execute($input, $output);
 
             if (!\is_int($statusCode)) {
-                @trigger_error(sprintf('Return value of "%s::execute()" should always be of the type int since Symfony 4.4, %s returned.', \get_class($this), \gettype($statusCode)), E_USER_DEPRECATED);
+                @trigger_error(sprintf('Return value of "%s::execute()" should always be of the type int since Symfony 4.4, %s returned.', static::class, \gettype($statusCode)), E_USER_DEPRECATED);
             }
         }
 

diff --git a/Tests/ApplicationTest.php b/Tests/ApplicationTest.php
@@ -897,8 +897,7 @@ public function testRenderAnonymousException()
         $application = new Application();
         $application->setAutoExit(false);
         $application->register('foo')->setCode(function () {
-            throw new class('') extends \InvalidArgumentException {
-            };
+            throw new class('') extends \InvalidArgumentException { };
         });
         $tester = new ApplicationTester($application);
 
@@ -908,8 +907,7 @@ public function testRenderAnonymousException()
         $application = new Application();
         $application->setAutoExit(false);
         $application->register('foo')->setCode(function () {
-            throw new \InvalidArgumentException(sprintf('Dummy type "%s" is invalid.', \get_class(new class() {
-            })));
+            throw new \InvalidArgumentException(sprintf('Dummy type "%s" is invalid.', \get_class(new class() { })));
         });
         $tester = new ApplicationTester($application);
 
@@ -922,8 +920,7 @@ public function testRenderExceptionStackTraceContainsRootException()
         $application = new Application();
         $application->setAutoExit(false);
         $application->register('foo')->setCode(function () {
-            throw new class('') extends \InvalidArgumentException {
-            };
+            throw new class('') extends \InvalidArgumentException { };
         });
         $tester = new ApplicationTester($application);
 
@@ -933,8 +930,7 @@ public function testRenderExceptionStackTraceContainsRootException()
         $application = new Application();
         $application->setAutoExit(false);
         $application->register('foo')->setCode(function () {
-            throw new \InvalidArgumentException(sprintf('Dummy type "%s" is invalid.', \get_class(new class() {
-            })));
+            throw new \InvalidArgumentException(sprintf('Dummy type "%s" is invalid.', \get_class(new class() { })));
         });
         $tester = new ApplicationTester($application);