Merge pull request #12 from shochdoerfer/feature/upgrade_securitychecker

Upgrade sensiolabs/security-checker to version 5

Author: shochdoerfer

README.md

@@ -32,7 +32,7 @@ in your main build.xml file:
 
 ```xml
     <property name="securitychecker.lockfile" value="composer.lock" />
-    <property name="securitychecker.endpoint" value="https://security.sensiolabs.org/check_lock" />
+    <property name="securitychecker.endpoint" value="https://security.symfony.com/check_lock" />
 ```
 
 Or define the securitychecker task on your own:

clover.xml

@@ -18,7 +18,7 @@
   "require": {
     "php": "^7.0",
     "phing/phing": "^2.8.0",
-    "sensiolabs/security-checker": "^4.0"
+    "sensiolabs/security-checker": "^5.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^6.0",

composer.json

@@ -67,6 +67,7 @@ public function main()
         }
 
         $checker = $this->getSecurityChecker();
+        $vulnerabilities = [];
 
         try {
             if (!empty($this->timeout)) {
@@ -77,7 +78,6 @@ public function main()
             }
 
             $vulnerabilities = $checker->check($this->lockFile);
-
             foreach ($vulnerabilities as $dependency => $issues) {
                 $dependencyFullName = $dependency . ' (' . $issues['version'] . ')';
                 $this->log($dependencyFullName);
@@ -101,7 +101,7 @@ public function main()
             throw new \BuildException($e);
         }
 
-        if ($checker->getLastVulnerabilityCount() > 0) {
+        if (count($vulnerabilities) > 0) {
             throw new \BuildException('Vulnerabilities found!');
         }
     }

composer.lock

@@ -12,7 +12,7 @@
 namespace bitExpert\Phing\SecurityChecker;
 
 use PHPUnit\Framework\TestCase;
-use SensioLabs\Security\Crawler\CrawlerInterface;
+use SensioLabs\Security\Crawler;
 use SensioLabs\Security\SecurityChecker;
 
 /**
@@ -23,7 +23,7 @@
 class SecurityCheckerTaskUnitTest extends TestCase
 {
     /**
-     * @var CrawlerInterface|TestCase
+     * @var Crawler|TestCase
      */
     private $crawler;
     /**
@@ -92,8 +92,9 @@ public function endPointParameterShouldBePassedToSecurityCheckerWhenGiven()
 
     /**
      * @test
+     * @expectedException \BuildException
      */
-    public function advisoriesIncludingLinkWillCallLogMethodFiveTimes()
+    public function advisoriesIncludingLinkWillCallLogMethodFiveTimesAndThrowBuildException()
     {
         $vulnerabilities = [
             'my/dependency' => [
@@ -119,8 +120,9 @@ public function advisoriesIncludingLinkWillCallLogMethodFiveTimes()
 
     /**
      * @test
+     * @expectedException \BuildException
      */
-    public function advisoriesWithEmptyLinkWillCallLogMethodFourTimes()
+    public function advisoriesWithEmptyLinkWillCallLogMethodFourTimesAndThrowBuildException()
     {
         $vulnerabilities = [
             'my/dependency' => [
@@ -144,20 +146,6 @@ public function advisoriesWithEmptyLinkWillCallLogMethodFourTimes()
         $this->checkerTask->main();
     }
 
-    /**
-     * @test
-     * @expectedException \BuildException
-     */
-    public function throwsBuildExceptionWhenVulnerabilitiesFound()
-    {
-        $this->checker->expects($this->once())
-            ->method('getLastVulnerabilityCount')
-            ->will($this->returnValue(1));
-
-        $this->checkerTask->setLockfile(__FILE__);
-        $this->checkerTask->main();
-    }
-
     /**
      * Helper method to create all required mock objects and configure the {@link \SensioLabs\Security\SecurityChecker}
      * instance to return the given $vulnerabilities.
@@ -166,14 +154,14 @@ public function throwsBuildExceptionWhenVulnerabilitiesFound()
      */
     protected function createMockObjects(array $vulnerabilities = [])
     {
-        $this->crawler = $this->createMock(CrawlerInterface::class);
+        $this->crawler = $this->createMock(Crawler::class);
         $this->checker = $this->createMock(SecurityChecker::class);
         $this->checker->expects($this->any())
             ->method('check')
-            ->will($this->returnValue($vulnerabilities));
+            ->willReturn($vulnerabilities);
         $this->checker->expects($this->any())
             ->method('getCrawler')
-            ->will($this->returnValue($this->crawler));
+            ->willReturn($this->crawler);
 
         $this->checkerTask = $this->createPartialMock(
             SecurityCheckerTask::class,
@@ -184,7 +172,7 @@ protected function createMockObjects(array $vulnerabilities = [])
         );
         $this->checkerTask->expects($this->any())
             ->method('getSecurityChecker')
-            ->will($this->returnValue($this->checker));
+            ->willReturn($this->checker);
         $this->checkerTask->setProject(new \Project());
     }
 }