cs fixes

Console/Command/CopyShell.php

@@ -356,7 +356,7 @@ class CopyShell extends AppShell {
 	}
 
 	/**
-	 * @return boolean $isLocalPath (true/false)
+	 * @return boolean isLocalPath (true/false)
 	 */
 	protected function isLocalPath($line) {
 		if (mb_strlen($line) > 7 && trim(mb_substr($line, 0, 6)) === 'local') {
@@ -370,7 +370,7 @@ class CopyShell extends AppShell {
 	}
 
 	/**
-	 * @return string $path on success, boolean FALSE otherwise
+	 * @return string path on success, boolean FALSE otherwise
 	 */
 	protected function isRemotePath($line) {
 		if (mb_strlen($line) > 8 && trim(mb_substr($line, 0, 7)) === 'remote') {
@@ -384,7 +384,7 @@ class CopyShell extends AppShell {
 	}
 
 	/**
-	 * @return string $path on success, boolean FALSE otherwise
+	 * @return string path on success, boolean FALSE otherwise
 	 */
 	protected function areCredentials($line) {
 		if (mb_strlen($line) > 8) {
@@ -583,7 +583,7 @@ class CopyShell extends AppShell {
 	/**
 	 * makes sure type matches config name (app = only app configs, no cake or vendor or custom configs!)
 	 * 2009-05-28 ms
-	 * @return string $type on success, otherwise boolean false
+	 * @return string type on success, otherwise boolean false
 	 */
 	protected function typeMatchesConfigName($name, $type) {
 		if (array_key_exists($type, $this->types) && $name !== 'cake' && $name !== 'vendor' && $name !== 'plugin') {

Controller/Component/AuthExtComponent.php

@@ -260,7 +260,7 @@ class AuthExtComponent extends AuthComponent {
 	/**
 	 * Returns the current User model
 	 *
-	 * @return object $User
+	 * @return object User
 	 */
 	public function getModel() {
 		$model = $this->settings['userModel'];

Controller/Component/CommonComponent.php

@@ -128,7 +128,7 @@ class CommonComponent extends Component {
 	 * Convenience method to check on POSTED data.
 	 * Doesn't matter if its post or put.
 	 *
-	 * @return boolean $isPost
+	 * @return boolean isPost
 	 * 2011-12-09 ms
 	 */
 	public function isPosted() {
@@ -812,7 +812,7 @@ class CommonComponent extends Component {
 	 * @param array $array
 	 * @param string $key
 	 * @param array $matching
-	 * @return string $result
+	 * @return string result
 	 * 2011-03-12 ms
 	 */
 	public static function getGroup($multiDimArray, $key, $matching = array()) {
@@ -915,7 +915,7 @@ class CommonComponent extends Component {
 	 * @param string $string containing the parts
 	 * @param string $separator (defaults to ',')
 	 * @param boolean $camelize (true/false): problems with äöüß etc!
-	 * @return array $results as array list
+	 * @return array results as array list
 	 * //TODO: 3.4. parameter as array, move to Lib
 	 * 2009-08-13 ms
 	 */
@@ -1002,7 +1002,7 @@ class CommonComponent extends Component {
 	/**
 	 * get the current ip address
 	 * @param boolean $safe
-	 * @return string $ip
+	 * @return string ip
 	 * 2011-11-02 ms
 	 */
 	public static function getClientIp($safe = null) {
@@ -1013,7 +1013,7 @@ class CommonComponent extends Component {
 	/**
 	 * get the current referer
 	 * @param boolean $full (defaults to false and leaves the url untouched)
-	 * @return string $referer (local or foreign)
+	 * @return string referer (local or foreign)
 	 * 2011-11-02 ms
 	 */
 	public static function getReferer($full = false) {
@@ -1023,7 +1023,7 @@ class CommonComponent extends Component {
 
 	/**
 	 * returns true only if all values are true
-	 * @return boolean $result
+	 * @return boolean result
 	 * maybe move to bootstrap?
 	 * 2011-11-02 ms
 	 */
@@ -1034,7 +1034,7 @@ class CommonComponent extends Component {
 
 	/**
 	 * returns true if at least one value is true
-	 * @return boolean $result
+	 * @return boolean result
 	 * maybe move to bootstrap?
 	 * 2011-11-02 ms
 	 */
@@ -1136,7 +1136,7 @@ class CommonComponent extends Component {
 	/**
 	 * expects email to be valid!
 	 * TODO: move to Lib
-	 * @return array $email - pattern: array('email'=>,'name'=>)
+	 * @return array email - pattern: array('email'=>,'name'=>)
 	 * 2010-04-20 ms
 	 */
 	public function splitEmail($email, $abortOnError = false) {
@@ -1330,7 +1330,7 @@ class CommonComponent extends Component {
 	 * Get the Corresponding Message to an HTTP Error Code
 	 *
 	 * @param integer $code: 100...505
-	 * @return array $codes if code is NULL, otherwise string $code (empty string on failure)
+	 * @return array codes if code is NULL, otherwise string $code (empty string on failure)
 	 * 2009-07-21 ms
 	 */
 	public function responseCodes($code = null, $autoTranslate = false) {

Lib/CurrencyBitcoinLib.php

@@ -89,7 +89,7 @@ class CurrencyBitcoinLib {
 	/**
 	 * calc BTC relative to 1 baseCurrency
 	 * @param float $value
-	 * @return float $relativeValue
+	 * @return float relativeValue
 	 * 2011-10-07 ms
 	 */
 	public function calcRate($current) {

Lib/CurrencyLib.php

@@ -65,7 +65,7 @@ class CurrencyLib {
 	*
 	* @param $base string[optional]default='EUR'
 	* @param $decimals integer[optional]default=2
-	* @return array $table or boolean FALSE on failure
+	* @return array table or boolean FALSE on failure
 	*/
 	public function table($base = 'EUR', $decimals = 2) {
 		//Create array to holds rates

Lib/DiffLib.php

@@ -123,7 +123,7 @@ class DiffLib {
 	 * - div: true/false
 	 * - class: defaults to "diff"
 	 * - escape: defaults to true
-	 * @return string $output
+	 * @return string output
 	 */
 	public function compare($original, $changed, $options = array()) {
 		if (!is_array($original)) {

Lib/GeocodeLib.php

@@ -184,7 +184,7 @@ class GeocodeLib {
 	/**
 	 * Build url
 	 *
-	 * @return string $url (full)
+	 * @return string url (full)
 	 * 2010-06-29 ms
 	 */
 	public function url() {
@@ -203,7 +203,7 @@ class GeocodeLib {
 	}
 
 	/**
-	 * @return boolean $isInconclusive (or null if no query has been run yet)
+	 * @return boolean isInconclusive (or null if no query has been run yet)
 	 */
 	public function isInconclusive() {
 		if ($this->result === null) {
@@ -216,7 +216,7 @@ class GeocodeLib {
 	}
 
 	/**
-	 * @return array $result
+	 * @return array result
 	 * 2010-06-25 ms
 	 */
 	public function getResult() {
@@ -733,7 +733,7 @@ class GeocodeLib {
 	 * @param float $value
 	 * @param char $fromUnit (using class constants)
 	 * @param char $toUnit (using class constants)
-	 * @return float $convertedValue
+	 * @return float convertedValue
 	 * @throws CakeException
 	 */
 	public function convert($value, $fromUnit, $toUnit) {
@@ -764,7 +764,7 @@ class GeocodeLib {
 	 * - 4:
 	 * - 5:
 	 * @throws CakeException
-	 * @return float $coord
+	 * @return float coord
 	 * 2011-03-16 ms
 	 */
 	public static function blur($coord, $level = 0) {

Lib/GooglLib.php

@@ -74,7 +74,7 @@ class GooglLib {
 	 * shorten a long url
 	 *
 	 * @param string $url
-	 * @return array $result as array or false on failure
+	 * @return array result as array or false on failure
 	 */
 	public function getShort($longURL) {
 		$vars = '';
@@ -121,7 +121,7 @@ class GooglLib {
 	/**
 	 * retrieve the url for the statistics page for this key
 	 * @param string $key
-	 * @return string $url
+	 * @return string url
 	 */
 	public static function statisticsUrl($key) {
 		$url = 'http://goo.gl/#analytics/goo.gl/'.$key.'/all_time';

Lib/IcalLib.php

@@ -37,7 +37,7 @@ class IcalLib {
 	 *
 	 * @param array $data
 	 * @param boolean $addStartAndEnd
-	 * @return string $icalContent (single vevent)
+	 * @return string icalContent (single vevent)
 	 * 2011-10-10 ms
 	 */
 	public function build($data, $addStartAndEnd = true) {
@@ -149,7 +149,7 @@ class IcalLib {
 	}
 
 	/**
-	 * @return array $events or false on failure
+	 * @return array events or false on failure
 	 * 2010-09-14 ms
 	 */
 	public function getEvents() {
@@ -157,7 +157,7 @@ class IcalLib {
 	}
 
 	/**
-	 * @return array $todos or false on failure
+	 * @return array todos or false on failure
 	 * 2010-09-14 ms
 	 */
 	public function getTodos() {

Lib/InlineCssLib.php

@@ -112,7 +112,7 @@ class InlineCssLib {
 	 * Some reverse function of strip_tags with blacklisting instead of whitelisting
 	 * //maybe move to Tools.Utility/String/Text?
 	 *
-	 * @return string $cleanedStr
+	 * @return string cleanedStr
 	 * 2012-01-29 ms
 	 */
 	public function stripOnly($str, $tags, $stripContent = false) {

Lib/MimeLib.php

@@ -762,7 +762,7 @@ class MimeLib extends CakeResponse {
 	* Retrieve the corresponding MIME type, if one exists
 	*
 	* @param String $file File Name (relative location such as "image_test.jpg" or full "http://site.com/path/to/image_test.jpg")
-	* @return String $MIMEType - The type of the file passed in the argument
+	* @return String MIMEType - The type of the file passed in the argument
 	*/
 	public function extractMimeType($file = NULL) {
 		if (!is_file($file)) {
@@ -817,7 +817,7 @@ class MimeLib extends CakeResponse {
 	* Gets the file extention from a string
 	*
 	* @param String $file The full file name
-	* @return String $ext The file extension
+	* @return String ext The file extension
 	*/
 	protected function _getExtension($file = NULL) {
 		if ($file !== null) {

Lib/Misc/ZodiacLib.php

@@ -80,7 +80,7 @@ class ZodiacLib {
 	 * @param month
 	 * @param day
 	 * expects valid values
-	 * @return integer $sign or false on failure
+	 * @return integer sign or false on failure
 	 * 2011-03-11 ms
 	 */
 	public function getSign($month, $day) {

Lib/MyAsset.php

@@ -130,7 +130,7 @@ class MyAsset {
 	}
 
 	/**
-	 * @return string $result or bool FALSE on failure
+	 * @return string result or bool FALSE on failure
 	 * 2011-03-23 ms
 	 */
 	public function _readCssCache($path) {
@@ -141,7 +141,7 @@ class MyAsset {
 	}
 
 	/**
-	 * @return boolean $result
+	 * @return boolean result
 	 * @deprecated?
 	 * 2011-03-23 ms
 	 */

Lib/SpellLib.php

@@ -78,7 +78,7 @@ class SpellLib {
 	}
 
 	/**
-	 * @return array $listOfSuggestions
+	 * @return array listOfSuggestions
 	 */
 	public function suggestions($word) {
 		return enchant_dict_suggest($this->_Dict, $word);

Lib/Utility/FileLib.php

@@ -232,7 +232,7 @@ class FileLib extends File {
 	 * @param options
 	 * - keys (defaults to first array content in data otherwise) (order is important!)
 	 * - preserve_keys (do not slug and lowercase)
-	 * @return array $result or FALSE on failure
+	 * @return array result or FALSE on failure
 	 * 2010-10-15 ms
 	 */
 	public function transfer($data, $options = array()) {

Lib/Utility/NumberLib.php

@@ -233,7 +233,7 @@ class NumberLib extends CakeNumber {
 	 *
 	 * @param array $values: int or float values
 	 * @param integer $precision
-	 * @return integer $average
+	 * @return integer average
 	 * 2009-09-05 ms
 	 */
 	public static function average($values, $precision = 0) {
@@ -246,7 +246,7 @@ class NumberLib extends CakeNumber {
 	 *
 	 * @param float $number
 	 * @param float $increment
-	 * @return float $result
+	 * @return float result
 	 * 2011-04-14 lb
 	 */
 	public static function roundTo($number, $increments = 1.0) {
@@ -263,7 +263,7 @@ class NumberLib extends CakeNumber {
 	 *
 	 * @param float $number
 	 * @param integer $increment
-	 * @return float $result
+	 * @return float result
 	 * 2011-04-14 lb
 	 */
 	public static function roundUpTo($number, $increments = 1) {
@@ -275,7 +275,7 @@ class NumberLib extends CakeNumber {
 	 *
 	 * @param float $number
 	 * @param integer $increment
-	 * @return float $result
+	 * @return float result
 	 * 2011-04-14 lb
 	 */
 	public static function roundDownTo($number, $increments = 1) {
@@ -286,7 +286,7 @@ class NumberLib extends CakeNumber {
 	 * Get decimal places
 	 *
 	 * @param float $number
-	 * @return integer $decimalPlaces
+	 * @return integer decimalPlaces
 	 * 2011-04-15 lb
 	 */
 	public static function getDecimalPlaces($number) {
@@ -345,7 +345,7 @@ class NumberLib extends CakeNumber {
 	 * Get the settings for a specific formatName
 	 *
 	 * @param string $formatName (EUR, ...)
-	 * @return array $currencySettings or null on failure
+	 * @return array currencySettings or null on failure
 	 */
 	public static function getFormat($formatName) {
 		if (!isset(self::$_currencies[$formatName])) {

Lib/Utility/TimeLib.php

@@ -528,7 +528,7 @@ class TimeLib extends CakeTime {
 	 * 0=sunday to 7=saturday (default numbers)
 	 * @param boolean $abbr (if abbreviation should be returned)
 	 * @param offset: 0-6 (defaults to 0) [1 => 1=monday to 7=sunday]
-	 * @return string $translatedText
+	 * @return string translatedText
 	 * 2011-12-07 ms
 	 */
 	public static function day($day, $abbr = false, $offset = 0) {
@@ -571,7 +571,7 @@ class TimeLib extends CakeTime {
 	 * @param boolean $abbr (if abbreviation should be returned)
 	 * @param array $options
 	 * - appendDot (only for 3 letter abbr; defaults to false)
-	 * @return string $translatedText
+	 * @return string translatedText
 	 * 2011-12-07 ms
 	 */
 	public static function month($month, $abbr = false, $options = array()) {
@@ -777,7 +777,7 @@ class TimeLib extends CakeTime {
 	 * @param integer $offset in seconds
 	 * @param boolean $past (defaults to null: return plain text)
 	 * - new: if not boolean but a string use this as translating text
-	 * @return string $text (i18n!)
+	 * @return string text (i18n!)
 	 * 2011-03-06 ms
 	 */
 	public static function fuzzyFromOffset($offset, $past = null) {
@@ -1120,7 +1120,7 @@ class TimeLib extends CakeTime {
 	 * @param array $options
 	 * - separator (defaults to space [ ])
 	 * - format (defaults to Y-m-d H:i:s)
-	 * @return array $period [0=>min, 1=>max]
+	 * @return array period [0=>min, 1=>max]
 	 * 2011-11-18 ms
 	 */
 	public static function period($string, $options = array()) {
@@ -1169,7 +1169,7 @@ class TimeLib extends CakeTime {
 	 * @param string $searchString to parse
 	 * @param string $fieldname (Model.field)
 	 * @param array $options (see TimeLib::period)
-	 * @return string $query SQL Query
+	 * @return string query SQL Query
 	 * 2011-11-18 ms
 	 */
 	public static function periodAsSql($string, $fieldName, $options = array()) {

Lib/Utility/Utility.php

@@ -127,7 +127,7 @@ class Utility {
 	 * Get the current referrer if available.
 	 *
 	 * @param boolean $full (defaults to false and leaves the url untouched)
-	 * @return string $referer (local or foreign)
+	 * @return string referer (local or foreign)
 	 * 2011-11-02 ms
 	 */
 	public static function getReferer($full = false) {
@@ -471,7 +471,7 @@ class Utility {
 	 * like array_shift() only for keys and not values
 	 *
 	 * @param array $keyValuePairs
-	 * @return string $key
+	 * @return string key
 	 * 2011-01-22 ms
 	 */
 	public static function arrayShiftKeys(&$array) {

Lib/ZipLib.php

@@ -35,6 +35,9 @@ class ZipLib {
 	}
 
 	/**
+	 * Return the filename.
+	 *
+	 * @return string
 	 * 2010-08-25 ms
 	 */
 	public function filename() {
@@ -42,7 +45,7 @@ class ZipLib {
 	}
 
 	/**
-	 * All files (not folders) - works recursive
+	 * Count all files (not folders) - works recursivly.
 	 *
 	 * @return integer Size or false on failure
 	 * 2010-08-25 ms
@@ -87,7 +90,7 @@ class ZipLib {
 	public function open($path = null, $create = false) {
 		$this->filename = basename($path);
 
-		$path = str_replace('\\','/', $path);
+		$path = str_replace('\\', '/', $path);
 
 		$this->path = $path;
 		$zip = zip_open($path);
@@ -134,20 +137,20 @@ class ZipLib {
 				$location .= DS;
 			}
 			if (!file_exists($location)) {
-				if (!mkdir($location, 0777, true)) {
+				if (!mkdir($location, 0770, true)) {
 					return false;
 				}
 			}
 		}
 
 		while ($zipEntry = zip_read($this->Zip)) {
-			$x = str_replace('\\','/', $location).zip_entry_name($zipEntry);
+			$x = str_replace('\\', '/', $location) . zip_entry_name($zipEntry);
 			if ($flatten) {
-				$x = str_replace('\\','/', $location).basename(zip_entry_name($zipEntry));
+				$x = str_replace('\\', '/', $location) . basename(zip_entry_name($zipEntry));
 			}
 
 			if (!file_exists($l = dirname($x))) {
-				if (!mkdir($l, 0777, true)) {
+				if (!mkdir($l, 0770, true)) {
 					return false;
 				}
 			}

Model/Behavior/BitmaskedBehavior.php

@@ -119,7 +119,7 @@ class BitmaskedBehavior extends ModelBehavior {
 
 	/**
 	 * @param integer $bitmask
-	 * @return array $bitmaskArray
+	 * @return array bitmaskArray
 	 * from DB to APP
 	 */
 	public function decodeBitmask(Model $Model, $value) {
@@ -136,7 +136,7 @@ class BitmaskedBehavior extends ModelBehavior {
 
 	/**
 	 * @param array $bitmaskArray
-	 * @return integer $bitmask
+	 * @return integer bitmask
 	 * from APP to DB
 	 */
 	public function encodeBitmask(Model $Model, $value, $defaultValue = null) {
@@ -154,7 +154,7 @@ class BitmaskedBehavior extends ModelBehavior {
 	}
 
 	/**
-	 * @return array $conditions
+	 * @return array conditions
 	 */
 	public function encodeBitmaskConditions(Model $Model, $conditions) {
 		$field = $this->settings[$Model->alias]['field'];
@@ -211,7 +211,7 @@ class BitmaskedBehavior extends ModelBehavior {
 
 	/**
 	 * @param mixed bits (int, array)
-	 * @return array $sqlSnippet
+	 * @return array sqlSnippet
 	 */
 	public function isBit(Model $Model, $bits) {
 		$bits = (array)$bits;
@@ -223,7 +223,7 @@ class BitmaskedBehavior extends ModelBehavior {
 
 	/**
 	 * @param mixed bits (int, array)
-	 * @return array $sqlSnippet
+	 * @return array sqlSnippet
 	 */
 	public function isNotBit(Model $Model, $bits) {
 		$bits = (array)$bits;
@@ -235,7 +235,7 @@ class BitmaskedBehavior extends ModelBehavior {
 
 	/**
 	 * @param mixed bits (int, array)
-	 * @return array $sqlSnippet
+	 * @return array sqlSnippet
 	 */
 	public function containsBit(Model $Model, $bits) {
 		$bits = (array)$bits;
@@ -247,7 +247,7 @@ class BitmaskedBehavior extends ModelBehavior {
 
 	/**
 	 * @param mixed bits (int, array)
-	 * @return array $sqlSnippet
+	 * @return array sqlSnippet
 	 */
 	public function containsNotBit(Model $Model, $bits) {
 		$bits = (array)$bits;

Model/Behavior/DecimalInputBehavior.php

@@ -138,7 +138,7 @@ class DecimalInputBehavior extends ModelBehavior {
 
 	/**
 	 * @param array $results
-	 * @return array $results
+	 * @return array results
 	 */
 	public function prepOutput(Model $Model, $data) {
 		foreach ($data as $datakey => $record) {
@@ -156,7 +156,7 @@ class DecimalInputBehavior extends ModelBehavior {
 
 	/**
 	 * perform a single transformation
-	 * @return string $cleanedValue
+	 * @return string cleanedValue
 	 */
 	public function formatInputOutput(Model $Model, $value, $dir = 'in') {
 		$this->_setTransformations($Model, $dir);

Model/Behavior/GeocoderBehavior.php

@@ -277,7 +277,7 @@ class GeocoderBehavior extends ModelBehavior {
 	/**
 	 * snippet for custom pagination
 	 *
-	 * @return integer $count
+	 * @return integer count
 	 */
 	public function paginateDistanceCount(Model $Model, $conditions = null, $recursive = -1, $extra = array()) {
 		if (!empty($extra['radius'])) {

Model/Behavior/MasterPasswordBehavior.php

@@ -117,7 +117,7 @@ class MasterPasswordBehavior extends ModelBehavior {
 	}
 
 	/**
-	 * @return string $hash or FALSE on failure
+	 * @return string hash or FALSE on failure
 	 */
 	protected function _hash($string, $algorithm, $salt) {
 		if ($salt) {

Model/Behavior/NumberFormatBehavior.php

@@ -138,7 +138,7 @@ class NumberFormatBehavior extends ModelBehavior {
 
 	/**
 	 * @param array $results
-	 * @return array $results
+	 * @return array results
 	 */
 	public function prepOutput(Model $Model, $data) {
 		foreach ($data as $datakey => $record) {
@@ -156,7 +156,7 @@ class NumberFormatBehavior extends ModelBehavior {
 
 	/**
 	 * perform a single transformation
-	 * @return string $cleanedValue
+	 * @return string cleanedValue
 	 */
 	public function formatInputOutput(Model $Model, $value, $dir = 'in') {
 		$this->_setTransformations($Model, $dir);

Model/Behavior/TypographicBehavior.php

@@ -145,7 +145,7 @@ class TypographicBehavior extends ModelBehavior {
 	 * This is useful if you attach it after some records have already been saved without it.
 	 *
 	 * @param Model $Model The model about to be saved.
-	 * @return integer $count Number of affected/changed records
+	 * @return integer count Number of affected/changed records
 	 */
 	public function updateTypography(Model $Model, $dryRun = false) {
 		$options = array('recursive' => -1, 'limit' => 100, 'offset' => 0);
@@ -194,7 +194,7 @@ class TypographicBehavior extends ModelBehavior {
 
 	/**
 	 * @param string $input
-	 * @return string $cleanedInput
+	 * @return string cleanedInput
 	 * 2011-12-06 ms
 	 */
 	protected function _prepareInput(Model $Model, $string) {

Model/Datasource/ImapSource.php

@@ -902,7 +902,7 @@ class ImapSource extends DataSource {
 	 * Decode text to the application encoding
 	 *
 	 * @param string $text
-	 * @return string $text
+	 * @return string text
 	 */
 	protected function _decode($text) {
 		if (is_object($text)) {

Model/MyModel.php

@@ -458,7 +458,7 @@ class MyModel extends Model {
 	 * @param array $options The options array
 	 * @param string $alias You can use this intead of $options['alias'] if you want
 	 * @param boolean $parenthesise Add parenthesis before and after
-	 * @return string $result sql snippet of the query to run
+	 * @return string result sql snippet of the query to run
 	 * @modified Mark Scherer (cake2.x ready and improvements)
 	 * @link http://bakery.cakephp.org/articles/lucaswxp/2011/02/11/easy_and_simple_subquery_cakephp
 	 * 2011-07-05 ms
@@ -1360,7 +1360,7 @@ class MyModel extends Model {
 	 * Is blocked email?
 	 * //TODO: move outside of MyModel?
 	 *
-	 * @return boolean $ifNotBlacklisted
+	 * @return boolean ifNotBlacklisted
 	 * 2009-12-22 ms
 	 */
 	public function validateNotBlocked($params) {

Model/Qlogin.php

@@ -72,7 +72,7 @@ class Qlogin extends ToolsAppModel {
 	 * generates a qlogin key
 	 * @param mixed $url
 	 * @param string $uid
-	 * @return string $key
+	 * @return string key
 	 * 2011-07-12 ms
 	 */
 	public function generate($url, $uid) {
@@ -88,7 +88,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)
+	 * @return string url (absolute)
 	 */
 	public function url($url, $uid = null) {
 		if ($uid === null) {

Test/Case/Lib/Utility/UtilityTest.php

@@ -354,7 +354,7 @@ class UtilityTest extends MyCakeTestCase {
 			'd' => 1,
 		);
 		$is = Utility::logicalAnd($array);
-		$this->assertSame($is, false);
+		$this->assertFalse($is);
 
 		$array = array(
 			'a' => 1,
@@ -363,7 +363,7 @@ class UtilityTest extends MyCakeTestCase {
 			'd' => 1,
 		);
 		$is = Utility::logicalAnd($array);
-		$this->assertSame($is, true);
+		$this->assertTrue($is);
 	}
 
 	/**
@@ -379,7 +379,7 @@ class UtilityTest extends MyCakeTestCase {
 			'd' => 1,
 		);
 		$is = Utility::logicalOr($array);
-		$this->assertSame($is, true);
+		$this->assertTrue($is);
 
 		$array = array(
 			'a' => 1,
@@ -388,7 +388,7 @@ class UtilityTest extends MyCakeTestCase {
 			'd' => 1,
 		);
 		$is = Utility::logicalOr($array);
-		$this->assertSame($is, true);
+		$this->assertTrue($is);
 
 		$array = array(
 			'a' => 0,
@@ -397,7 +397,7 @@ class UtilityTest extends MyCakeTestCase {
 			'd' => 0,
 		);
 		$is = Utility::logicalOr($array);
-		$this->assertSame($is, false);
+		$this->assertFalse($is);
 	}
 
 }

Test/Case/Lib/ZipLibTest.php

@@ -9,13 +9,8 @@ class ZipLibTest extends MyCakeTestCase {
 	public function setUp() {
 		parent::setUp();
 
-		if (isset($this->ZipLib)) {
-			return;
-		}
 		$this->ZipLib = new ZipLib();
 
-		//$x = base64_encode(file_get_contents(TMP.'test4.zip')); die(returns($x));
-
 		foreach ($this->testFiles as $file => $content) {
 			$this->_createTestFile($file, $content);
 		}