Merge pull request #5545 from derrabus/improvement/set-accessible

Remove calls to setAccessible()
doctrine · Jul 28, 2022 · ad18cf7 · ad18cf7
2 parents 7e084b9 + fa23ebe
commit ad18cf7
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 8 deletions.
diff --git a/src/Driver/Mysqli/Exception/ConnectionError.php b/src/Driver/Mysqli/Exception/ConnectionError.php
@@ -24,7 +24,6 @@ public static function new(mysqli $connection): self
     public static function upcast(mysqli_sql_exception $exception): self
     {
         $p = new ReflectionProperty(mysqli_sql_exception::class, 'sqlstate');
-        $p->setAccessible(true);
 
         return new self($exception->getMessage(), $p->getValue($exception), (int) $exception->getCode(), $exception);
     }

diff --git a/src/Driver/Mysqli/Exception/ConnectionFailed.php b/src/Driver/Mysqli/Exception/ConnectionFailed.php
@@ -29,7 +29,6 @@ public static function new(mysqli $connection): self
     public static function upcast(mysqli_sql_exception $exception): self
     {
         $p = new ReflectionProperty(mysqli_sql_exception::class, 'sqlstate');
-        $p->setAccessible(true);
 
         return new self($exception->getMessage(), $p->getValue($exception), (int) $exception->getCode(), $exception);
     }

diff --git a/src/Driver/Mysqli/Exception/InvalidCharset.php b/src/Driver/Mysqli/Exception/InvalidCharset.php
@@ -30,7 +30,6 @@ public static function fromCharset(mysqli $connection, string $charset): self
     public static function upcast(mysqli_sql_exception $exception, string $charset): self
     {
         $p = new ReflectionProperty(mysqli_sql_exception::class, 'sqlstate');
-        $p->setAccessible(true);
 
         return new self(
             sprintf('Failed to set charset "%s": %s', $charset, $exception->getMessage()),

diff --git a/src/Driver/Mysqli/Exception/StatementError.php b/src/Driver/Mysqli/Exception/StatementError.php
@@ -24,7 +24,6 @@ public static function new(mysqli_stmt $statement): self
     public static function upcast(mysqli_sql_exception $exception): self
     {
         $p = new ReflectionProperty(mysqli_sql_exception::class, 'sqlstate');
-        $p->setAccessible(true);
 
         return new self($exception->getMessage(), $p->getValue($exception), (int) $exception->getCode(), $exception);
     }

diff --git a/tests/Functional/Ticket/DBAL461Test.php b/tests/Functional/Ticket/DBAL461Test.php
@@ -22,8 +22,7 @@ public function testIssue(): void
         $schemaManager = new SQLServerSchemaManager($conn, $platform);
 
         $reflectionMethod = new ReflectionMethod($schemaManager, '_getPortableTableColumnDefinition');
-        $reflectionMethod->setAccessible(true);
-        $column = $reflectionMethod->invoke($schemaManager, [
+        $column           = $reflectionMethod->invoke($schemaManager, [
             'type' => 'numeric(18,0)',
             'length' => null,
             'default' => null,

diff --git a/tests/Schema/SQLiteSchemaManagerTest.php b/tests/Schema/SQLiteSchemaManagerTest.php
@@ -21,7 +21,6 @@ public function testParseColumnCollation(?string $collation, string $column, str
 
         $manager = new SQLiteSchemaManager($conn, new SQLitePlatform());
         $ref     = new ReflectionMethod($manager, 'parseColumnCollationFromSQL');
-        $ref->setAccessible(true);
 
         self::assertSame($collation, $ref->invoke($manager, $column, $sql));
     }
@@ -137,7 +136,6 @@ public function testParseColumnCommentFromSQL(string $comment, string $column, s
 
         $manager = new SQLiteSchemaManager($conn, new SQLitePlatform());
         $ref     = new ReflectionMethod($manager, 'parseColumnCommentFromSQL');
-        $ref->setAccessible(true);
 
         self::assertSame($comment, $ref->invoke($manager, $column, $sql));
     }