Some improvements.

corpsee · corpsee · commit ac64cf4fa606 · 2020-11-02T21:36:51.000+07:00
diff --git a/src/CodeQuality/Pahout.php b/src/CodeQuality/Pahout.php
@@ -16,6 +16,7 @@
  * @subpackage Plugins
  *
  * @author Dmitry Khomutov <poisoncorpsee@gmail.com>
+ * @author Panagiotis Kosmidis <panoskosmidis87@gmail.com>
  */
 class Pahout extends Plugin
 {
diff --git a/src/CodeQuality/Phan.php b/src/CodeQuality/Phan.php
@@ -17,6 +17,7 @@
  * @subpackage Plugins
  *
  * @author Dmitry Khomutov <poisoncorpsee@gmail.com>
+ * @author Fred Delrieu <caouecs@caouecs.net>
  */
 class Phan extends Plugin
 {
diff --git a/src/CodeQuality/Phlint.php b/src/CodeQuality/Phlint.php
@@ -18,6 +18,7 @@
  * @subpackage Plugins
  *
  * @author Dmitry Khomutov <poisoncorpsee@gmail.com>
+ * @author Panagiotis Kosmidis <panoskosmidis87@gmail.com>
  */
 class Phlint extends Plugin
 {
diff --git a/src/CodeQuality/PhpStan.php b/src/CodeQuality/PhpStan.php
@@ -18,6 +18,7 @@
  * @subpackage Plugins
  *
  * @author Dmitry Khomutov <poisoncorpsee@gmail.com>
+ * @author Panagiotis Kosmidis <panoskosmidis87@gmail.com>
  */
 class PhpStan extends Plugin
 {
diff --git a/src/CodeQuality/Psalm.php b/src/CodeQuality/Psalm.php
@@ -15,6 +15,7 @@
  * @subpackage Plugins
  *
  * @author Dmitry Khomutov <poisoncorpsee@gmail.com>
+ * @author Panagiotis Kosmidis <panoskosmidis87@gmail.com>
  */
 class Psalm extends Plugin
 {
diff --git a/src/CodeQuality/SecurityChecker.php b/src/CodeQuality/SecurityChecker.php
@@ -6,6 +6,7 @@
 
 use PHPCensor\Common\Build\BuildErrorInterface;
 use PHPCensor\Common\Build\BuildInterface;
+use PHPCensor\Common\Exception\Exception;
 use PHPCensor\Common\Plugin\Plugin;
 use PHPCensor\Common\Plugin\ZeroConfigPluginInterface;
 use SensioLabs\Security\SecurityChecker as SensiolabsSecurityChecker;
@@ -38,9 +39,30 @@ public static function getName(): string
      */
     public function execute(): bool
     {
-        $success  = true;
-        $checker  = new SensiolabsSecurityChecker();
-        $result   = $checker->check($this->build->getBuildPath() . 'composer.lock');
+        $success = true;
+        if (\in_array('symfony', $this->binaryNames, true)) {
+            $lockFile = $this->build->getBuildPath() . 'composer.lock';
+            if (!\is_file($lockFile)) {
+                throw new Exception('Lock file (composer.lock) does not exist.');
+            }
+
+            $cmd        = '%s check:security --format=json --dir=%s';
+            $executable = $this->commandExecutor->findBinary($this->binaryNames, $this->binaryPath);
+            if (!$this->build->isDebug()) {
+                $this->commandExecutor->disableCommandOutput();
+            }
+
+            // works with dir, composer.lock, composer.json
+            $this->commandExecutor->executeCommand($cmd, $executable, $lockFile);
+
+            $this->commandExecutor->enableCommandOutput();
+
+            $result = $this->commandExecutor->getLastCommandOutput();
+        } else {
+            $checker = new SensiolabsSecurityChecker();
+            $result  = $checker->check($this->build->getBuildPath() . 'composer.lock');
+        }
+
         $warnings = \json_decode((string)$result, true);
 
         if ($warnings) {
diff --git a/src/Common/Phar.php b/src/Common/Phar.php
@@ -15,6 +15,7 @@
  * @subpackage Plugins
  *
  * @author Dmitry Khomutov <poisoncorpsee@gmail.com>
+ * @author Wanderson Camargo <wandersonwhcr@gmail.com>
  */
 class Phar extends Plugin
 {
diff --git a/src/Deploy/Deployer.php b/src/Deploy/Deployer.php
@@ -4,7 +4,7 @@
 
 namespace PHPCensor\Plugins\Deploy;
 
-use GuzzleHttp\Client;
+use GuzzleHttp\Client as HttpClient;
 use PHPCensor\Common\Build\BuildInterface;
 use PHPCensor\Common\Plugin\Plugin;
 
@@ -42,7 +42,7 @@ public function execute(): bool
             return false;
         }
 
-        $client   = new Client();
+        $client   = new HttpClient();
         $response = $client->post(
             $this->webhookUrl,
             [
@@ -59,9 +59,7 @@ public function execute(): bool
 
         $status = (int)$response->getStatusCode();
 
-        return ($status >= 200 && $status < 300)
-            ? true
-            : false;
+        return ($status >= 200 && $status < 300);
     }
 
     /**
diff --git a/src/Deploy/Mage.php b/src/Deploy/Mage.php
@@ -15,6 +15,7 @@
  * @subpackage Plugins
  *
  * @author Dmitry Khomutov <poisoncorpsee@gmail.com>
+ * @author Stepan Strelets <s.strelec@nikitaonline.ru>
  */
 class Mage extends Plugin
 {
diff --git a/src/Deploy/Mage3.php b/src/Deploy/Mage3.php
@@ -15,6 +15,7 @@
  * @subpackage Plugins
  *
  * @author Dmitry Khomutov <poisoncorpsee@gmail.com>
+ * @author Stepan Strelets <s.strelec@nikitaonline.ru>
  */
 class Mage3 extends Plugin
 {
diff --git a/src/Notification/CampfireNotify.php b/src/Notification/CampfireNotify.php
@@ -103,7 +103,9 @@ protected function initPluginSettings(): void
         $this->authToken = $buildSettingsBag->get('authToken', $this->authToken);
         $this->roomId    = $buildSettingsBag->get('roomId', $this->roomId);
 
-        $this->message   = $this->options->get('message', $this->message);
+        $this->message = (string)$this->options->get('message', $this->message);
+        $this->verbose = (bool)$this->options->get('verbose', $this->verbose);
+
         $this->userAgent = 'PHP Censor/' . $this->variableInterpolator->interpolate('%SYSTEM_VERSION%');
         $this->cookie    = "php-censor-cookie";
     }
diff --git a/src/Testing/Atoum.php b/src/Testing/Atoum.php
@@ -14,6 +14,7 @@
  * @subpackage Plugins
  *
  * @author Dmitry Khomutov <poisoncorpsee@gmail.com>
+ * @author Sanpi <sanpi@homecomputing.fr>
  */
 class Atoum extends Plugin
 {
diff --git a/tests/src/Common/ComposerTest.php b/tests/src/Common/ComposerTest.php
@@ -21,13 +21,40 @@ public function testGetName()
      * @param string $stage
      * @param bool $expectedResult
      */
-    public function testCanExecute(string $stage, bool $expectedResult)
+    public function testCanExecuteWithNotExistsPath(string $stage, bool $expectedResult)
     {
+        $build = $this->createMock(BuildInterface::class);
+        $build
+            ->method('getBuildPath')
+            ->willReturn('/var/www/php-censor.local/runtime/builds/1/');
+
+        $this->assertEquals(
+            false,
+            Composer::canExecute(
+                $stage,
+                $build
+            )
+        );
+    }
+
+    /**
+     * @dataProvider canExecuteProvider
+     *
+     * @param string $stage
+     * @param bool $expectedResult
+     */
+    public function testCanExecuteWithExistsPath(string $stage, bool $expectedResult)
+    {
+        $build = $this->createMock(BuildInterface::class);
+        $build
+            ->method('getBuildPath')
+            ->willReturn(\rtrim(\dirname(\dirname(\dirname(__DIR__))), "/\\") . '/');
+
         $this->assertEquals(
             $expectedResult,
             Composer::canExecute(
                 $stage,
-                $this->createMock(BuildInterface::class)
+                $build
             )
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`* @subpackage Plugins`
`17`	`17`	`*`
`18`	`18`	`* @author Dmitry Khomutov <poisoncorpsee@gmail.com>`
	`19`	`+ * @author Panagiotis Kosmidis <panoskosmidis87@gmail.com>`
`19`	`20`	`*/`
`20`	`21`	`class Pahout extends Plugin`
`21`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`* @subpackage Plugins`
`18`	`18`	`*`
`19`	`19`	`* @author Dmitry Khomutov <poisoncorpsee@gmail.com>`
	`20`	`+ * @author Fred Delrieu <caouecs@caouecs.net>`
`20`	`21`	`*/`
`21`	`22`	`class Phan extends Plugin`
`22`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`* @subpackage Plugins`
`19`	`19`	`*`
`20`	`20`	`* @author Dmitry Khomutov <poisoncorpsee@gmail.com>`
	`21`	`+ * @author Panagiotis Kosmidis <panoskosmidis87@gmail.com>`
`21`	`22`	`*/`
`22`	`23`	`class Phlint extends Plugin`
`23`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`* @subpackage Plugins`
`16`	`16`	`*`
`17`	`17`	`* @author Dmitry Khomutov <poisoncorpsee@gmail.com>`
	`18`	`+ * @author Panagiotis Kosmidis <panoskosmidis87@gmail.com>`
`18`	`19`	`*/`
`19`	`20`	`class Psalm extends Plugin`
`20`	`21`	`{`