Merge remote-tracking branch 'origin/collection' into interface

cloak-php · May 10, 2015 · bda83ec · bda83ec
2 parents 3fc8743 + e4958a9
commit bda83ec
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 42 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,6 +32,7 @@ Version 2.0.0
 * AnalyzerInterface to Analyzer
 * AbstractTypeResultInterface to AbstractTypeResultNode
 * CoverageResultCollectionInterface to CoverageResultNodeCollection
+* Remove LineResultCollectionInterface
 
 
 Version 1.8.3

diff --git a/spec/result/CoverageResult.spec.php b/spec/result/CoverageResult.spec.php
@@ -11,7 +11,9 @@
 
 use cloak\value\Coverage;
 use cloak\spec\result\FixtureCoverageResult;
-use cloak\result\LineResultCollectionInterface;
+use cloak\result\CoverageResult;
+use cloak\result\LineCountResult;
+use cloak\result\CodeCoverageResult;
 use Prophecy\Prophet;
 
 
@@ -20,7 +22,7 @@
         beforeEach(function() {
             $this->prophet = new Prophet();
 
-            $lineResult = $this->prophet->prophesize(LineResultCollectionInterface::class);
+            $lineResult = $this->prophet->prophesize(LineCountResult::class);
             $lineResult->getLineCount()->willReturn(10);
 
             $this->result = new FixtureCoverageResult( $lineResult->reveal() );
@@ -34,7 +36,7 @@
         beforeEach(function() {
             $this->prophet = new Prophet();
 
-            $lineResult = $this->prophet->prophesize(LineResultCollectionInterface::class);
+            $lineResult = $this->prophet->prophesize(LineCountResult::class);
             $lineResult->getDeadLineCount()->willReturn(10);
 
             $this->result = new FixtureCoverageResult( $lineResult->reveal() );
@@ -48,7 +50,7 @@
         beforeEach(function() {
             $this->prophet = new Prophet();
 
-            $lineResult = $this->prophet->prophesize(LineResultCollectionInterface::class);
+            $lineResult = $this->prophet->prophesize(LineCountResult::class);
             $lineResult->getUnusedLineCount()->willReturn(10);
 
             $this->result = new FixtureCoverageResult( $lineResult->reveal() );
@@ -62,7 +64,7 @@
         beforeEach(function() {
             $this->prophet = new Prophet();
 
-            $lineResult = $this->prophet->prophesize(LineResultCollectionInterface::class);
+            $lineResult = $this->prophet->prophesize(LineCountResult::class);
             $lineResult->getExecutedLineCount()->willReturn(10);
 
             $this->result = new FixtureCoverageResult( $lineResult->reveal() );
@@ -76,7 +78,7 @@
         beforeEach(function() {
             $this->prophet = new Prophet();
 
-            $lineResult = $this->prophet->prophesize(LineResultCollectionInterface::class);
+            $lineResult = $this->prophet->prophesize(CodeCoverageResult::class);
             $lineResult->getCodeCoverage()->willReturn(100);
 
             $this->result = new FixtureCoverageResult( $lineResult->reveal() );
@@ -91,7 +93,7 @@
             $this->prophet = new Prophet();
             $this->coverage = new Coverage(51);
 
-            $lineResult = $this->prophet->prophesize(LineResultCollectionInterface::class);
+            $lineResult = $this->prophet->prophesize(CodeCoverageResult::class);
             $lineResult->isCoverageLessThan($this->coverage)->willReturn(true);
 
             $this->result = new FixtureCoverageResult( $lineResult->reveal() );
@@ -107,7 +109,7 @@
             $this->prophet = new Prophet();
             $this->coverage = new Coverage(51);
 
-            $lineResult = $this->prophet->prophesize(LineResultCollectionInterface::class);
+            $lineResult = $this->prophet->prophesize(CodeCoverageResult::class);
             $lineResult->isCoverageGreaterEqual($this->coverage)
                 ->willReturn(false);
 

diff --git a/spec/result/FileResult.spec.php b/spec/result/FileResult.spec.php
@@ -12,11 +12,10 @@
 use cloak\result\FileResult;
 use cloak\result\LineResult;
 use cloak\result\collection\LineResultCollection;
-use cloak\result\LineResultCollectionInterface;
 use cloak\result\collection\CoverageResultCollection;
 
 
-describe(LineResultCollectionInterface::class, function() {
+describe(FileResult::class, function() {
 
     describe('#getRelativePath', function() {
         beforeEach(function() {
@@ -35,7 +34,7 @@
                 $this->file = new FileResult(__DIR__ . '/../fixtures/src/foo.php', $this->lineSet);
             });
             it('return cloak\result\LineResultCollectionInterface instance', function() {
-                expect($this->file->getLineResults())->toBeAnInstanceOf(LineResultCollectionInterface::class);
+                expect($this->file->getLineResults())->toBeAnInstanceOf(LineResultCollection::class);
             });
         });
         context('when line is not empty', function() {
@@ -47,7 +46,7 @@
                 $this->file = new FileResult(__DIR__ . '/../fixtures/src/foo.php', $this->lineSet);
             });
             it('should return cloak\result\LineResultCollectionInterface instance', function() {
-                expect($this->file->getLineResults())->toBeAnInstanceOf(LineResultCollectionInterface::class);
+                expect($this->file->getLineResults())->toBeAnInstanceOf(LineResultCollection::class);
             });
             it('should return cloak\result\LineResultCollectionInterface instance', function() {
                 expect($this->file->getLineResults()->getLineCount())->toEqual(2);

diff --git a/src/result/CoverageResult.php b/src/result/CoverageResult.php
@@ -22,7 +22,7 @@ trait CoverageResult
 {
 
     /**
-     * @var LineResultCollectionInterface
+     * @var \cloak\result\collection\LineResultCollection
      */
     protected $lineResults;
 

diff --git a/src/result/LineResultCollectionInterface.php b/src/result/LineResultCollectionInterface.php
diff --git a/src/result/collection/LineResultCollection.php b/src/result/collection/LineResultCollection.php
@@ -11,11 +11,14 @@
 
 namespace cloak\result\collection;
 
+use cloak\Collection;
 use cloak\collection\ElementStackable;
 use cloak\value\Coverage;
 use cloak\value\LineRange;
-use cloak\result\LineResultCollectionInterface;
 use cloak\result\LineResult;
+use cloak\result\CodeCoverageResult;
+use cloak\result\LineResultSelectable;
+use cloak\result\LineCountResult;
 use cloak\reflection\Reflection;
 use PhpCollection\Sequence;
 
@@ -24,7 +27,7 @@
  * Class LineResultCollection
  * @package cloak\result\collection
  */
-class LineResultCollection implements LineResultCollectionInterface
+class LineResultCollection implements CodeCoverageResult, LineResultSelectable, LineCountResult, Collection
 {
 
     use ElementStackable;
@@ -114,7 +117,7 @@ public function isCoverageGreaterEqual(Coverage $coverage)
 
     /**
      * @param LineRange $lineRange
-     * @return LineResultCollectionInterface
+     * @return LineResultCollection
      */
     public function selectRange(LineRange $lineRange)
     {
@@ -128,7 +131,7 @@ public function selectRange(LineRange $lineRange)
 
     /**
      * @param Reflection $reflection
-     * @return LineResultCollectionInterface
+     * @return LineResultCollection
      */
     public function selectByReflection(Reflection $reflection)
     {
@@ -138,7 +141,7 @@ public function selectByReflection(Reflection $reflection)
 
     /**
      * @param array $analyzeResults
-     * @return LineResultCollectionInterface
+     * @return LineResultCollection
      */
     public static function from(array $analyzeResults)
     {