Merge pull request #340 from j4mie/develop

Publish v1.5.6 of Idiorm
j4mie · May 30, 2018 · ee3022f · ee3022f
2 parents d006418 + ed8293a
commit ee3022f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/README.markdown b/README.markdown
@@ -85,9 +85,13 @@ is a Docker setup in `./test/docker_for_php52` - check the readme in there for m
 
 Changelog
 ---------
+#### 1.5.6 - released 2018-05-31
+
+* Assign `null` to `self::$_db` on `reset_db()` to ensure PDO closes the connections [[bleakgadfly](https://github.com/bleakgadfly)] - [issue #338](https://github.com/j4mie/idiorm/issues/338)
+
 #### 1.5.5 - released 2018-01-05
 
-* Add a docker setup for testing with PHP 5.2 (uses PHPUnit 3.6.12, which is the last version released compatible with PHP 5.2) [Treffynnon](https://github.com/treffynnon)
+* Add a docker setup for testing with PHP 5.2 (uses PHPUnit 3.6.12, which is the last version released compatible with PHP 5.2) [[Treffynnon](https://github.com/treffynnon)]
 
 #### 1.5.4 - released 2018-01-04
 

diff --git a/idiorm.php b/idiorm.php
@@ -361,9 +361,11 @@ public static function set_db($db, $connection_name = self::DEFAULT_CONNECTION)
         }
 
         /**
-         * Delete all registered PDO objects in _db array.
+         * Close and delete all registered PDO objects in _db array.
          */
         public static function reset_db() {
+            self::$_db = null;
+
             self::$_db = array();
         }