소스 검색

Merge branch '1.10'

Jordi Boggiano 4 년 전
부모
커밋
beded906ba
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      src/Composer/Command/CreateProjectCommand.php
  2. 1 1
      src/Composer/Command/RequireCommand.php

+ 1 - 1
src/Composer/Command/CreateProjectCommand.php

@@ -356,7 +356,7 @@ EOT
         }
 
         // handler Ctrl+C for unix-like systems
-        if (function_exists('pcntl_async_signals')) {
+        if (function_exists('pcntl_async_signals') && function_exists('pcntl_signal')) {
             @mkdir($directory, 0777, true);
             if ($realDir = realpath($directory)) {
                 pcntl_async_signals(true);

+ 1 - 1
src/Composer/Command/RequireCommand.php

@@ -96,7 +96,7 @@ EOT
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        if (function_exists('pcntl_async_signals')) {
+        if (function_exists('pcntl_async_signals') && function_exists('pcntl_signal')) {
             pcntl_async_signals(true);
             pcntl_signal(SIGINT, array($this, 'revertComposerFile'));
             pcntl_signal(SIGTERM, array($this, 'revertComposerFile'));