Merge pull request #14 from martinssipenko/master

marshally · marshally · commit a59e7f87d651 · 2014-07-22T14:46:11.000-05:00
Fix for fatal in #13
diff --git a/composer.json b/composer.json
@@ -5,7 +5,6 @@
     "homepage": "https://github.com/codeclimate/php-test-reporter",
     "type": "library",
     "license": "MIT",
-    "minimum-stability": "dev",
     "authors": [
         {
             "name": "Code Climate",
@@ -16,7 +15,7 @@
     "require": {
         "php": ">=5.3",
         "ext-curl": "*",
-        "satooshi/php-coveralls": ">=0.6.1",
+        "satooshi/php-coveralls": "0.6.*",
         "symfony/console": ">=2.0"
     },
     "require-dev": {
diff --git a/src/CodeClimate/Bundle/TestReporterBundle/CoverageCollector.php b/src/CodeClimate/Bundle/TestReporterBundle/CoverageCollector.php
@@ -3,8 +3,8 @@
 
 use CodeClimate\Component\System\Git\GitCommand;
 use CodeClimate\Bundle\TestReporterBundle\Entity\JsonFile;
-use Satooshi\Bundle\CoverallsV1Bundle\Api\Jobs;
-use Satooshi\Bundle\CoverallsV1Bundle\Config\Configuration;
+use Contrib\Bundle\CoverallsV1Bundle\Api\Jobs;
+use Contrib\Bundle\CoverallsV1Bundle\Config\Configuration;
 
 class CoverageCollector
 {
diff --git a/src/CodeClimate/Bundle/TestReporterBundle/Entity/JsonFile.php b/src/CodeClimate/Bundle/TestReporterBundle/Entity/JsonFile.php
@@ -4,8 +4,9 @@
 use CodeClimate\Component\System\Git\GitCommand;
 use CodeClimate\Bundle\TestReporterBundle\Entity\CiInfo;
 use CodeClimate\Bundle\TestReporterBundle\Version;
+use Contrib\Bundle\CoverallsV1Bundle\Entity\JsonFile as SatooshiJsonFile;
 
-class JsonFile extends \Satooshi\Bundle\CoverallsV1Bundle\Entity\JsonFile
+class JsonFile extends SatooshiJsonFile
 {
     public function toArray()
     {
diff --git a/src/CodeClimate/Component/System/Git/GitCommand.php b/src/CodeClimate/Component/System/Git/GitCommand.php
@@ -1,7 +1,7 @@
 <?php
 namespace CodeClimate\Component\System\Git;
 
-use Satooshi\Component\System\SystemCommand;
+use Contrib\Component\System\SystemCommand;
 
 class GitCommand extends SystemCommand
 {

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`
`4`	`4`	`use CodeClimate\Component\System\Git\GitCommand;`
`5`	`5`	`use CodeClimate\Bundle\TestReporterBundle\Entity\JsonFile;`
`6`		`-use Satooshi\Bundle\CoverallsV1Bundle\Api\Jobs;`
`7`		`-use Satooshi\Bundle\CoverallsV1Bundle\Config\Configuration;`
	`6`	`+use Contrib\Bundle\CoverallsV1Bundle\Api\Jobs;`
	`7`	`+use Contrib\Bundle\CoverallsV1Bundle\Config\Configuration;`
`8`	`8`
`9`	`9`	`class CoverageCollector`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,9 @@`
`4`	`4`	`use CodeClimate\Component\System\Git\GitCommand;`
`5`	`5`	`use CodeClimate\Bundle\TestReporterBundle\Entity\CiInfo;`
`6`	`6`	`use CodeClimate\Bundle\TestReporterBundle\Version;`
	`7`	`+use Contrib\Bundle\CoverallsV1Bundle\Entity\JsonFile as SatooshiJsonFile;`
`7`	`8`
`8`		`-class JsonFile extends \Satooshi\Bundle\CoverallsV1Bundle\Entity\JsonFile`
	`9`	`+class JsonFile extends SatooshiJsonFile`
`9`	`10`	`{`
`10`	`11`	`public function toArray()`
`11`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`	`namespace CodeClimate\Component\System\Git;`
`3`	`3`
`4`		`-use Satooshi\Component\System\SystemCommand;`
	`4`	`+use Contrib\Component\System\SystemCommand;`
`5`	`5`
`6`	`6`	`class GitCommand extends SystemCommand`
`7`	`7`	`{`