pdo exception on error

interconnectit · Mar 17, 2020 · 9a97d17ef490afdc2a61ee956d26eb9a626fac25 · 9a97d17
1 parent 7f13e9b
commit 9a97d17ef490afdc2a61ee956d26eb9a626fac25
Unified Split

Showing with 13 additions and 13 deletions.

+1 −1 phpunit.xml

+12 −12 tests/SrdbTest.php
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit colors="true">
     <testsuites>
-        <testsuite>
+        <testsuite name="search-replace-db">
             <directory>tests</directory>
         </testsuite>
     </testsuites>

diff --git a/tests/SrdbTest.php b/tests/SrdbTest.php
@@ -43,7 +43,7 @@ class SrdbTest extends \PHPUnit\Framework\TestCase
         'name' => 'srdbtest',
         'user' => 'travis',
         'pass' => '',
-        'table'=> 'posts'
+        'table' => 'posts'
     );
 
     public static function setUpBeforeClass(): void
@@ -53,12 +53,12 @@ public static function setUpBeforeClass(): void
 
         // setup the database
 
-        if (self::$pdo == null) {
-            self::$pdo = new PDO("mysql:host=" . static::TESTDB['host'],
-                static::TESTDB['user'],
-                static::TESTDB['pass'],
-                array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4'));
-        }
+        self::$pdo = new PDO("mysql:host=" . static::TESTDB['host'],
+            static::TESTDB['user'],
+            static::TESTDB['pass'],
+            array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4'));
+
+        self::$pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 
         self::$pdo->query("CREATE DATABASE IF NOT EXISTS `" . static::TESTDB['user'] . "` CHARACTER SET = 'utf8mb4' COLLATE = 'utf8mb4_general_ci';");
         self::$pdo->query("CREATE TABLE IF NOT EXISTS `" . static::TESTDB['name'] . "`.`" . static::TESTDB['table'] . "` (
@@ -69,7 +69,7 @@ public static function setUpBeforeClass(): void
 				PRIMARY KEY (`id`)
 			  ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;");
 
-        self::$pdo->query("USE `" . static::TESTDB['table'] . "`;");
+        self::$pdo->query("USE `" . static::TESTDB['name'] . "`;");
 
         // Get the charset of the table.
         $charset = self::get_table_character_set();
@@ -83,9 +83,9 @@ public static function setUpBeforeClass(): void
                         (`id`, `content`, `url`,`serialised`)
                         VALUES (?, ?, ?, ?)");
 
-        $xml = simplexml_load_file(dirname( __FILE__ ) . '/DataSet.xml');
+        $xml = simplexml_load_file(dirname(__FILE__) . '/DataSet.xml');
 
-        foreach($xml->table[0]->row as $row){
+        foreach ($xml->table[0]->row as $row) {
             $stm->bindValue(1, (int)$row->value[0], PDO::PARAM_INT);
             $stm->bindValue(2, (string)$row->value[1]);
             $stm->bindValue(3, (string)$row->value[2]);
@@ -239,7 +239,7 @@ public function testRegexReplace()
 
         // test the database is actually changed
         $modified = self::$pdo->query("SELECT url FROM `" . static::TESTDB['table'] . "` LIMIT 1;")->fetchColumn();
-        $this->assertRegExp("#{$result}#", $modified, 'Database not updated, modified result is ' . $modified);
+        $this->assertRegExp("{$result}", $modified, 'Database not updated, modified result is ' . $modified);
 
     }
 
@@ -292,7 +292,7 @@ public function testRecursiveUnserializeReplace()
 
         // search replace strings
         $search = 'serialised string';
-        $replace = 'longer serialised string';
+        $replace = 'longer longer serialised string';
 
         // class instance with regex enabled
         $srdb = new icit_srdb(array_merge(array(