Skip to content

Commit

Permalink
Merge branch '1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
alnutile committed Mar 6, 2018
2 parents 9078670 + faaebd6 commit 3600872
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 16 deletions.
6 changes: 0 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
language: php

php:
- 5.6
- 7.0
- 7.1

Expand All @@ -14,11 +13,6 @@ cache:
directories:
- $HOME/.composer/cache

matrix:
include:
- php: 5.6
env: 'COMPOSER_FLAGS="--prefer-stable --prefer-lowest"'

before_script:
- cp .env.travis .env
- travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-dist
Expand Down
2 changes: 1 addition & 1 deletion src/BaseSensioScanner.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public function transformMessage()

protected function checkResultsFormat()
{
if (get_class($this->results) === "SensioLabs\Security\Result") {
if (!is_array($this->results) && get_class($this->results) === "SensioLabs\Security\Result") {
$this->results = json_decode($this->results, 128);
}
}
Expand Down
1 change: 1 addition & 0 deletions src/Console/SensioLabsRemoteScanCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\Log;
use AlfredNutileInc\LarScanner\SensioLabsRemoteScanner;
use function GuzzleHttp\json_encode;

class SensioLabsRemoteScanCommand extends Command
{
Expand Down
4 changes: 0 additions & 4 deletions src/SensioLabsRemoteScanner.php
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,4 @@ public function setConfig($config)
$this->config = $config;
return $this;
}




}
3 changes: 0 additions & 3 deletions src/SensioLabsScanner.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,4 @@ public function handle()

$this->triggerNotificationEvent();
}



}
3 changes: 1 addition & 2 deletions tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ protected function getPackageProviders($app)
return
[
LarScannerProvider::class,
];
];
}


Expand Down Expand Up @@ -52,5 +52,4 @@ protected function getEnvironmentSetUp($app)

$app['config']->set('cache.stores.file.path', $destination);
}

}

0 comments on commit 3600872

Please sign in to comment.