Skip to content

Commit

Permalink
Merge pull request #22 from mirko-pagliai/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
mirko-pagliai authored Feb 18, 2018
2 parents f57387f + d4812c7 commit 750cce9
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# 2.x branch
## 2.2 branch
### 2.2.1
## 2.3 branch
### 2.3.0
* full support for working under Windows;
* added `Driver::getConfig()` method, removed `Driver::$config` property. This
allows you to get the configuration values safely;
Expand All @@ -10,6 +10,7 @@
* added `isWin()` global function;
* tests can have `onlyUnix` or `onlyWindows` group.

## 2.2 branch
### 2.2.0
* added `ConsoleIntegrationTestCase` and `TestCaseTrait` classes. Console tests
have been simplified;
Expand Down
2 changes: 1 addition & 1 deletion src/Driver/Driver.php
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ final public function export($filename)
* @param string $key Config key
* @return array|string|null Config value, `null` if the key doesn't exist
* or all config values if no key was specified
* @since 2.2.1
* @since 2.3.0
* @uses $connection
*/
final public function getConfig($key = null)
Expand Down
2 changes: 1 addition & 1 deletion src/Driver/Mysql.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ protected function _importExecutable()
* Internal method to write an auth file
* @param string $content Content
* @return void
* @since 2.2.1
* @since 2.3.0
* @uses getConfig()
* @uses $auth
*/
Expand Down
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.2.1
2.3.0

0 comments on commit 750cce9

Please sign in to comment.