Skip to content

Commit

Permalink
Merge branch 'release/v2.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
bvanhoekelen committed May 18, 2017
2 parents 2ed9fbd + 16e6211 commit ae1cf06
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 11 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change Log

## [v2.0.2](https://github.com/bvanhoekelen/performance/tree/v2.0.2) - 2017-05-18
### Bug fix
- Fix Too few arguments to function error. See: https://github.com/illuminate/database/commit/ba465fbda006d70265362012653b4e97667c867b#diff-eba180ff89e23df156c82c995be952df

## [v2.0.1](https://github.com/bvanhoekelen/performance/tree/v2.0.1) - 2017-04-27
### Change
- Small fixes, typos and screenshots
Expand Down
3 changes: 3 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,8 @@
"psr-4": {
"Performance\\": "src/"
}
},
"archive": {
"exclude": ["assets"]
}
}
12 changes: 2 additions & 10 deletions src/Lib/Handlers/PerformanceHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class PerformanceHandler
/*
* Version
*/
const VERSION = '2.0.1';
const VERSION = '2.0.2';

/*
* Hold point stack
Expand All @@ -33,11 +33,6 @@ class PerformanceHandler
*/
public $config;

/*
* Hold export
*/
public $export;

/*
*
*/
Expand Down Expand Up @@ -137,10 +132,7 @@ public function results()

public function export()
{
if( ! $this->export)
$this->export = new ExportHandler($this);

return $this->export;
return new ExportHandler($this);
}

public function getPoints()
Expand Down
2 changes: 1 addition & 1 deletion src/Lib/Holders/QueryLogHolder.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function __construct($sql)
$this->bindings = isset($sql->bindings) ? $sql->bindings : [];

$connection = $sql->connection;
$config = method_exists($connection, 'getConfig') ? $sql->connection->getConfig() : [];
$config = method_exists($connection, 'getConfig') ? $sql->connection->getConfig(null) : []; // null fix change https://github.com/illuminate/database/commit/ba465fbda006d70265362012653b4e97667c867b#diff-eba180ff89e23df156c82c995be952df
$this->connectionName = method_exists($connection, 'getName') ? $sql->connection->getName() : [];
if (method_exists($connection, 'getConfig')) {
$this->database = isset($config['database']) ? $config['database'] : null;
Expand Down

0 comments on commit ae1cf06

Please sign in to comment.