Jordi Boggiano 6 年之前
父節點
當前提交
f54237159d

+ 4 - 4
tests/Composer/Test/Repository/Pear/ChannelReaderTest.php

@@ -28,13 +28,13 @@ class ChannelReaderTest extends TestCase
 {
 {
     public function testShouldBuildPackagesFromPearSchema()
     public function testShouldBuildPackagesFromPearSchema()
     {
     {
-        $rfs = new HttpDownloaderMock(array(
+        $httpDownloader = new HttpDownloaderMock(array(
             'http://pear.net/channel.xml' => file_get_contents(__DIR__ . '/Fixtures/channel.1.1.xml'),
             'http://pear.net/channel.xml' => file_get_contents(__DIR__ . '/Fixtures/channel.1.1.xml'),
             'http://test.loc/rest11/c/categories.xml' => file_get_contents(__DIR__ . '/Fixtures/Rest1.1/categories.xml'),
             'http://test.loc/rest11/c/categories.xml' => file_get_contents(__DIR__ . '/Fixtures/Rest1.1/categories.xml'),
             'http://test.loc/rest11/c/Default/packagesinfo.xml' => file_get_contents(__DIR__ . '/Fixtures/Rest1.1/packagesinfo.xml'),
             'http://test.loc/rest11/c/Default/packagesinfo.xml' => file_get_contents(__DIR__ . '/Fixtures/Rest1.1/packagesinfo.xml'),
         ));
         ));
 
 
-        $reader = new \Composer\Repository\Pear\ChannelReader($rfs);
+        $reader = new \Composer\Repository\Pear\ChannelReader($httpDownloader);
 
 
         $channelInfo = $reader->read('http://pear.net/');
         $channelInfo = $reader->read('http://pear.net/');
         $packages = $channelInfo->getPackages();
         $packages = $channelInfo->getPackages();
@@ -50,7 +50,7 @@ class ChannelReaderTest extends TestCase
 
 
     public function testShouldSelectCorrectReader()
     public function testShouldSelectCorrectReader()
     {
     {
-        $rfs = new HttpDownloaderMock(array(
+        $httpDownloader = new HttpDownloaderMock(array(
             'http://pear.1.0.net/channel.xml' => file_get_contents(__DIR__ . '/Fixtures/channel.1.0.xml'),
             'http://pear.1.0.net/channel.xml' => file_get_contents(__DIR__ . '/Fixtures/channel.1.0.xml'),
             'http://test.loc/rest10/p/packages.xml' => file_get_contents(__DIR__ . '/Fixtures/Rest1.0/packages.xml'),
             'http://test.loc/rest10/p/packages.xml' => file_get_contents(__DIR__ . '/Fixtures/Rest1.0/packages.xml'),
             'http://test.loc/rest10/p/http_client/info.xml' => file_get_contents(__DIR__ . '/Fixtures/Rest1.0/http_client_info.xml'),
             'http://test.loc/rest10/p/http_client/info.xml' => file_get_contents(__DIR__ . '/Fixtures/Rest1.0/http_client_info.xml'),
@@ -64,7 +64,7 @@ class ChannelReaderTest extends TestCase
             'http://test.loc/rest11/c/Default/packagesinfo.xml' => file_get_contents(__DIR__ . '/Fixtures/Rest1.1/packagesinfo.xml'),
             'http://test.loc/rest11/c/Default/packagesinfo.xml' => file_get_contents(__DIR__ . '/Fixtures/Rest1.1/packagesinfo.xml'),
         ));
         ));
 
 
-        $reader = new \Composer\Repository\Pear\ChannelReader($rfs);
+        $reader = new \Composer\Repository\Pear\ChannelReader($httpDownloader);
 
 
         $reader->read('http://pear.1.0.net/');
         $reader->read('http://pear.1.0.net/');
         $reader->read('http://pear.1.1.net/');
         $reader->read('http://pear.1.1.net/');

+ 2 - 2
tests/Composer/Test/Repository/Pear/ChannelRest10ReaderTest.php

@@ -19,7 +19,7 @@ class ChannelRest10ReaderTest extends TestCase
 {
 {
     public function testShouldBuildPackagesFromPearSchema()
     public function testShouldBuildPackagesFromPearSchema()
     {
     {
-        $rfs = new HttpDownloaderMock(array(
+        $httpDownloader = new HttpDownloaderMock(array(
             'http://test.loc/rest10/p/packages.xml' => file_get_contents(__DIR__ . '/Fixtures/Rest1.0/packages.xml'),
             'http://test.loc/rest10/p/packages.xml' => file_get_contents(__DIR__ . '/Fixtures/Rest1.0/packages.xml'),
             'http://test.loc/rest10/p/http_client/info.xml' => file_get_contents(__DIR__ . '/Fixtures/Rest1.0/http_client_info.xml'),
             'http://test.loc/rest10/p/http_client/info.xml' => file_get_contents(__DIR__ . '/Fixtures/Rest1.0/http_client_info.xml'),
             'http://test.loc/rest10/r/http_client/allreleases.xml' => file_get_contents(__DIR__ . '/Fixtures/Rest1.0/http_client_allreleases.xml'),
             'http://test.loc/rest10/r/http_client/allreleases.xml' => file_get_contents(__DIR__ . '/Fixtures/Rest1.0/http_client_allreleases.xml'),
@@ -29,7 +29,7 @@ class ChannelRest10ReaderTest extends TestCase
             'http://test.loc/rest10/r/http_request/deps.1.4.0.txt' => file_get_contents(__DIR__ . '/Fixtures/Rest1.0/http_request_deps.1.4.0.txt'),
             'http://test.loc/rest10/r/http_request/deps.1.4.0.txt' => file_get_contents(__DIR__ . '/Fixtures/Rest1.0/http_request_deps.1.4.0.txt'),
         ));
         ));
 
 
-        $reader = new \Composer\Repository\Pear\ChannelRest10Reader($rfs);
+        $reader = new \Composer\Repository\Pear\ChannelRest10Reader($httpDownloader);
 
 
         /** @var \Composer\Package\PackageInterface[] $packages */
         /** @var \Composer\Package\PackageInterface[] $packages */
         $packages = $reader->read('http://test.loc/rest10');
         $packages = $reader->read('http://test.loc/rest10');

+ 2 - 2
tests/Composer/Test/Repository/Pear/ChannelRest11ReaderTest.php

@@ -19,13 +19,13 @@ class ChannelRest11ReaderTest extends TestCase
 {
 {
     public function testShouldBuildPackagesFromPearSchema()
     public function testShouldBuildPackagesFromPearSchema()
     {
     {
-        $rfs = new HttpDownloaderMock(array(
+        $httpDownloader = new HttpDownloaderMock(array(
             'http://pear.1.1.net/channel.xml' => file_get_contents(__DIR__ . '/Fixtures/channel.1.1.xml'),
             'http://pear.1.1.net/channel.xml' => file_get_contents(__DIR__ . '/Fixtures/channel.1.1.xml'),
             'http://test.loc/rest11/c/categories.xml' => file_get_contents(__DIR__ . '/Fixtures/Rest1.1/categories.xml'),
             'http://test.loc/rest11/c/categories.xml' => file_get_contents(__DIR__ . '/Fixtures/Rest1.1/categories.xml'),
             'http://test.loc/rest11/c/Default/packagesinfo.xml' => file_get_contents(__DIR__ . '/Fixtures/Rest1.1/packagesinfo.xml'),
             'http://test.loc/rest11/c/Default/packagesinfo.xml' => file_get_contents(__DIR__ . '/Fixtures/Rest1.1/packagesinfo.xml'),
         ));
         ));
 
 
-        $reader = new \Composer\Repository\Pear\ChannelRest11Reader($rfs);
+        $reader = new \Composer\Repository\Pear\ChannelRest11Reader($httpDownloader);
 
 
         /** @var \Composer\Package\PackageInterface[] $packages */
         /** @var \Composer\Package\PackageInterface[] $packages */
         $packages = $reader->read('http://test.loc/rest11');
         $packages = $reader->read('http://test.loc/rest11');