Skip to content

Commit f2a8ad7

Browse files
authored
Merge pull request #238 from ruudk/is-dir
Fix passing configure options without being a real file
2 parents 97104d5 + bfd8a64 commit f2a8ad7

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/Base/Abstracts/Console/Command/BuildCommand.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -98,20 +98,20 @@ protected function buildOptions(Package $package, InputInterface $input, OutputI
9898
{
9999
$helper = $this->getHelperSet()->get('question');
100100

101-
$force_opts = $input->getOption('with-configure-options');
101+
$configureOptions = $input->getOption('with-configure-options');
102102

103-
if ($force_opts) {
104-
if (!file_exists($force_opts) || !(is_file($force_opts) || is_link($force_opts)) || !is_readable($force_opts)) {
105-
throw new Exception("File '{$force_opts}' is unusable");
103+
if ($configureOptions) {
104+
if (!file_exists($configureOptions) || is_dir($configureOptions) || !is_readable($configureOptions)) {
105+
throw new Exception("File '{$configureOptions}' is unusable");
106106
}
107107

108-
if (DIRECTORY_SEPARATOR !== '\\' && preg_match('_^/dev/fd/\d+$_', $force_opts)) {
108+
if (DIRECTORY_SEPARATOR !== '\\' && preg_match('_^/dev/fd/\d+$_', $configureOptions)) {
109109
// https://bugs.php.net/bug.php?id=53465
110-
$force_opts = str_replace('/dev/', 'php://', $force_opts);
110+
$configureOptions = str_replace('/dev/', 'php://', $configureOptions);
111111
}
112-
$force_opts = preg_replace(',\\s+,', ' ', file_get_contents($force_opts));
112+
$configureOptions = preg_replace(',\\s+,', ' ', file_get_contents($configureOptions));
113113

114-
return [null, $force_opts];
114+
return [null, $configureOptions];
115115
}
116116

117117
$options = $package->getConfigureOptions();

0 commit comments

Comments
 (0)