Browse Source

Cleanup - PHPDoc mismatches

ndm2 11 years ago
parent
commit
e732f97b46

+ 2 - 2
src/Network/Email/Email.php

@@ -582,8 +582,8 @@ class Email {
  * @param string $regex for email address validation
  * @return string|$this
  */
-	public function emailPattern($regex = false) {
-		if ($regex === false) {
+	public function emailPattern($regex = null) {
+		if ($regex === null) {
 			return $this->_emailPattern;
 		}
 		$this->_emailPattern = $regex;

+ 1 - 1
src/Shell/BakeShell.php

@@ -125,7 +125,7 @@ class BakeShell extends Shell {
  * @param string $prefix The prefix to append.
  * @return array Updated tasks.
  */
-	protected function _findTasks($tasks, $path, $namespace, $prefix = false) {
+	protected function _findTasks($tasks, $path, $namespace, $prefix = null) {
 		$path .= 'Shell/Task';
 		if (!is_dir($path)) {
 			return $tasks;

+ 1 - 1
src/Shell/Task/FixtureTask.php

@@ -135,7 +135,7 @@ class FixtureTask extends BakeTask {
  * @return string Baked fixture content
  * @throws \RuntimeException
  */
-	public function bake($model, $useTable = false) {
+	public function bake($model, $useTable = null) {
 		$table = $schema = $records = $import = $modelImport = null;
 
 		if (!$useTable) {

+ 2 - 2
src/TestSuite/TestCase.php

@@ -257,7 +257,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
  *
  * @param string $string An HTML/XHTML/XML string
  * @param array $expected An array, see above
- * @param string $fullDebug Whether or not more verbose output should be used.
+ * @param bool $fullDebug Whether or not more verbose output should be used.
  * @return void
  * @deprecated 3.0. Use assertHtml() instead.
  */
@@ -306,7 +306,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
  *
  * @param array $expected An array, see above
  * @param string $string An HTML/XHTML/XML string
- * @param string $fullDebug Whether or not more verbose output should be used.
+ * @param bool $fullDebug Whether or not more verbose output should be used.
  * @return void
  */
 	public function assertHtml($expected, $string, $fullDebug = false) {

+ 2 - 2
src/Utility/Inflector.php

@@ -417,8 +417,8 @@ class Inflector {
  *
  * @param string $type Inflection type
  * @param string $key Original value
- * @param string $value Inflected value
- * @return string|null Inflected value on cache hit or null on cache miss.
+ * @param string|bool $value Inflected value
+ * @return string|bool Inflected value on cache hit or false on cache miss.
  */
 	protected static function _cache($type, $key, $value = false) {
 		$key = '_' . $key;