Removing -n as a short flag for --with-inheritance. Seems like I might
want it for something else later.
diff --git a/CLI.php b/CLI.php
index 11cfeeb..3ec2b83 100644
--- a/CLI.php
+++ b/CLI.php
@@ -43,7 +43,7 @@
protected function parseOpts($args)
{
// Parse all other options
- $shortOptions = 'athni:e:';
+ $shortOptions = 'athi:e:';
$longOptions = array('aggressive', 'timid', 'with-inheritance', 'help', 'ignore=', 'extensions=');
$options = $this->getopt($args, $shortOptions, $longOptions);
$unparsedOptions = $options[1];
@@ -111,7 +111,6 @@
case "aggressive":
$this->scisr->setEditMode(Scisr::MODE_AGGRESSIVE);
break;
- case "n":
case "with-inheritance":
$this->withInheritance = true;
break;
@@ -321,8 +320,7 @@
[files] is any number of files and/or directories to be searched and modified.
Options:
- -n, --with-inheritance
- Only with rename-method. Rename method in children of
+ --with-inheritance Only with rename-method. Rename method in children of
the given class as well.
-t, --timid Do not make changes to the files, just list filenames
diff --git a/tests/CLITest.php b/tests/CLITest.php
index df182c7..5db14e8 100644
--- a/tests/CLITest.php
+++ b/tests/CLITest.php
@@ -139,7 +139,6 @@
public function inheritanceOptProvider() {
return array(
- array(array('scisr_executable', 'rename-method', 'Foo', 'bar', 'baz', '-n', 'file1.php', 'file2.php')),
array(array('scisr_executable', 'rename-method', 'Foo', 'bar', 'baz', '--with-inheritance', 'file1.php', 'file2.php')),
);
}