Skip to content

Commit

Permalink
Merge branch 'master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
alexander-schranz authored Feb 10, 2020
2 parents 9b466b6 + 48c31f7 commit 21ef016
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 9 deletions.
4 changes: 0 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,11 @@ dist: trusty
sudo: false

php:
- 5.5
- 5.6
- 7.0
- 7.1

matrix:
include:
- php: 5.5
env: COMPOSER_OPTIONS="--prefer-lowest --prefer-stable"
- php: 7.0
env: COMPOSER_REQUIRE="symfony/process:^2.0"
- php: 7.0
Expand Down
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
"require": {
"php" : ">=5.5",
"evenement/evenement" : "^3.0|^2.0|^1.0",
"monolog/monolog" : "^1.3",
"psr/log" : "^1.0",
"symfony/process" : "^2.3|^3.0|^4.0"
},
Expand Down
6 changes: 2 additions & 4 deletions src/Alchemy/BinaryDriver/AbstractBinary.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@
use Alchemy\BinaryDriver\Listeners\Listeners;
use Alchemy\BinaryDriver\Listeners\ListenerInterface;
use Evenement\EventEmitter;
use Monolog\Logger;
use Monolog\Handler\NullHandler;
use Psr\Log\LoggerInterface;
use Psr\Log\NullLogger;
use Symfony\Component\Process\ExecutableFinder;
use Symfony\Component\Process\Process;

Expand Down Expand Up @@ -163,8 +162,7 @@ public static function load($binaries, LoggerInterface $logger = null, $configur
}

if (null === $logger) {
$logger = new Logger(__NAMESPACE__ . ' logger');
$logger->pushHandler(new NullHandler());
$logger = new NullLogger();
}

$configuration = $configuration instanceof ConfigurationInterface ? $configuration : new Configuration($configuration);
Expand Down

0 comments on commit 21ef016

Please sign in to comment.