#2821 reverting BC break - moved static exception constructor to a ne…

…w method to avoid API changes
doctrine · Aug 28, 2017 · 1119a3d · 1119a3d
1 parent 2d57c68
commit 1119a3d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/lib/Doctrine/DBAL/Connection.php b/lib/Doctrine/DBAL/Connection.php
@@ -213,7 +213,7 @@ public function __construct(array $params, Driver $driver, Configuration $config
 
         if (isset($params["platform"])) {
             if ( ! $params['platform'] instanceof Platforms\AbstractPlatform) {
-                throw DBALException::invalidPlatformSpecified($params['platform']);
+                throw DBALException::invalidPlatformType($params['platform']);
             }
 
             $this->platform = $params["platform"];

diff --git a/lib/Doctrine/DBAL/DBALException.php b/lib/Doctrine/DBAL/DBALException.php
@@ -36,21 +36,24 @@ public static function notSupported($method)
         return new self("Operation '$method' is not supported by platform.");
     }
 
+    public static function invalidPlatformSpecified() : self
+    {
+        return new self(
+            "Invalid 'platform' option specified, need to give an instance of ".
+            "\Doctrine\DBAL\Platforms\AbstractPlatform.");
+    }
+
     /**
-     * Returns a new instance for an invalid platform specified.
-     *
-     * @param mixed $invalidPlatform The invalid platform given.
-     *
-     * @return DBALException
+     * @param mixed $invalidPlatform
      */
-    public static function invalidPlatformSpecified($invalidPlatform): self
+    public static function invalidPlatformType($invalidPlatform) : self
     {
-        if (is_object($invalidPlatform)) {
+        if (\is_object($invalidPlatform)) {
             return new self(
                 sprintf(
                     "Option 'platform' must be a subtype of '%s', instance of '%s' given",
                     AbstractPlatform::class,
-                    get_class($invalidPlatform)
+                    \get_class($invalidPlatform)
                 )
             );
         }
@@ -59,7 +62,7 @@ public static function invalidPlatformSpecified($invalidPlatform): self
             sprintf(
                 "Option 'platform' must be an object and subtype of '%s'. Got '%s'",
                 AbstractPlatform::class,
-                gettype($invalidPlatform)
+                \gettype($invalidPlatform)
             )
         );
     }

diff --git a/tests/Doctrine/Tests/DBAL/DBALExceptionTest.php b/tests/Doctrine/Tests/DBAL/DBALExceptionTest.php
@@ -62,9 +62,9 @@ public function testDriverRequiredWithUrl()
     /**
      * @group DBAL-2821
      */
-    public function testInvalidPlatformSpecifiedObject(): void
+    public function testInvalidPlatformTypeObject(): void
     {
-        $exception = DBALException::invalidPlatformSpecified(new \stdClass());
+        $exception = DBALException::invalidPlatformType(new \stdClass());
 
         self::assertSame(
             "Option 'platform' must be a subtype of 'Doctrine\DBAL\Platforms\AbstractPlatform', instance of 'stdClass' given",
@@ -75,9 +75,9 @@ public function testInvalidPlatformSpecifiedObject(): void
     /**
      * @group DBAL-2821
      */
-    public function testInvalidPlatformSpecifiedScalar(): void
+    public function testInvalidPlatformTypeScalar(): void
     {
-        $exception = DBALException::invalidPlatformSpecified("some string");
+        $exception = DBALException::invalidPlatformType('some string');
 
         self::assertSame(
             "Option 'platform' must be an object and subtype of 'Doctrine\DBAL\Platforms\AbstractPlatform'. Got 'string'",