From 8a789ef7a38e2f2bfb4786761a99f7e698418164 Mon Sep 17 00:00:00 2001 From: Eric Dowell Date: Tue, 2 Feb 2016 13:10:22 -0600 Subject: [PATCH 1/2] Updating 'satooshi/php-coveralls' to use version 1.0.* This involves changing reference from 'Contrib\\' to new namespace, 'Satooshi\\' and changing 'setSrcDir' to 'setRootDir' method on 'Configuration' class since 'setSrcDir' has been removed. --- composer.json | 2 +- .../Bundle/TestReporterBundle/CoverageCollector.php | 6 +++--- .../Bundle/TestReporterBundle/Entity/JsonFile.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 21dcb63..ef9465f 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "require": { "php": ">=5.3", "ext-curl": "*", - "satooshi/php-coveralls": "0.6.*", + "satooshi/php-coveralls": "1.0.*", "symfony/console": ">=2.0" }, "require-dev": { diff --git a/src/CodeClimate/Bundle/TestReporterBundle/CoverageCollector.php b/src/CodeClimate/Bundle/TestReporterBundle/CoverageCollector.php index 24e0f88..e35326e 100644 --- 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 Contrib\Bundle\CoverallsV1Bundle\Api\Jobs; -use Contrib\Bundle\CoverallsV1Bundle\Config\Configuration; +use Satooshi\Bundle\CoverallsV1Bundle\Api\Jobs; +use Satooshi\Bundle\CoverallsV1Bundle\Config\Configuration; class CoverageCollector { @@ -20,7 +20,7 @@ public function __construct($paths) { $rootDir = getcwd(); $config = new Configuration(); - $config->setSrcDir($rootDir); + $config->setRootDir($rootDir); $this->setCloverPaths($paths); foreach ($this->getCloverPaths() as $path) { if (file_exists($path)) { diff --git a/src/CodeClimate/Bundle/TestReporterBundle/Entity/JsonFile.php b/src/CodeClimate/Bundle/TestReporterBundle/Entity/JsonFile.php index 658c7d8..c9ec0c8 100644 --- a/src/CodeClimate/Bundle/TestReporterBundle/Entity/JsonFile.php +++ b/src/CodeClimate/Bundle/TestReporterBundle/Entity/JsonFile.php @@ -4,7 +4,7 @@ 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; +use Satooshi\Bundle\CoverallsV1Bundle\Entity\JsonFile as SatooshiJsonFile; class JsonFile extends SatooshiJsonFile { From e078abb9295f0def0db95aa290a227a17ee70127 Mon Sep 17 00:00:00 2001 From: Eric Dowell Date: Tue, 2 Feb 2016 13:31:03 -0600 Subject: [PATCH 2/2] Missed reference to old namespace 'Contrib'. --- src/CodeClimate/Component/System/Git/GitCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CodeClimate/Component/System/Git/GitCommand.php b/src/CodeClimate/Component/System/Git/GitCommand.php index 00a9e6d..3cc3a1e 100644 --- a/src/CodeClimate/Component/System/Git/GitCommand.php +++ b/src/CodeClimate/Component/System/Git/GitCommand.php @@ -1,7 +1,7 @@