Merge pull request #3 from olivertappin/hotfix/2

Fixed issue with non-zero exit code after displaying violations

Author: olivertappin

.travis.yml

@@ -16,8 +16,8 @@ matrix:
   - php: nightly
 
 before_script:
-  - composer update 
+  - composer update --no-interaction
 
 script:
-  - vendor/bin/phpunit
+  - vendor/bin/phpunit --stop-on-failure
 

src/Mapper/PhpcsOutputMapper.php src/Mapper/PhpcsViolationsMapper.phpsrc/Mapper/PhpcsOutputMapper.php renamed to src/Mapper/PhpcsViolationsMapper.php

@@ -2,7 +2,7 @@
 
 namespace PhpcsDiff\Mapper;
 
-class PhpcsOutputMapper implements MapperInterface
+class PhpcsViolationsMapper implements MapperInterface
 {
     /**
      * @var array

src/PhpcsDiff.php

@@ -7,7 +7,7 @@
 use PhpcsDiff\Filter\Filter;
 use PhpcsDiff\Filter\Rule\HasMessagesRule;
 use PhpcsDiff\Filter\Rule\PhpFileRule;
-use PhpcsDiff\Mapper\PhpcsOutputMapper;
+use PhpcsDiff\Mapper\PhpcsViolationsMapper;
 
 class PhpcsDiff
 {
@@ -168,7 +168,7 @@ public function run()
             $this->climate->comment('Comparing phpcs output with changes lines from git diff.');
         }
 
-        $output = (new PhpcsOutputMapper(
+        $violations = (new PhpcsViolationsMapper(
             $changedLinesPerFile,
             getcwd()
         ))->map($files);
@@ -177,14 +177,12 @@ public function run()
             $this->climate->comment('Preparing report.');
         }
 
-        if (empty($output)) {
+        if (empty($violations)) {
             $this->climate->info('No violations to report.');
             return;
         }
 
-        $this->climate->flank(strtoupper('Start of phpcs check'), '#', 10)->br();
-        $this->climate->out(implode(PHP_EOL, $output));
-        $this->climate->flank(strtoupper('End of phpcs check'), '#', 11);
+        $this->outputViolations($violations);
     }
 
     /**
@@ -210,6 +208,18 @@ protected function runPhpcs(array $files = [], $ruleset = 'ruleset.xml')
         );
     }
 
+    /**
+     * @param array $output
+     */
+    protected function outputViolations(array $output)
+    {
+        $this->climate->flank(strtoupper('Start of phpcs check'), '#', 10)->br();
+        $this->climate->out(implode(PHP_EOL, $output));
+        $this->climate->flank(strtoupper('End of phpcs check'), '#', 11)->br();
+
+        $this->error('Violations have been reported.');
+    }
+
     /**
      * Returns a list of files which are within the diff based on the current branch
      *

tests/Mapper/PhpcsOutputMapperTest.php …sts/Mapper/PhpcsViolationsMapperTest.phptests/Mapper/PhpcsOutputMapperTest.php renamed to tests/Mapper/PhpcsViolationsMapperTest.php tests/Mapper/PhpcsOutputMapperTest.php renamed to tests/Mapper/PhpcsViolationsMapperTest.php

@@ -3,17 +3,17 @@
 namespace PhpcsDiff\Tests\Mapper;
 
 use PhpcsDiff\Mapper\MapperInterface;
-use PhpcsDiff\Mapper\PhpcsOutputMapper;
+use PhpcsDiff\Mapper\PhpcsViolationsMapper;
 use PhpcsDiff\Tests\TestBase;
 
-class PhpcsOutputMapperTest extends TestBase
+class PhpcsViolationsMapperTest extends TestBase
 {
     /**
      * @covers PhpcsOutputMapper::__construct
      */
     public function testMapperInstance()
     {
-        $mapper = new PhpcsOutputMapper([], '');
+        $mapper = new PhpcsViolationsMapper([], '');
 
         $this->assertInstanceOf(MapperInterface::class, $mapper);
     }
@@ -23,7 +23,7 @@ public function testMapperInstance()
      */
     public function testEmptyMapper()
     {
-        $mappedData = (new PhpcsOutputMapper([], ''))->map([]);
+        $mappedData = (new PhpcsViolationsMapper([], ''))->map([]);
 
         $this->assertEmpty($mappedData);
     }