From 58b17906f512866c2e34844fa497ecdf7f1e1e3d Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 3 Feb 2020 13:41:31 +0100 Subject: Apply tidy formatting Mostly reindent PHP scripts to spaces. --- ext/ext_skel.php | 380 +++++++++++++++++++++++++++---------------------------- 1 file changed, 190 insertions(+), 190 deletions(-) (limited to 'ext/ext_skel.php') diff --git a/ext/ext_skel.php b/ext/ext_skel.php index 5f45ed5146..ee274d10c3 100755 --- a/ext/ext_skel.php +++ b/ext/ext_skel.php @@ -23,8 +23,8 @@ /* {{{ error */ function error($message) { - printf('Error: %s%s', $message, PHP_EOL); - exit; + printf('Error: %s%s', $message, PHP_EOL); + exit; } /* }}} */ @@ -116,152 +116,152 @@ OPTIONS --help This help HELP; - exit; + exit; } /* }}} */ /* {{{ task */ function task($label, $callback) { - printf('%s... ', $label); + printf('%s... ', $label); - $callback(); + $callback(); - printf('done%s', PHP_EOL); + printf('done%s', PHP_EOL); } /* }}} */ /* {{{ print_success */ function print_success() { - global $options; - - if (PHP_OS_FAMILY != 'Windows') { - $file_prefix = './'; - $make_prefix = ''; - } else { - $file_prefix = ''; - $make_prefix = 'n'; - } - - printf('%1$sSuccess. The extension is now ready to be compiled. To do so, use the%s', PHP_EOL); - printf('following steps:%1$s%1$s', PHP_EOL); - printf('cd /path/to/php-src/%s%s', $options['ext'], PHP_EOL); - printf('phpize%s', PHP_EOL); - printf('%sconfigure%s', $file_prefix, PHP_EOL); - printf('%smake%2$s%2$s', $make_prefix, PHP_EOL); - printf('Don\'t forget to run tests once the compilation is done:%s', PHP_EOL); - printf('%smake test%2$s%2$s', $make_prefix, PHP_EOL); - printf('Thank you for using PHP!%s', PHP_EOL); + global $options; + + if (PHP_OS_FAMILY != 'Windows') { + $file_prefix = './'; + $make_prefix = ''; + } else { + $file_prefix = ''; + $make_prefix = 'n'; + } + + printf('%1$sSuccess. The extension is now ready to be compiled. To do so, use the%s', PHP_EOL); + printf('following steps:%1$s%1$s', PHP_EOL); + printf('cd /path/to/php-src/%s%s', $options['ext'], PHP_EOL); + printf('phpize%s', PHP_EOL); + printf('%sconfigure%s', $file_prefix, PHP_EOL); + printf('%smake%2$s%2$s', $make_prefix, PHP_EOL); + printf('Don\'t forget to run tests once the compilation is done:%s', PHP_EOL); + printf('%smake test%2$s%2$s', $make_prefix, PHP_EOL); + printf('Thank you for using PHP!%s', PHP_EOL); } /* }}} */ /* {{{ process_args */ function process_args($argv, $argc) { - $options = [ - 'unix' => true, - 'windows' => true, - 'ext' => '', - 'dir' => __DIR__ . DIRECTORY_SEPARATOR, - 'skel' => __DIR__ . DIRECTORY_SEPARATOR . 'skeleton' . DIRECTORY_SEPARATOR, - 'author' => false, - 'experimental' => false, - 'std' => false - ]; - - for($i = 1; $i < $argc; ++$i) - { - $val = $argv[$i]; - - if($val[0] != '-' || $val[1] != '-') - { - continue; - } - - switch($opt = strtolower(substr($val, 2))) - { - case 'help': { - print_help(); - } - case 'onlyunix': { - $options['windows'] = false; - } - break; - case 'onlywindows': { - $options['unix'] = false; - } - break; - case 'experimental': { - $options['experimental'] = true; - } - break; - case 'std': { - $options['std'] = true; - } - break; - case 'ext': - case 'dir': - case 'author': { - if (!isset($argv[$i + 1]) || ($argv[$i + 1][0] == '-' && $argv[$i + 1][1] == '-')) { - error('Argument "' . $val . '" expects a value, none passed'); - } else if ($opt == 'dir' && empty($argv[$i + 1])) { - continue 2; - } - - $options[$opt] = ($opt == 'dir' ? realpath($argv[$i + 1]) . DIRECTORY_SEPARATOR : $argv[$i + 1]); - } - break; - default: { - error('Unsupported argument "' . $val . '" passed'); - } - } - } - - if (empty($options['ext'])) { - error('No extension name passed, use "--ext "'); - } else if (!$options['unix'] && !$options['windows']) { - error('Cannot pass both --onlyunix and --onlywindows'); - } else if (!is_dir($options['skel'])) { - error('The skeleton directory was not found'); - } - - // Validate extension name - if (!preg_match('/^[a-z][a-z0-9_]+$/i', $options['ext'])) { - error('Invalid extension name. Valid names start with a letter,' - .' followed by any number of letters, numbers, or underscores.' - .' Using only lower case letters is preferred.'); - } - - $options['ext'] = str_replace(['\\', '/'], '', strtolower($options['ext'])); - - return $options; + $options = [ + 'unix' => true, + 'windows' => true, + 'ext' => '', + 'dir' => __DIR__ . DIRECTORY_SEPARATOR, + 'skel' => __DIR__ . DIRECTORY_SEPARATOR . 'skeleton' . DIRECTORY_SEPARATOR, + 'author' => false, + 'experimental' => false, + 'std' => false + ]; + + for($i = 1; $i < $argc; ++$i) + { + $val = $argv[$i]; + + if($val[0] != '-' || $val[1] != '-') + { + continue; + } + + switch($opt = strtolower(substr($val, 2))) + { + case 'help': { + print_help(); + } + case 'onlyunix': { + $options['windows'] = false; + } + break; + case 'onlywindows': { + $options['unix'] = false; + } + break; + case 'experimental': { + $options['experimental'] = true; + } + break; + case 'std': { + $options['std'] = true; + } + break; + case 'ext': + case 'dir': + case 'author': { + if (!isset($argv[$i + 1]) || ($argv[$i + 1][0] == '-' && $argv[$i + 1][1] == '-')) { + error('Argument "' . $val . '" expects a value, none passed'); + } else if ($opt == 'dir' && empty($argv[$i + 1])) { + continue 2; + } + + $options[$opt] = ($opt == 'dir' ? realpath($argv[$i + 1]) . DIRECTORY_SEPARATOR : $argv[$i + 1]); + } + break; + default: { + error('Unsupported argument "' . $val . '" passed'); + } + } + } + + if (empty($options['ext'])) { + error('No extension name passed, use "--ext "'); + } else if (!$options['unix'] && !$options['windows']) { + error('Cannot pass both --onlyunix and --onlywindows'); + } else if (!is_dir($options['skel'])) { + error('The skeleton directory was not found'); + } + + // Validate extension name + if (!preg_match('/^[a-z][a-z0-9_]+$/i', $options['ext'])) { + error('Invalid extension name. Valid names start with a letter,' + .' followed by any number of letters, numbers, or underscores.' + .' Using only lower case letters is preferred.'); + } + + $options['ext'] = str_replace(['\\', '/'], '', strtolower($options['ext'])); + + return $options; } /* }}} */ /* {{{ process_source_tags */ function process_source_tags($file, $short_name) { - global $options; + global $options; - $source = file_get_contents($file); + $source = file_get_contents($file); - if ($source === false) { - error('Unable to open file for reading: ' . $short_name); - } + if ($source === false) { + error('Unable to open file for reading: ' . $short_name); + } - $source = str_replace('%EXTNAME%', $options['ext'], $source); - $source = str_replace('%EXTNAMECAPS%', strtoupper($options['ext']), $source); + $source = str_replace('%EXTNAME%', $options['ext'], $source); + $source = str_replace('%EXTNAMECAPS%', strtoupper($options['ext']), $source); - if (strpos($short_name, '.c') !== false || strpos($short_name, '.h') !== false) { - static $header; + if (strpos($short_name, '.c') !== false || strpos($short_name, '.h') !== false) { + static $header; - if (!$header) { - if ($options['std']) { - $author_len = strlen($options['author']); - $credits = $options['author'] . ($author_len && $author_len <= 60 ? str_repeat(' ', 60 - $author_len) : ''); + if (!$header) { + if ($options['std']) { + $author_len = strlen($options['author']); + $credits = $options['author'] . ($author_len && $author_len <= 60 ? str_repeat(' ', 60 - $author_len) : ''); - $header = <<<"HEADER" + $header = <<<"HEADER" /* +----------------------------------------------------------------------+ | PHP Version 7 | @@ -280,140 +280,140 @@ function process_source_tags($file, $short_name) { +----------------------------------------------------------------------+ */ HEADER; - } else { - if ($options['author']) { - $header = sprintf('/* %s extension for PHP (c) %d %s */', $options['ext'], date('Y'), $options['author']); - } else { - $header = sprintf('/* %s extension for PHP */', $options['ext']); - } - } - } - - $source = str_replace('%HEADER%', $header, $source); - } - - if (!file_put_contents($file, $source)) { - error('Unable to save contents to file: ' . $short_name); - } + } else { + if ($options['author']) { + $header = sprintf('/* %s extension for PHP (c) %d %s */', $options['ext'], date('Y'), $options['author']); + } else { + $header = sprintf('/* %s extension for PHP */', $options['ext']); + } + } + } + + $source = str_replace('%HEADER%', $header, $source); + } + + if (!file_put_contents($file, $source)) { + error('Unable to save contents to file: ' . $short_name); + } } /* }}} */ /* {{{ copy_config_scripts */ function copy_config_scripts() { - global $options; + global $options; - $files = []; + $files = []; - if ($options['unix']) { - $files[] = 'config.m4'; - } + if ($options['unix']) { + $files[] = 'config.m4'; + } - if ($options['windows']) { - $files[] = 'config.w32'; - } + if ($options['windows']) { + $files[] = 'config.w32'; + } - $files[] = '.gitignore'; + $files[] = '.gitignore'; - foreach($files as $config_script) { - $new_config_script = $options['dir'] . $options['ext'] . DIRECTORY_SEPARATOR . $config_script; + foreach($files as $config_script) { + $new_config_script = $options['dir'] . $options['ext'] . DIRECTORY_SEPARATOR . $config_script; - if (!copy($options['skel'] . $config_script . '.in', $new_config_script)) { - error('Unable to copy config script: ' . $config_script); - } + if (!copy($options['skel'] . $config_script . '.in', $new_config_script)) { + error('Unable to copy config script: ' . $config_script); + } - process_source_tags($new_config_script, $config_script); - } + process_source_tags($new_config_script, $config_script); + } } /* }}} */ /* {{{ copy_sources */ function copy_sources() { - global $options; + global $options; - $files = [ - 'skeleton.c' => $options['ext'] . '.c', - 'php_skeleton.h' => 'php_' . $options['ext'] . '.h' - ]; + $files = [ + 'skeleton.c' => $options['ext'] . '.c', + 'php_skeleton.h' => 'php_' . $options['ext'] . '.h' + ]; - foreach ($files as $src_file => $dst_file) { - if (!copy($options['skel'] . $src_file, $options['dir'] . $options['ext'] . DIRECTORY_SEPARATOR . $dst_file)) { - error('Unable to copy source file: ' . $src_file); - } + foreach ($files as $src_file => $dst_file) { + if (!copy($options['skel'] . $src_file, $options['dir'] . $options['ext'] . DIRECTORY_SEPARATOR . $dst_file)) { + error('Unable to copy source file: ' . $src_file); + } - process_source_tags($options['dir'] . $options['ext'] . DIRECTORY_SEPARATOR . $dst_file, $dst_file); - } + process_source_tags($options['dir'] . $options['ext'] . DIRECTORY_SEPARATOR . $dst_file, $dst_file); + } } /* }}} */ /* {{{ copy_tests */ function copy_tests() { - global $options; + global $options; - $test_files = glob($options['skel'] . 'tests/*', GLOB_MARK); + $test_files = glob($options['skel'] . 'tests/*', GLOB_MARK); - if (!$test_files) { - return; - } + if (!$test_files) { + return; + } - foreach ($test_files as $test) { - if (is_dir($test)) { - continue; - } + foreach ($test_files as $test) { + if (is_dir($test)) { + continue; + } - $new_test = str_replace([$options['skel'], '/'], ['', DIRECTORY_SEPARATOR], $test); + $new_test = str_replace([$options['skel'], '/'], ['', DIRECTORY_SEPARATOR], $test); - if (!copy($test, $options['dir'] . $options['ext'] . DIRECTORY_SEPARATOR . $new_test)) { - error('Unable to copy file: ' . $new_test); - } + if (!copy($test, $options['dir'] . $options['ext'] . DIRECTORY_SEPARATOR . $new_test)) { + error('Unable to copy file: ' . $new_test); + } - process_source_tags($options['dir'] . $options['ext'] . DIRECTORY_SEPARATOR . $new_test, $new_test); - } + process_source_tags($options['dir'] . $options['ext'] . DIRECTORY_SEPARATOR . $new_test, $new_test); + } } /* }}} */ if (PHP_SAPI != 'cli') { - error('This script is only suited for CLI'); + error('This script is only suited for CLI'); } if ($argc < 1) { - print_help(); - exit; + print_help(); + exit; } $options = process_args($argv, $argc); if (!$options['dir'] || !is_dir($options['dir'])) { - error('The selected output directory does not exist'); + error('The selected output directory does not exist'); } else if (is_dir($options['dir'] . $options['ext'])) { - error('There is already a folder named "' . $options['ext'] . '" in the output directory'); + error('There is already a folder named "' . $options['ext'] . '" in the output directory'); } else if (!mkdir($options['dir'] . $options['ext'])) { - error('Unable to create extension directory in the output directory'); + error('Unable to create extension directory in the output directory'); } else if (!mkdir($options['dir'] . $options['ext'] . DIRECTORY_SEPARATOR . 'tests')) { - error('Unable to create the tests directory'); + error('Unable to create the tests directory'); } if ($options['experimental']) { - print('Creating EXPERIMENTAL... '); + print('Creating EXPERIMENTAL... '); - if (file_put_contents($options['dir'] . $options['ext'] . DIRECTORY_SEPARATOR . 'EXPERIMENTAL', '') === false) { - error('Unable to create the EXPERIMENTAL file'); - } + if (file_put_contents($options['dir'] . $options['ext'] . DIRECTORY_SEPARATOR . 'EXPERIMENTAL', '') === false) { + error('Unable to create the EXPERIMENTAL file'); + } - printf('done%s', PHP_EOL); + printf('done%s', PHP_EOL); } if (!empty($options['author'])) { - print('Creating CREDITS... '); + print('Creating CREDITS... '); - if (!file_put_contents($options['dir'] . $options['ext'] . DIRECTORY_SEPARATOR . 'CREDITS', $options['ext'] . PHP_EOL . $options['author'])) { - error('Unable to create the CREDITS file'); - } + if (!file_put_contents($options['dir'] . $options['ext'] . DIRECTORY_SEPARATOR . 'CREDITS', $options['ext'] . PHP_EOL . $options['author'])) { + error('Unable to create the CREDITS file'); + } - printf('done%s', PHP_EOL); + printf('done%s', PHP_EOL); } date_default_timezone_set('UTC'); -- cgit v1.2.1