Skip to content

Commit

Permalink
CS Fixer
Browse files Browse the repository at this point in the history
  • Loading branch information
baikunz committed Mar 30, 2013
1 parent c373914 commit 72081f9
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
16 changes: 8 additions & 8 deletions src/Shuble/Slurpy/Slurpy.php
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,9 @@ public function getOptions()
*
* @codeCoverageIgnore
*
* @param string $input The input file
* @param string $output The ouput file
* @param array $options An optional array of options that will be used
* @param string $input The input file
* @param string $output The ouput file
* @param array $options An optional array of options that will be used
* only for this command
*
* @return string
Expand Down Expand Up @@ -224,9 +224,9 @@ protected function configure()
/**
* Builds the command string
*
* @param string $input Url or file location of the page to process
* @param string $output File location to the image-to-be
* @param array $options An array of options
* @param string $input Url or file location of the page to process
* @param string $output File location to the image-to-be
* @param array $options An array of options
*
* @throws \InvalidArgumentException if an option value is an array
*
Expand Down Expand Up @@ -330,7 +330,7 @@ protected function addOption($name, $default = null)
* Merges the given array of options to the instance options and returns
* the result options array. It does NOT change the instance options.
*
* @param array $options
* @param array $options
*
* @return array
*/
Expand All @@ -348,4 +348,4 @@ protected function mergeOptions(array $options)

return $mergedOptions;
}
}
}
1 change: 1 addition & 0 deletions src/autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
$fileName = __DIR__ . DIRECTORY_SEPARATOR . str_replace('\\', DIRECTORY_SEPARATOR, $className) . '.php';
if (is_file($fileName)) {
require $fileName;

return true;
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Shuble/Slurpy/Tests/InputFileTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ public function testSetInvalidHandle()
$inputFile = new InputFile();
$inputFile->setHandle('foo');
}
}
}

0 comments on commit 72081f9

Please sign in to comment.