mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-06 07:02:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

规范代码

Browse Source
This commit is contained in:
thinkphp
2016-12-24 21:37:05 +08:00
parent 81bde424be
commit 43b364e286
45 changed files with 106 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/console/Input.php
View File

@@ -252,7 +252,7 @@ class Input
return $token;
}
return null;
return;
}
/**

3
library/think/console/command/Help.php
View File

@@ -16,7 +16,6 @@ use think\console\Input;
use think\console\input\Argument as InputArgument;
use think\console\input\Option as InputOption;
use think\console\Output;
use think\console\helper\Descriptor as DescriptorHelper;
class Help extends Command
{
@@ -67,4 +66,4 @@ EOF
$this->command = null;
}
}
}

2
library/think/console/command/optimize/Schema.php
View File

@@ -50,7 +50,7 @@ class Schema extends Command
}
$output->writeln('<info>Succeed!</info>');
return;
} else if ($input->hasOption('table')) {
} elseif ($input->hasOption('table')) {
$table = $input->getOption('table');
if (!strpos($table, '.')) {
$dbName = Db::getConfig('database');

14
library/think/console/output/driver/Console.php
View File

@@ -196,7 +196,7 @@ class Console
private function getSttyColumns()
{
if (!function_exists('proc_open')) {
return null;
return;
}
$descriptorspec = [1 => ['pipe', 'w'], 2 => ['pipe', 'w']];
@@ -209,7 +209,7 @@ class Console
return $info;
}
return null;
return;
}
/**
@@ -234,7 +234,7 @@ class Console
return $matches[2] . 'x' . $matches[1];
}
}
return null;
return;
}
private function stringWidth($string)
@@ -356,10 +356,10 @@ class Console
{
if (DIRECTORY_SEPARATOR === '\\') {
return
'10.0.10586' === PHP_WINDOWS_VERSION_MAJOR . '.' . PHP_WINDOWS_VERSION_MINOR . '.' . PHP_WINDOWS_VERSION_BUILD
|| false !== getenv('ANSICON')
|| 'ON' === getenv('ConEmuANSI')
|| 'xterm' === getenv('TERM');
'10.0.10586' === PHP_WINDOWS_VERSION_MAJOR . '.' . PHP_WINDOWS_VERSION_MINOR . '.' . PHP_WINDOWS_VERSION_BUILD
|| false !== getenv('ANSICON')
|| 'ON' === getenv('ConEmuANSI')
|| 'xterm' === getenv('TERM');
}
return function_exists('posix_isatty') && @posix_isatty($stream);