bug #13073 [VarDumper] fix and test PdoCaster (nicolas-grekas)

fabpot · fabpot · commit 3402fffb9745 · 2014-12-23T18:30:47.000+01:00
This PR was merged into the 2.6 branch. Discussion ---------- [VarDumper] fix and test PdoCaster | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #13042 | License | MIT | Doc PR | - Commits ------- 0b1be13 [VarDumper] fix and test PdoCaster
diff --git a/src/Symfony/Component/VarDumper/Caster/PdoCaster.php b/src/Symfony/Component/VarDumper/Caster/PdoCaster.php
@@ -71,7 +71,7 @@ public static function castPdo(\PDO $c, array $a, Stub $stub, $isNested)
 
             try {
                 $a[$attr] = 'ERRMODE' === $attr ? $errmode : $c->getAttribute(constant("PDO::ATTR_{$attr}"));
-                if (isset($values[$a[$attr]])) {
+                if ($values && isset($values[$a[$attr]])) {
                     $a[$attr] = new ConstStub($values[$a[$attr]], $a[$attr]);
                 }
             } catch (\Exception $m) {
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/PdoCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/PdoCasterTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Caster;
+
+use Symfony\Component\VarDumper\Caster\PdoCaster;
+use Symfony\Component\VarDumper\Cloner\Stub;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class PdoCasterTest extends \PHPUnit_Framework_TestCase
+{
+    public function testCastPdo()
+    {
+        if (!extension_loaded('pdo_sqlite')) {
+            $this->markTestSkipped('pdo_sqlite extension is required');
+        }
+
+        $pdo = new \PDO('sqlite::memory:');
+        $pdo->setAttribute(\PDO::ATTR_STATEMENT_CLASS, array('PDOStatement', array($pdo)));
+
+        $cast = PdoCaster::castPdo($pdo, array(), new Stub(), false);
+        $attr = $cast["\0~\0attributes"];
+
+        $this->assertInstanceOf('Symfony\Component\VarDumper\Caster\ConstStub', $attr['CASE']);
+        $this->assertSame('NATURAL', $attr['CASE']->class);
+        $this->assertSame('BOTH', $attr['DEFAULT_FETCH_MODE']->class);
+
+        $xCast = array(
+            "\0~\0inTransaction" => false,
+            "\0~\0attributes" => array(
+                'CASE' => $attr['CASE'],
+                'ERRMODE' => $attr['ERRMODE'],
+                'PERSISTENT' => false,
+                'DRIVER_NAME' => 'sqlite',
+                'ORACLE_NULLS' => $attr['ORACLE_NULLS'],
+                'CLIENT_VERSION' => $pdo->getAttribute(\PDO::ATTR_CLIENT_VERSION),
+                'SERVER_VERSION' => $pdo->getAttribute(\PDO::ATTR_SERVER_VERSION),
+                'STATEMENT_CLASS' => array(
+                  'PDOStatement',
+                  array($pdo),
+                ),
+                'DEFAULT_FETCH_MODE' => $attr['DEFAULT_FETCH_MODE'],
+            ),
+        );
+
+        $this->assertSame($xCast, $cast);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public static function castPdo(\PDO $c, array $a, Stub $stub, $isNested)`
`71`	`71`
`72`	`72`	`try {`
`73`	`73`	`$a[$attr] = 'ERRMODE' === $attr ? $errmode : $c->getAttribute(constant("PDO::ATTR_{$attr}"));`
`74`		`- if (isset($values[$a[$attr]])) {`
	`74`	`+ if ($values && isset($values[$a[$attr]])) {`
`75`	`75`	`$a[$attr] = new ConstStub($values[$a[$attr]], $a[$attr]);`
`76`	`76`	`}`
`77`	`77`	`} catch (\Exception $m) {`