euromark 12 years ago
parent
commit
d9a6b4593a

+ 2 - 2
Lib/Utility/Utility.php

@@ -405,7 +405,7 @@ class Utility {
 
 	/**
 	 * Expands the values of an array of strings into a deep array.
-	 * Opposite of flatten().
+	 * Opposite of flattenList().
 	 *
 	 * It needs at least a single separator to be present in all values
 	 * as the key would otherwise be undefined. If data can contain such key-less
@@ -446,7 +446,7 @@ class Utility {
 
 	/**
 	 * Flattens a deep array into an array of strings.
-	 * Opposite of expand().
+	 * Opposite of expandList().
 	 *
 	 * So `array('Some' => array('Deep' => array('Value')))` becomes `Some.Deep.Value`.
 	 *

+ 13 - 0
Model/MyModel.php

@@ -241,6 +241,7 @@ class MyModel extends Model {
 	 * $this->Model->find('all', array('fields' => $this->Model->virtualFields('full_name')));
 	 * Also adds the field to the virtualFields array of the model (for correct result)
 	 * TODO: adding of fields only temperory!
+	 *
 	 * @param array $virtualFields to include
 	 */
 	public function virtualFields($fields = array()) {
@@ -298,6 +299,7 @@ class MyModel extends Model {
 
 	/**
 	 * HIGHLY EXPERIMENTAL
+	 *
 	 * @see http://cakephp.lighthouseapp.com/projects/42648/tickets/1799-model-should-have-escapefield-method
 	 */
 	public function value($content) {
@@ -307,6 +309,7 @@ class MyModel extends Model {
 
 	/**
 	 * TODO: move to behavior (Incremental)
+	 *
 	 * @param mixed id (single string)
 	 * @param options:
 	 * - step (defaults to 1)
@@ -367,6 +370,7 @@ class MyModel extends Model {
 	/**
 	 * Workaround for a cake bug which sets empty fields to NULL in Model::set()
 	 * we cannot use if (isset() && empty()) statements without this fix
+	 *
 	 * @param array $fields (which are supposed to be present in $this->data[$this->alias])
 	 * @param boolean $force (if init should be forced, otherwise only if array_key exists)
 	 */
@@ -595,6 +599,7 @@ class MyModel extends Model {
 
 	/**
 	 * This code will add formatted list functionallity to find you can easy replace the $this->Model->find('list'); with $this->Model->find('formattedlist', array('fields' => array('Model.id', 'Model.field1', 'Model.field2', 'Model.field3'), 'format' => '%s-%s %s')); and get option tag output of: Model.field1-Model.field2 Model.field3. Even better part is being able to setup your own format for the output!
+	 *
 	 * @see http://bakery.cakephp.org/articles/view/add-formatted-lists-to-your-appmodel
 	 * @deprecated
 	 * added Caching
@@ -1267,6 +1272,7 @@ class MyModel extends Model {
 
 	/**
 	 * Validation of Date Fields (>= minDate && <= maxDate)
+	 *
 	 * @param options
 	 * - min/max (TODO!!)
 	 */
@@ -1275,6 +1281,7 @@ class MyModel extends Model {
 
 	/**
 	 * Validation of Time Fields (>= minTime && <= maxTime)
+	 *
 	 * @param options
 	 * - min/max (TODO!!)
 	 */
@@ -1399,6 +1406,7 @@ class MyModel extends Model {
 
 	/**
 	 * Make sure required fields exists - in order to properly validate them
+	 *
 	 * @param array: field1, field2 - or field1, Model2.field1 etc
 	 * @param array: data (optional, otherwise the array with the required fields will be returned)
 	 * @return array
@@ -1471,6 +1479,7 @@ class MyModel extends Model {
 
 	/**
 	 * Instead of whitelisting
+	 *
 	 * @param array $blackList
 	 * - array: fields to blacklist
 	 * - boolean TRUE: removes all foreign_keys (_id and _key)
@@ -1583,6 +1592,7 @@ class MyModel extends Model {
 
 	/**
 	 * Update a row with certain fields (dont use "Model" as super-key)
+	 *
 	 * @param integer $id
 	 * @param array $data
 	 * @return boolean|array Success
@@ -1608,6 +1618,7 @@ class MyModel extends Model {
 
 	/**
 	 * Toggles Field (Important/Deleted/Primary etc)
+	 *
 	 * @param STRING fieldName
 	 * @param integer id (cleaned!)
 	 * @return ARRAY record: [Model][values],...
@@ -1626,6 +1637,7 @@ class MyModel extends Model {
 
 	/**
 	 * Truncate TABLE (already validated, that table exists)
+	 *
 	 * @param string table [default:FALSE = current model table]
 	 * @return boolean Success
 	 */
@@ -1670,6 +1682,7 @@ class MyModel extends Model {
 
 	/**
 	 * From http://othy.wordpress.com/2006/06/03/generatenestedlist/
+	 *
 	 * @deprecated use generateTreeList instead
 	 */
 	public function _generateNestedList($cats, $indent = '--', $level = 0) {

+ 2 - 0
Model/Qlogin.php

@@ -69,6 +69,7 @@ class Qlogin extends ToolsAppModel {
 
 	/**
 	 * Generates a qlogin key
+	 *
 	 * @param mixed $url
 	 * @param string $uid
 	 * @return string key
@@ -85,6 +86,7 @@ class Qlogin extends ToolsAppModel {
 	/**
 	 * Makes an absolute url string ready to input anywhere
 	 * uses generate() internally to get the key
+	 *
 	 * @param mixed $url
 	 * @return string url (absolute)
 	 */

+ 1 - 1
Test/Case/Controller/Component/Auth/DirectAuthenticateTest.php

@@ -19,7 +19,7 @@ class DirectAuthenticateTest extends CakeTestCase {
 	public $fixtures = array('core.user', 'core.auth_user');
 
 	/**
-	 * setup
+	 * Setup
 	 *
 	 * @return void
 	 */

+ 1 - 1
Test/Case/Controller/Component/Auth/TinyAuthorizeTest.php

@@ -22,7 +22,7 @@ class TinyAuthorizeTest extends MyCakeTestCase {
 	public $request;
 
 	/**
-	 * setup
+	 * Setup
 	 *
 	 * @return void
 	 */

+ 1 - 1
Test/Case/Lib/Utility/StrTest.php

@@ -213,7 +213,7 @@ class StrTest extends MyCakeTestCase {
 	}
 
 	/**
-	 * fixed
+	 * Fixed
 	 * - documented return type (mixed)
 	 * - argument order
 	 * - missing underscore

+ 2 - 2
Test/Case/Model/Behavior/SoftDeleteBehaviorTest.php

@@ -91,7 +91,7 @@ class SoftDeleteBehaviorTest extends CakeTestCase {
 	}
 
 	/**
-	 * testUnDelete
+	 * TestUnDelete
 	 *
 	 * @return void
 	 */
@@ -104,7 +104,7 @@ class SoftDeleteBehaviorTest extends CakeTestCase {
 	}
 
 	/**
-	 * testSoftDeletePurge
+	 * TestSoftDeletePurge
 	 *
 	 * @return void
 	 */

+ 1 - 1
Test/Case/Model/Datasource/ImapSourceTest.php

@@ -42,7 +42,7 @@ class ImapSourceTest extends MyCakeTestCase {
 	}
 
 	/**
-	 * testFindWithoutConfig
+	 * TestFindWithoutConfig
 	 *
 	 * @expectedException RuntimeException
 	 */

+ 10 - 10
Test/Case/View/Helper/GravatarHelperTest.php

@@ -99,7 +99,7 @@ class GravatarHelperTest extends MyCakeTestCase {
 /** BASE TEST CASES **/
 
 	/**
-	 * testBaseUrlGeneration
+	 * TestBaseUrlGeneration
 	 *
 	 * @return void
 	 */
@@ -111,7 +111,7 @@ class GravatarHelperTest extends MyCakeTestCase {
 	}
 
 	/**
-	 * testExtensions
+	 * TestExtensions
 	 *
 	 * @return void
 	 */
@@ -121,7 +121,7 @@ class GravatarHelperTest extends MyCakeTestCase {
 	}
 
 	/**
-	 * testRating
+	 * TestRating
 	 *
 	 * @return void
 	 */
@@ -131,7 +131,7 @@ class GravatarHelperTest extends MyCakeTestCase {
 	}
 
 	/**
-	 * testAlternateDefaultIcon
+	 * TestAlternateDefaultIcon
 	 *
 	 * @return void
 	 */
@@ -142,7 +142,7 @@ class GravatarHelperTest extends MyCakeTestCase {
 	}
 
 	/**
-	 * testAlternateDefaultIconCorrection
+	 * TestAlternateDefaultIconCorrection
 	 *
 	 * @return void
 	 */
@@ -152,7 +152,7 @@ class GravatarHelperTest extends MyCakeTestCase {
 	}
 
 	/**
-	 * testSize
+	 * TestSize
 	 *
 	 * @return void
 	 */
@@ -163,7 +163,7 @@ class GravatarHelperTest extends MyCakeTestCase {
 	}
 
 	/**
-	 * testImageTag
+	 * TestImageTag
 	 *
 	 * @return void
 	 */
@@ -178,7 +178,7 @@ class GravatarHelperTest extends MyCakeTestCase {
 	}
 
 	/**
-	 * testDefaulting
+	 * TestDefaulting
 	 *
 	 * @return void
 	 */
@@ -189,7 +189,7 @@ class GravatarHelperTest extends MyCakeTestCase {
 	}
 
 	/**
-	 * testNonSecureUrl
+	 * TestNonSecureUrl
 	 *
 	 * @return void
 	 */
@@ -211,7 +211,7 @@ class GravatarHelperTest extends MyCakeTestCase {
 	}
 
 	/**
-	 * testSecureUrl
+	 * TestSecureUrl
 	 *
 	 * @return void
 	 */

+ 2 - 0
TestSuite/MyCakeTestCase.php

@@ -23,6 +23,7 @@ abstract class MyCakeTestCase extends CakeTestCase {
 	 * Outputs debug information during a web tester (browser) test case
 	 * since PHPUnit>=3.6 swallowes all output by default
 	 * this is a convenience output handler since debug() or pr() have no effect
+	 *
 	 * @param mixed $data
 	 * @param boolean $force Should the output be flushed (forced)
 	 * @return void
@@ -42,6 +43,7 @@ abstract class MyCakeTestCase extends CakeTestCase {
 	 * Outputs debug information during a web tester (browser) test case
 	 * since PHPUnit>=3.6 swallowes all output by default
 	 * this is a convenience output handler
+	 *
 	 * @param mixed $data
 	 * @param boolean $force Should the output be flushed (forced)
 	 * @return void

+ 1 - 0
View/Helper/DatetimeHelper.php

@@ -175,6 +175,7 @@ class DatetimeHelper extends TimeHelper {
 
 	/**
 	 * EXPERIMENTAL!!!
+	 *
 	 * @param
 	 * @param
 	 * @return integer offset

+ 1 - 0
View/Helper/WeatherHelper.php

@@ -26,6 +26,7 @@ class WeatherHelper extends AppHelper {
 	 * Display a ready table
 	 *
 	 * //TODO
+	 *
 	 * @return string
 	 */
 	public function display($location) {