浏览代码

Ensure that a missing SSL/TLS protection warning does not pollute STDOUT

Fixes #7737
Alexey Kopytko 6 年之前
父节点
当前提交
20107dbf77
共有 2 个文件被更改,包括 41 次插入1 次删除
  1. 1 1
      src/Composer/Factory.php
  2. 40 0
      tests/Composer/Test/FactoryTest.php

+ 1 - 1
src/Composer/Factory.php

@@ -588,7 +588,7 @@ class Factory
         $disableTls = false;
         if ($config && $config->get('disable-tls') === true) {
             if (!$warned) {
-                $io->write('<warning>You are running Composer with SSL/TLS protection disabled.</warning>');
+                $io->writeError('<warning>You are running Composer with SSL/TLS protection disabled.</warning>');
             }
             $warned = true;
             $disableTls = true;

+ 40 - 0
tests/Composer/Test/FactoryTest.php

@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <naderman@naderman.de>
+ *     Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Composer\Test;
+
+use PHPUnit\Framework\TestCase;
+use Composer\Factory;
+
+class FactoryTest extends TestCase
+{
+    /**
+     * @group TLS
+     */
+    public function testDefaultValuesAreAsExpected()
+    {
+        $ioMock = $this->getMockBuilder('Composer\IO\IOInterface')->getMock();
+
+        $ioMock->expects($this->once())
+            ->method("writeError");
+
+        $config = $this
+            ->getMockBuilder('Composer\Config')
+            ->getMock();
+
+        $config->method('get')
+            ->with($this->equalTo('disable-tls'))
+            ->will($this->returnValue(true));
+
+        Factory::createRemoteFilesystem($ioMock, $config);
+    }
+}