pradosoft / prado

framework/I18N/core/CultureInfo.php

Doc Comments +6 added lines

@@ -204,6 +204,7 @@ 
 
 	/**
 	 * Gets the CultureInfo that for this culture string
+	 * @param string $culture
 	 * @return CultureInfo invariant culture info is "en".
 	 */
 	public static function getInstance($culture)
@@ -232,6 +233,7 @@ 
 	 * Set the culture for the current instance. The culture indentifier
 	 * must be of the form "<language>_(country/region)".
 	 * @param string culture identifier, e.g. "fr_FR_EURO".
+	 * @param string $culture
 	 */
 	protected function setCulture($culture)
 	{
@@ -247,6 +249,7 @@ 
 	/**
 	 * Load the ICU culture data for the specific culture identifier.
 	 * @param string the culture identifier.
+	 * @param string $culture
 	 */
 	protected function loadCultureData($culture)
 	{
@@ -287,6 +290,7 @@ 
 	 * The data files are cached in a static variable inside
 	 * this function.
 	 * @param string the ICU data filename
+	 * @param string $filename
 	 * @return array ICU data
 	 */
 	protected function &getData($filename)
@@ -390,6 +394,7 @@ 
 	/**
 	 * Set the date time format information.
 	 * @param DateTimeFormatInfo the new date time format info.
+	 * @param DateTimeFormatInfo $dateTimeFormat
 	 */
 	public function setDateTimeFormat($dateTimeFormat)
 	{
@@ -497,6 +502,7 @@ 
 	/**
 	 * Set the number format information.
 	 * @param NumberFormatInfo the new number format info.
+	 * @param NumberFormatInfo $numberFormat
 	 */
 	public function setNumberFormat($numberFormat)
 	{

Spacing +97 added lines, -97 removed lines

@@ -55,13 +55,13 @@ 
 	 * ICU data filename extension.
 	 * @var string
 	 */
-	private $dataFileExt = '.dat';
+	private $dataFileExt='.dat';
 
 	/**
 	 * The ICU data array.
 	 * @var array
 	 */
-	private $data = [];
+	private $data=[];
 
 	/**
 	 * The current culture.
@@ -79,7 +79,7 @@ 
 	 * A list of ICU date files loaded.
 	 * @var array
 	 */
-	private $dataFiles = [];
+	private $dataFiles=[];
 
 	/**
 	 * The current date time format info.
@@ -97,28 +97,28 @@ 
 	 * A list of properties that are accessable/writable.
 	 * @var array
 	 */
-	protected $properties = [];
+	protected $properties=[];
 
 	/**
 	 * Culture type, all.
 	 * @see getCultures()
 	 * @var int
 	 */
-	const ALL = 0;
+	const ALL=0;
 
 	/**
 	 * Culture type, neutral.
 	 * @see getCultures()
 	 * @var int
 	 */
-	const NEUTRAL = 1;
+	const NEUTRAL=1;
 
 	/**
 	 * Culture type, specific.
 	 * @see getCultures()
 	 * @var int
 	 */
-	const SPECIFIC = 2;
+	const SPECIFIC=2;
 
 	/**
 	 * Display the culture name.
@@ -138,11 +138,11 @@ 
 	 */
 	public function __get($name)
 	{
-		$getProperty = 'get' . $name;
+		$getProperty='get'.$name;
 		if(in_array($getProperty, $this->properties))
 			return $this->$getProperty();
 		else
-			throw new Exception('Property ' . $name . ' does not exists.');
+			throw new Exception('Property '.$name.' does not exists.');
 	}
 
 	/**
@@ -151,11 +151,11 @@ 
 	 */
 	public function __set($name, $value)
 	{
-		$setProperty = 'set' . $name;
+		$setProperty='set'.$name;
 		if(in_array($setProperty, $this->properties))
 			$this->$setProperty($value);
 		else
-			throw new Exception('Property ' . $name . ' can not be set.');
+			throw new Exception('Property '.$name.' can not be set.');
 	}
 
 
@@ -167,15 +167,15 @@ 
 	 * @param string a culture name, e.g. "en_AU".
 	 * @return return new CultureInfo.
 	 */
-	public function __construct($culture = 'en')
+	public function __construct($culture='en')
 	{
-		$this->properties = get_class_methods($this);
+		$this->properties=get_class_methods($this);
 
 		if(empty($culture))
-			$culture = 'en';
+			$culture='en';
 
-		$this->dataDir = $this->dataDir();
-		$this->dataFileExt = $this->fileExt();
+		$this->dataDir=$this->dataDir();
+		$this->dataFileExt=$this->fileExt();
 
 		$this->setCulture($culture);
 
@@ -190,7 +190,7 @@ 
 	 */
 	protected static function dataDir()
 	{
-		return dirname(__FILE__) . '/data/';
+		return dirname(__FILE__).'/data/';
 	}
 
 	/**
@@ -208,9 +208,9 @@ 
 	 */
 	public static function getInstance($culture)
 	{
-		static $instances = [];
+		static $instances=[];
 		if(!isset($instances[$culture]))
-			$instances[$culture] = new CultureInfo($culture);
+			$instances[$culture]=new CultureInfo($culture);
 		return $instances[$culture];
 	}
 
@@ -223,7 +223,7 @@ 
 	public static function validCulture($culture)
 	{
 		if(preg_match('/^[_\\w]+$/', $culture))
-			return is_file(self::dataDir() . $culture . self::fileExt());
+			return is_file(self::dataDir().$culture.self::fileExt());
 
 		return false;
 	}
@@ -237,11 +237,11 @@ 
 	{
 		if(!empty($culture))
 		{
-			if (!preg_match('/^[_\\w]+$/', $culture))
-				throw new Exception('Invalid culture supplied: ' . $culture);
+			if(!preg_match('/^[_\\w]+$/', $culture))
+				throw new Exception('Invalid culture supplied: '.$culture);
 		}
 
-		$this->culture = $culture;
+		$this->culture=$culture;
 	}
 
 	/**
@@ -250,30 +250,30 @@ 
 	 */
 	protected function loadCultureData($culture)
 	{
-		$file_parts = explode('_', $culture);
-		$current_part = $file_parts[0];
+		$file_parts=explode('_', $culture);
+		$current_part=$file_parts[0];
 
-		$files = [$current_part];
+		$files=[$current_part];
 
-		for($i = 1, $k = count($file_parts); $i < $k; ++$i)
+		for($i=1, $k=count($file_parts); $i < $k; ++$i)
 		{
-			$current_part .= '_' . $file_parts[$i];
-			$files[] = $current_part;
+			$current_part.='_'.$file_parts[$i];
+			$files[]=$current_part;
 		}
 
 		foreach($files as $file)
 		{
-			$filename = $this->dataDir . $file . $this->dataFileExt;
+			$filename=$this->dataDir.$file.$this->dataFileExt;
 
-			if(is_file($filename) == false)
-				throw new Exception('Data file for "' . $file . '" was not found.');
+			if(is_file($filename)==false)
+				throw new Exception('Data file for "'.$file.'" was not found.');
 
-			if(in_array($filename, $this->dataFiles) === false)
+			if(in_array($filename, $this->dataFiles)===false)
 			{
 				array_unshift($this->dataFiles, $file);
 
-				$data = &$this->getData($filename);
-				$this->data[$file] = &$data;
+				$data=&$this->getData($filename);
+				$this->data[$file]=&$data;
 
 				if(isset($data['__ALIAS']))
 					$this->loadCultureData($data['__ALIAS'][0]);
@@ -291,13 +291,13 @@ 
 	 */
 	protected function &getData($filename)
 	{
-		static $data = [];
-		static $files = [];
+		static $data=[];
+		static $files=[];
 
 		if(!in_array($filename, $files))
 		{
-			$data[$filename] = unserialize(file_get_contents($filename));
-			$files[] = $filename;
+			$data[$filename]=unserialize(file_get_contents($filename));
+			$files[]=$filename;
 		}
 
 		return $data[$filename];
@@ -317,17 +317,17 @@ 
 	 * @param boolean merge the data from its parents.
 	 * @return mixed the specific ICU data.
 	 */
-	protected function findInfo($path = '/', $merge = false)
+	protected function findInfo($path='/', $merge=false)
 	{
-		$result = [];
+		$result=[];
 		foreach($this->dataFiles as $section)
 		{
-			$info = $this->searchArray($this->data[$section], $path);
+			$info=$this->searchArray($this->data[$section], $path);
 
 			if($info)
 			{
 				if($merge)
-					$result = array_merge($info, $result);
+					$result=array_merge($info, $result);
 				else
 					return $info;
 			}
@@ -344,18 +344,18 @@ 
 	 * @param string slash "/" separated array path.
 	 * @return mixed the value array using the path
 	 */
-	private function searchArray($info, $path = '/')
+	private function searchArray($info, $path='/')
 	{
-		$index = explode('/', $path);
+		$index=explode('/', $path);
 
-		$array = $info;
+		$array=$info;
 
-		for($i = 0, $k = count($index); $i < $k; ++$i)
+		for($i=0, $k=count($index); $i < $k; ++$i)
 		{
-			$value = $index[$i];
+			$value=$index[$i];
 			if($i < $k - 1 && isset($array[$value]))
-				$array = $array[$value];
-			elseif ($i == $k - 1 && isset($array[$value]))
+				$array=$array[$value];
+			elseif($i==$k - 1 && isset($array[$value]))
 				return $array[$value];
 		}
 	}
@@ -377,10 +377,10 @@ 
 	 */
 	public function getDateTimeFormat()
 	{
-		if($this->dateTimeFormat === null)
+		if($this->dateTimeFormat===null)
 		{
-			$calendar = $this->getCalendar();
-			$info = $this->findInfo("calendar/{$calendar}", true);
+			$calendar=$this->getCalendar();
+			$info=$this->findInfo("calendar/{$calendar}", true);
 			$this->setDateTimeFormat(new DateTimeFormatInfo($info));
 		}
 
@@ -393,7 +393,7 @@ 
 	 */
 	public function setDateTimeFormat($dateTimeFormat)
 	{
-		$this->dateTimeFormat = $dateTimeFormat;
+		$this->dateTimeFormat=$dateTimeFormat;
 	}
 
 	/**
@@ -402,7 +402,7 @@ 
 	 */
 	public function getCalendar()
 	{
-		$info = $this->findInfo('calendar/default');
+		$info=$this->findInfo('calendar/default');
 		return $info[0];
 	}
 
@@ -414,12 +414,12 @@ 
 	 */
 	public function getNativeName()
 	{
-		$lang = substr($this->culture, 0, 2);
-		$reg = substr($this->culture, 3, 2);
-		$language = $this->findInfo("Languages/{$lang}");
-		$region = $this->findInfo("Countries/{$reg}");
+		$lang=substr($this->culture, 0, 2);
+		$reg=substr($this->culture, 3, 2);
+		$language=$this->findInfo("Languages/{$lang}");
+		$region=$this->findInfo("Countries/{$reg}");
 		if($region)
-			return $language[0] . ' (' . $region[0] . ')';
+			return $language[0].' ('.$region[0].')';
 		else
 			return $language[0];
 	}
@@ -432,17 +432,17 @@ 
 	 */
 	public function getEnglishName()
 	{
-		$lang = substr($this->culture, 0, 2);
-		$reg = substr($this->culture, 3, 2);
-		$culture = $this->getInvariantCulture();
+		$lang=substr($this->culture, 0, 2);
+		$reg=substr($this->culture, 3, 2);
+		$culture=$this->getInvariantCulture();
 
-		$language = $culture->findInfo("Languages/{$lang}");
-		if(count($language) == 0)
+		$language=$culture->findInfo("Languages/{$lang}");
+		if(count($language)==0)
 			return $this->culture;
 
-		$region = $culture->findInfo("Countries/{$reg}");
+		$region=$culture->findInfo("Countries/{$reg}");
 		if($region)
-			return $language[0] . ' (' . $region[0] . ')';
+			return $language[0].' ('.$region[0].')';
 		else
 			return $language[0];
 	}
@@ -457,8 +457,8 @@ 
 	public static function getInvariantCulture()
 	{
 		static $invariant;
-		if($invariant === null)
-			$invariant = new CultureInfo();
+		if($invariant===null)
+			$invariant=new CultureInfo();
 		return $invariant;
 	}
 
@@ -470,7 +470,7 @@ 
 	 */
 	public function getIsNeutralCulture()
 	{
-		return strlen($this->culture) == 2;
+		return strlen($this->culture)==2;
 	}
 
 	/**
@@ -480,12 +480,12 @@ 
 	 */
 	public function getNumberFormat()
 	{
-		if($this->numberFormat === null)
+		if($this->numberFormat===null)
 		{
-			$elements = $this->findInfo('NumberElements');
-			$patterns = $this->findInfo('NumberPatterns');
-			$currencies = $this->getCurrencies();
-			$data = [	'NumberElements' => $elements,
+			$elements=$this->findInfo('NumberElements');
+			$patterns=$this->findInfo('NumberPatterns');
+			$currencies=$this->getCurrencies();
+			$data=['NumberElements' => $elements,
 							'NumberPatterns' => $patterns,
 							'Currencies' => $currencies];
 
@@ -500,7 +500,7 @@ 
 	 */
 	public function setNumberFormat($numberFormat)
 	{
-		$this->numberFormat = $numberFormat;
+		$this->numberFormat=$numberFormat;
 	}
 
 	/**
@@ -510,10 +510,10 @@ 
 	 */
 	public function getParent()
 	{
-		if(strlen($this->culture) == 2)
+		if(strlen($this->culture)==2)
 			return $this->getInvariantCulture();
 
-		$lang = substr($this->culture, 0, 2);
+		$lang=substr($this->culture, 0, 2);
 			return new CultureInfo($lang);
 	}
 
@@ -526,26 +526,26 @@ 
 	 * or CultureInfo::SPECIFIC.
 	 * @return array list of culture information available.
 	 */
-	public static function getCultures($type = CultureInfo::ALL)
+	public static function getCultures($type=CultureInfo::ALL)
 	{
-		$dataDir = CultureInfo::dataDir();
-		$dataExt = CultureInfo::fileExt();
-		$dir = dir($dataDir);
+		$dataDir=CultureInfo::dataDir();
+		$dataExt=CultureInfo::fileExt();
+		$dir=dir($dataDir);
 
-		$neutral = [];
-		$specific = [];
+		$neutral=[];
+		$specific=[];
 
-		while (false !== ($entry = $dir->read()))
+		while(false!==($entry=$dir->read()))
 		{
-			if(is_file($dataDir . $entry)
-				&& substr($entry, -4) == $dataExt
-				&& $entry != 'root' . $dataExt)
+			if(is_file($dataDir.$entry)
+				&& substr($entry, -4)==$dataExt
+				&& $entry!='root'.$dataExt)
 			{
-				$culture = substr($entry, 0, -4);
-				if(strlen($culture) == 2)
-					$neutral[] = $culture;
+				$culture=substr($entry, 0, -4);
+				if(strlen($culture)==2)
+					$neutral[]=$culture;
 				else
-					$specific[] = $culture;
+					$specific[]=$culture;
 			}
 		}
 		$dir->close();
@@ -553,7 +553,7 @@ 
 		switch($type)
 		{
 			case CultureInfo::ALL :
-				$all = array_merge($neutral, $specific);
+				$all=array_merge($neutral, $specific);
 				sort($all);
 				return $all;
 				break;
@@ -575,12 +575,12 @@ 
 	 */
 	private function simplify($array)
 	{
-		for($i = 0, $k = count($array); $i < $k; ++$i)
+		for($i=0, $k=count($array); $i < $k; ++$i)
 		{
-			$key = key($array);
+			$key=key($array);
 			if(is_array($array[$key])
-				&& count($array[$key]) == 1)
-				$array[$key] = $array[$key][0];
+				&& count($array[$key])==1)
+				$array[$key]=$array[$key][0];
 			next($array);
 		}
 		return $array;

framework/I18N/core/Gettext/TGettext.php

Doc Comments +3 added lines, -3 removed lines

@@ -119,7 +119,7 @@ 
 	 *
 	 * @static
 	 * @access  public
-	 * @return  mixed   Returns true on success or PEAR_Error on failure.
+	 * @return  boolean   Returns true on success or PEAR_Error on failure.
 	 * @param   string  $pofile path to GNU PO file
 	 * @param   string  $mofile path to GNU MO file
 	 */
@@ -261,7 +261,7 @@ 
 	 * toMO
 	 *
 	 * @access  protected
-	 * @return  object  File_Gettext_MO
+	 * @return  TGettext_MO  File_Gettext_MO
 	 */
 	public function toMO()
 	{
@@ -275,7 +275,7 @@ 
 	 * toPO
 	 *
 	 * @access  protected
-	 * @return  object      File_Gettext_PO
+	 * @return  TGettext_PO      File_Gettext_PO
 	 */
 	public function toPO()
 	{

Spacing +35 added lines, -35 removed lines

@@ -67,7 +67,7 @@ 
 	 * @access  protected
 	 * @var     array
 	 */
-	protected $strings = [];
+	protected $strings=[];
 
 	/**
 	 * meta
@@ -78,7 +78,7 @@ 
 	 * @access  protected
 	 * @var     array
 	 */
-	protected $meta = [];
+	protected $meta=[];
 
 	/**
 	 * file path
@@ -86,7 +86,7 @@ 
 	 * @access  protected
 	 * @var     string
 	 */
-	protected $file = '';
+	protected $file='';
 
 	/**
 	 * Factory
@@ -98,15 +98,15 @@ 
 	 * @param   string  $format MO or PO
 	 * @param   string  $file   path to GNU gettext file
 	 */
-	public static function factory($format, $file = '')
+	public static function factory($format, $file='')
 	{
-		$format = strToUpper($format);
-		$filename = dirname(__FILE__) . '/' . $format . '.php';
-		if(is_file($filename) == false)
+		$format=strToUpper($format);
+		$filename=dirname(__FILE__).'/'.$format.'.php';
+		if(is_file($filename)==false)
 			throw new Exception("Class file $file not found");
 
 		include_once $filename;
-		$class = 'TGettext_' . $format;
+		$class='TGettext_'.$format;
 
 		return new $class($file);
 	}
@@ -125,19 +125,19 @@ 
 	 */
 	public static function poFile2moFile($pofile, $mofile)
 	{
-		if (!is_file($pofile)) {
+		if(!is_file($pofile)) {
 			throw new Exception("File $pofile doesn't exist.");
 		}
 
-		include_once dirname(__FILE__) . '/PO.php';
+		include_once dirname(__FILE__).'/PO.php';
 
-		$PO = new TGettext_PO($pofile);
-		if (true !== ($e = $PO->load())) {
+		$PO=new TGettext_PO($pofile);
+		if(true!==($e=$PO->load())) {
 			return $e;
 		}
 
-		$MO = $PO->toMO();
-		if (true !== ($e = $MO->save($mofile))) {
+		$MO=$PO->toMO();
+		if(true!==($e=$MO->save($mofile))) {
 			return $e;
 		}
 		unset($PO, $MO);
@@ -154,16 +154,16 @@ 
 	 * @param   string  $string
 	 * @param   bool    $reverse
 	 */
-	public static function prepare($string, $reverse = false)
+	public static function prepare($string, $reverse=false)
 	{
-		if ($reverse) {
-			$smap = ['"', "\n", "\t", "\r"];
-			$rmap = ['\"', '\\n"' . "\n" . '"', '\\t', '\\r'];
+		if($reverse) {
+			$smap=['"', "\n", "\t", "\r"];
+			$rmap=['\"', '\\n"'."\n".'"', '\\t', '\\r'];
 			return (string) str_replace($smap, $rmap, $string);
 		} else {
-			$string = preg_replace('/"\s+"/', '', $string);
-			$smap = ['\\n', '\\r', '\\t', '\"'];
-			$rmap = ["\n", "\r", "\t", '"'];
+			$string=preg_replace('/"\s+"/', '', $string);
+			$smap=['\\n', '\\r', '\\t', '\"'];
+			$rmap=["\n", "\r", "\t", '"'];
 			return (string) str_replace($smap, $rmap, $string);
 		}
 	}
@@ -178,11 +178,11 @@ 
 	 */
 	public static function meta2array($meta)
 	{
-		$array = [];
-		foreach (explode("\n", $meta) as $info) {
-			if ($info = trim($info)) {
-				list($key, $value) = explode(':', $info, 2);
-				$array[trim($key)] = trim($value);
+		$array=[];
+		foreach(explode("\n", $meta) as $info) {
+			if($info=trim($info)) {
+				list($key, $value)=explode(':', $info, 2);
+				$array[trim($key)]=trim($value);
 			}
 		}
 		return $array;
@@ -244,15 +244,15 @@ 
 	 */
 	public function fromArray($array)
 	{
-		if (!array_key_exists('strings', $array)) {
-			if (count($array) != 2) {
+		if(!array_key_exists('strings', $array)) {
+			if(count($array)!=2) {
 				return false;
 			} else {
-				list($this->meta, $this->strings) = $array;
+				list($this->meta, $this->strings)=$array;
 			}
 		} else {
-			$this->meta = @$array['meta'];
-			$this->strings = @$array['strings'];
+			$this->meta=@$array['meta'];
+			$this->strings=@$array['strings'];
 		}
 		return true;
 	}
@@ -265,8 +265,8 @@ 
 	 */
 	public function toMO()
 	{
-		include_once dirname(__FILE__) . '/MO.php';
-		$MO = new TGettext_MO;
+		include_once dirname(__FILE__).'/MO.php';
+		$MO=new TGettext_MO;
 		$MO->fromArray($this->toArray());
 		return $MO;
 	}
@@ -279,8 +279,8 @@ 
 	 */
 	public function toPO()
 	{
-		include_once dirname(__FILE__) . '/PO.php';
-		$PO = new TGettext_PO;
+		include_once dirname(__FILE__).'/PO.php';
+		$PO=new TGettext_PO;
 		$PO->fromArray($this->toArray());
 		return $PO;
 	}

framework/I18N/core/Gettext/TGettext_MO.php

Doc Comments +3 added lines, -3 removed lines

@@ -85,7 +85,7 @@ 
 	 * _read
 	 *
 	 * @access  private
-	 * @return  mixed
+	 * @return  string|null
 	 * @param   int     $bytes
 	 */
 	public function _read($bytes = 1)
@@ -164,7 +164,7 @@ 
 	 * Load MO file
 	 *
 	 * @access   public
-	 * @return   mixed   Returns true on success or PEAR_Error on failure.
+	 * @return   boolean   Returns true on success or PEAR_Error on failure.
 	 * @param    string  $file
 	 */
 	public function load($file = null)
@@ -260,7 +260,7 @@ 
 	 * Save MO file
 	 *
 	 * @access  public
-	 * @return  mixed   Returns true on success or PEAR_Error on failure.
+	 * @return  boolean   Returns true on success or PEAR_Error on failure.
 	 * @param   string  $file
 	 */
 	public function save($file = null)

Spacing +57 added lines, -57 removed lines

@@ -38,7 +38,7 @@ 
  * @license     PHP License
  */
 
-require_once dirname(__FILE__) . '/TGettext.php';
+require_once dirname(__FILE__).'/TGettext.php';
 
 /**
  * File_Gettext_MO
@@ -67,7 +67,7 @@ 
 	 * @access  public
 	 * @var     bool
 	 */
-	protected $writeBigEndian = false;
+	protected $writeBigEndian=false;
 
 	/**
 	 * Constructor
@@ -76,9 +76,9 @@ 
 	 * @return  object      File_Gettext_MO
 	 * @param   string      $file   path to GNU MO file
 	 */
-	public function __construct($file = '')
+	public function __construct($file='')
 	{
-		$this->file = $file;
+		$this->file=$file;
 	}
 
 	/**
@@ -88,9 +88,9 @@ 
 	 * @return  mixed
 	 * @param   int     $bytes
 	 */
-	public function _read($bytes = 1)
+	public function _read($bytes=1)
 	{
-		if (0 < $bytes = abs($bytes)) {
+		if(0 < $bytes=abs($bytes)) {
 			return fread($this->_handle, $bytes);
 		}
 		return null;
@@ -103,10 +103,10 @@ 
 	 * @return  int
 	 * @param   bool    $bigendian
 	 */
-	public function _readInt($bigendian = false)
+	public function _readInt($bigendian=false)
 	{
 		//unpack returns a reference????
-		$unpacked = unpack($bigendian ? 'N' : 'V', $this->_read(4));
+		$unpacked=unpack($bigendian ? 'N' : 'V', $this->_read(4));
 		return array_shift($unpacked);
 	}
 
@@ -143,7 +143,7 @@ 
 	 */
 	public function _writeStr($string)
 	{
-		return $this->_write($string . "\0");
+		return $this->_write($string."\0");
 	}
 
 	/**
@@ -167,18 +167,18 @@ 
 	 * @return   mixed   Returns true on success or PEAR_Error on failure.
 	 * @param    string  $file
 	 */
-	public function load($file = null)
+	public function load($file=null)
 	{
-		if (!isset($file)) {
-			$file = $this->file;
+		if(!isset($file)) {
+			$file=$this->file;
 		}
 
 		// open MO file
-		if (!is_resource($this->_handle = @fopen($file, 'rb'))) {
+		if(!is_resource($this->_handle=@fopen($file, 'rb'))) {
 			return false;
 		}
 		// lock MO file shared
-		if (!@flock($this->_handle, LOCK_SH)) {
+		if(!@flock($this->_handle, LOCK_SH)) {
 			@fclose($this->_handle);
 			return false;
 		}
@@ -186,15 +186,15 @@ 
 		// read (part of) magic number from MO file header and define endianess
 
 		//unpack returns a reference????
-		$unpacked = unpack('c', $this->_read(4));
-		switch ($magic = array_shift($unpacked))
+		$unpacked=unpack('c', $this->_read(4));
+		switch($magic=array_shift($unpacked))
 		{
 			case -34:
-				$be = false;
+				$be=false;
 			break;
 
 			case -107:
-				$be = true;
+				$be=true;
 			break;
 
 			default:
@@ -202,24 +202,24 @@ 
 		}
 
 		// check file format revision - we currently only support 0
-		if (0 !== ($_rev = $this->_readInt($be))) {
+		if(0!==($_rev=$this->_readInt($be))) {
 			return false;
 		}
 
 		// count of strings in this file
-		$count = $this->_readInt($be);
+		$count=$this->_readInt($be);
 
 		// offset of hashing table of the msgids
-		$offset_original = $this->_readInt($be);
+		$offset_original=$this->_readInt($be);
 		// offset of hashing table of the msgstrs
-		$offset_translat = $this->_readInt($be);
+		$offset_translat=$this->_readInt($be);
 
 		// move to msgid hash table
 		fseek($this->_handle, $offset_original);
 		// read lengths and offsets of msgids
-		$original = [];
-		for ($i = 0; $i < $count; $i++) {
-			$original[$i] = [
+		$original=[];
+		for($i=0; $i < $count; $i++) {
+			$original[$i]=[
 				'length' => $this->_readInt($be),
 				'offset' => $this->_readInt($be)
 			];
@@ -228,28 +228,28 @@ 
 		// move to msgstr hash table
 		fseek($this->_handle, $offset_translat);
 		// read lengths and offsets of msgstrs
-		$translat = [];
-		for ($i = 0; $i < $count; $i++) {
-			$translat[$i] = [
+		$translat=[];
+		for($i=0; $i < $count; $i++) {
+			$translat[$i]=[
 				'length' => $this->_readInt($be),
 				'offset' => $this->_readInt($be)
 			];
 		}
 
 		// read all
-		for ($i = 0; $i < $count; $i++) {
-			$this->strings[$this->_readStr($original[$i])] =
+		for($i=0; $i < $count; $i++) {
+			$this->strings[$this->_readStr($original[$i])]=
 				$this->_readStr($translat[$i]);
 		}
 
 		// done
 		@flock($this->_handle, LOCK_UN);
 		@fclose($this->_handle);
-		$this->_handle = null;
+		$this->_handle=null;
 
 		// check for meta info
-		if (isset($this->strings[''])) {
-			$this->meta = parent::meta2array($this->strings['']);
+		if(isset($this->strings[''])) {
+			$this->meta=parent::meta2array($this->strings['']);
 			unset($this->strings['']);
 		}
 
@@ -263,24 +263,24 @@ 
 	 * @return  mixed   Returns true on success or PEAR_Error on failure.
 	 * @param   string  $file
 	 */
-	public function save($file = null)
+	public function save($file=null)
 	{
-		if (!isset($file)) {
-			$file = $this->file;
+		if(!isset($file)) {
+			$file=$this->file;
 		}
 
 		// open MO file
-		if (!is_resource($this->_handle = @fopen($file, 'wb'))) {
+		if(!is_resource($this->_handle=@fopen($file, 'wb'))) {
 			return false;
 		}
 		// lock MO file exclusively
-		if (!@flock($this->_handle, LOCK_EX)) {
+		if(!@flock($this->_handle, LOCK_EX)) {
 			@fclose($this->_handle);
 			return false;
 		}
 
 		// write magic number
-		if ($this->writeBigEndian) {
+		if($this->writeBigEndian) {
 			$this->_write(pack('c*', 0x95, 0x04, 0x12, 0xde));
 		} else {
 			$this->_write(pack('c*', 0xde, 0x12, 0x04, 0x95));
@@ -289,59 +289,59 @@ 
 		// write file format revision
 		$this->_writeInt(0);
 
-		$count = count($this->strings) + ($meta = (count($this->meta) ? 1 : 0));
+		$count=count($this->strings) + ($meta=(count($this->meta) ? 1 : 0));
 		// write count of strings
 		$this->_writeInt($count);
 
-		$offset = 28;
+		$offset=28;
 		// write offset of orig. strings hash table
 		$this->_writeInt($offset);
 
-		$offset += ($count * 8);
+		$offset+=($count * 8);
 		// write offset transl. strings hash table
 		$this->_writeInt($offset);
 
 		// write size of hash table (we currently ommit the hash table)
 		$this->_writeInt(0);
 
-		$offset += ($count * 8);
+		$offset+=($count * 8);
 		// write offset of hash table
 		$this->_writeInt($offset);
 
 		// unshift meta info
-		if ($this->meta) {
-			$meta = '';
-			foreach ($this->meta as $key => $val) {
-				$meta .= $key . ': ' . $val . "\n";
+		if($this->meta) {
+			$meta='';
+			foreach($this->meta as $key => $val) {
+				$meta.=$key.': '.$val."\n";
 			}
-			$strings = ['' => $meta] + $this->strings;
+			$strings=['' => $meta] + $this->strings;
 		} else {
-			$strings = $this->strings;
+			$strings=$this->strings;
 		}
 
 		// write offsets for original strings
-		foreach (array_keys($strings) as $o) {
-			$len = strlen($o);
+		foreach(array_keys($strings) as $o) {
+			$len=strlen($o);
 			$this->_writeInt($len);
 			$this->_writeInt($offset);
-			$offset += $len + 1;
+			$offset+=$len + 1;
 		}
 
 		// write offsets for translated strings
-		foreach ($strings as $t) {
-			$len = strlen($t);
+		foreach($strings as $t) {
+			$len=strlen($t);
 			$this->_writeInt($len);
 			$this->_writeInt($offset);
-			$offset += $len + 1;
+			$offset+=$len + 1;
 		}
 
 		// write original strings
-		foreach (array_keys($strings) as $o) {
+		foreach(array_keys($strings) as $o) {
 			$this->_writeStr($o);
 		}
 
 		// write translated strings
-		foreach ($strings as $t) {
+		foreach($strings as $t) {
 			$this->_writeStr($t);
 		}
 

framework/I18N/core/Gettext/TGettext_PO.php

Doc Comments +2 added lines, -2 removed lines

@@ -67,7 +67,7 @@ 
 	 * Load PO file
 	 *
 	 * @access  public
-	 * @return  mixed   Returns true on success or PEAR_Error on failure.
+	 * @return  boolean   Returns true on success or PEAR_Error on failure.
 	 * @param   string  $file
 	 */
 	public function load($file = null)
@@ -116,7 +116,7 @@ 
 	 * Save PO file
 	 *
 	 * @access  public
-	 * @return  mixed   Returns true on success or PEAR_Error on failure.
+	 * @return  boolean   Returns true on success or PEAR_Error on failure.
 	 * @param   string  $file
 	 */
 	public function save($file = null)

Spacing +30 added lines, -30 removed lines

@@ -38,7 +38,7 @@ 
  * @license     PHP License
  */
 
-require_once dirname(__FILE__) . '/TGettext.php';
+require_once dirname(__FILE__).'/TGettext.php';
 
 /**
  * File_Gettext_PO
@@ -58,9 +58,9 @@ 
 	 * @return  object      File_Gettext_PO
 	 * @param   string      path to GNU PO file
 	 */
-	public function __construct($file = '')
+	public function __construct($file='')
 	{
-		$this->file = $file;
+		$this->file=$file;
 	}
 
 	/**
@@ -70,42 +70,42 @@ 
 	 * @return  mixed   Returns true on success or PEAR_Error on failure.
 	 * @param   string  $file
 	 */
-	public function load($file = null)
+	public function load($file=null)
 	{
-		if (!isset($file)) {
-			$file = $this->file;
+		if(!isset($file)) {
+			$file=$this->file;
 		}
 
 		// load file
-		if (!$contents = @file($file)) {
+		if(!$contents=@file($file)) {
 			return false;
 		}
-		$contents = implode('', $contents);
+		$contents=implode('', $contents);
 
 		// match all msgid/msgstr entries
-		$matched = preg_match_all(
-			'/(msgid\s+("([^"]|\\\\")*?"\s*)+)\s+' .
+		$matched=preg_match_all(
+			'/(msgid\s+("([^"]|\\\\")*?"\s*)+)\s+'.
 			'(msgstr\s+("([^"]|\\\\")*?"\s*)+)/',
 			$contents, $matches
 		);
 		unset($contents);
 
-		if (!$matched) {
+		if(!$matched) {
 			return false;
 		}
 
 		// get all msgids and msgtrs
-		for ($i = 0; $i < $matched; $i++) {
-			$msgid = preg_replace(
+		for($i=0; $i < $matched; $i++) {
+			$msgid=preg_replace(
 				'/\s*msgid\s*"(.*)"\s*/s', '\\1', $matches[1][$i]);
-			$msgstr = preg_replace(
+			$msgstr=preg_replace(
 				'/\s*msgstr\s*"(.*)"\s*/s', '\\1', $matches[4][$i]);
-			$this->strings[parent::prepare($msgid)] = parent::prepare($msgstr);
+			$this->strings[parent::prepare($msgid)]=parent::prepare($msgstr);
 		}
 
 		// check for meta info
-		if (isset($this->strings[''])) {
-			$this->meta = parent::meta2array($this->strings['']);
+		if(isset($this->strings[''])) {
+			$this->meta=parent::meta2array($this->strings['']);
 			unset($this->strings['']);
 		}
 
@@ -119,35 +119,35 @@ 
 	 * @return  mixed   Returns true on success or PEAR_Error on failure.
 	 * @param   string  $file
 	 */
-	public function save($file = null)
+	public function save($file=null)
 	{
-		if (!isset($file)) {
-			$file = $this->file;
+		if(!isset($file)) {
+			$file=$this->file;
 		}
 
 		// open PO file
-		if (!is_resource($fh = @fopen($file, 'w'))) {
+		if(!is_resource($fh=@fopen($file, 'w'))) {
 			return false;
 		}
 
 		// lock PO file exclusively
-		if (!flock($fh, LOCK_EX)) {
+		if(!flock($fh, LOCK_EX)) {
 			fclose($fh);
 			return false;
 		}
 		// write meta info
-		if (count($this->meta)) {
-			$meta = 'msgid ""' . "\nmsgstr " . '""' . "\n";
-			foreach ($this->meta as $k => $v) {
-				$meta .= '"' . $k . ': ' . $v . '\n"' . "\n";
+		if(count($this->meta)) {
+			$meta='msgid ""'."\nmsgstr ".'""'."\n";
+			foreach($this->meta as $k => $v) {
+				$meta.='"'.$k.': '.$v.'\n"'."\n";
 			}
-			fwrite($fh, $meta . "\n");
+			fwrite($fh, $meta."\n");
 		}
 		// write strings
-		foreach ($this->strings as $o => $t) {
+		foreach($this->strings as $o => $t) {
 			fwrite($fh,
-				'msgid "' . parent::prepare($o, true) . '"' . "\n" .
-				'msgstr "' . parent::prepare($t, true) . '"' . "\n\n"
+				'msgid "'.parent::prepare($o, true).'"'."\n".
+				'msgstr "'.parent::prepare($t, true).'"'."\n\n"
 			);
 		}
 

framework/I18N/core/IMessageSource.php

Doc Comments +1 added lines

@@ -109,6 +109,7 @@
 	/**
 	 * Set the culture for this particular message source.
 	 * @param string the Culture name.
+	 * @return void
 	 */
 	public function setCulture($culture);
 	

Spacing +4 added lines, -4 removed lines

@@ -47,7 +47,7 @@ 
 	 * @param string a catalogue to load
 	 * @return boolean true if loaded, false otherwise.
 	 */
-	public function load($catalogue = 'messages');
+	public function load($catalogue='messages');
 	
 	/**
 	 * Get the translation table. This includes all the loaded sections.
@@ -72,7 +72,7 @@ 
 	 * @param string the catalogue to add to
 	 * @return boolean true if saved successfuly, false otherwise.
 	 */
-	public function save($catalogue = 'messages');
+	public function save($catalogue='messages');
 	
 	/**
 	 * Add a untranslated message to the source. Need to call save()
@@ -88,7 +88,7 @@ 
 	 * @param string the catalogue to delete from.
 	 * @return boolean true if deleted, false otherwise.
 	 */
-	public function delete($message, $catalogue = 'messages');
+	public function delete($message, $catalogue='messages');
 		
 	/**
 	 * Update the translation.
@@ -98,7 +98,7 @@ 
 	 * @param string the catalogue of the translation.
 	 * @return boolean true if translation was updated, false otherwise.
 	 */
-	public function update($text, $target, $comments, $catalogue = 'messages');
+	public function update($text, $target, $comments, $catalogue='messages');
 	
 	/**
 	 * Returns a list of catalogue as key and all it variants as value.

framework/I18N/core/MessageFormat.php

Doc Comments +1 added lines

@@ -106,6 +106,7 @@
 	/**
 	 * Sets the charset for message output.
 	 * @param string charset, default is UTF-8
+	 * @param string $charset
 	 */
 	public function setCharset($charset)
 	{

Braces +1 added lines, -2 removed lines

@@ -208,8 +208,7 @@
 						return 	$this->postscript[0] .
 								strtr($string, $args) .
 								$this->postscript[1];
-					}
-					else
+					} else
 						return strtr($target, $args);
 				}
 			}

Spacing +28 added lines, -28 removed lines

@@ -21,7 +21,7 @@ 
 /**
  * Get the encoding utilities
  */
-require_once(dirname(__FILE__) . '/util.php');
+require_once(dirname(__FILE__).'/util.php');
 
 /**
  * MessageFormat class.
@@ -58,25 +58,25 @@ 
 	 * A list of loaded message catalogues.
 	 * @var array
 	 */
-	protected $catagloues = [];
+	protected $catagloues=[];
 	
 	/**
 	 * The translation messages.
 	 * @var array
 	 */
-	protected $messages = [];
+	protected $messages=[];
 	
 	/**
 	 * A list of untranslated messages.
 	 * @var array
 	 */
-	protected $untranslated = [];
+	protected $untranslated=[];
 	
 	/**
 	 * The prefix and suffix to append to untranslated messages.
 	 * @var array
 	 */
-	protected $postscript = ['',''];
+	protected $postscript=['', ''];
 	
 	/**
 	 * Set the default catalogue.
@@ -88,7 +88,7 @@ 
 	 * Output encoding charset
 	 * @var string
 	 */
-	protected $charset = 'UTF-8';
+	protected $charset='UTF-8';
 
 	/**
 	 * Constructor.
@@ -97,9 +97,9 @@ 
 	 * @param MessageSource the source of translation messages.
 	 * @param string charset for the message output.
 	 */
-	public function __construct(IMessageSource $source, $charset = 'UTF-8')
+	public function __construct(IMessageSource $source, $charset='UTF-8')
 	{
-		$this->source = $source;
+		$this->source=$source;
 		$this->setCharset($charset);
 	}
 
@@ -109,7 +109,7 @@ 
 	 */
 	public function setCharset($charset)
 	{
-		$this->charset = $charset;
+		$this->charset=$charset;
 	}
 
 	/**
@@ -135,8 +135,8 @@ 
 			
 		if($this->source->load($catalogue))
 		{
-			$this->messages[$catalogue] = $this->source->read();
-			$this->catagloues[] = $catalogue;
+			$this->messages[$catalogue]=$this->source->read();
+			$this->catagloues[]=$catalogue;
 		}
 	}
 
@@ -153,14 +153,14 @@ 
 	 * catalogue.
 	 * @return string translated string.
 	 */
-	public function format($string, $args = [], $catalogue = null, $charset = null)
+	public function format($string, $args=[], $catalogue=null, $charset=null)
 	{
-		if(empty($charset)) $charset = $this->getCharset();
+		if(empty($charset)) $charset=$this->getCharset();
 		
 		//force args as UTF-8
 		foreach($args as $k => $v)
-			$args[$k] = I18N_toUTF8($v, $charset);
-		$s = $this->formatString(I18N_toUTF8($string, $charset), $args, $catalogue);
+			$args[$k]=I18N_toUTF8($v, $charset);
+		$s=$this->formatString(I18N_toUTF8($string, $charset), $args, $catalogue);
 		return I18N_toEncoding($s, $charset);
 	}
 
@@ -172,20 +172,20 @@ 
 	 * catalogue.
 	 * @return string translated string.
 	 */
-	protected function formatString($string, $args = [], $catalogue = null)
+	protected function formatString($string, $args=[], $catalogue=null)
 	{
 		if(empty($catalogue))
 		{
 			if(empty($this->Catalogue))
-				$catalogue = 'messages';
+				$catalogue='messages';
 			else
-				$catalogue = $this->Catalogue;
+				$catalogue=$this->Catalogue;
 		}
 				
 		$this->loadCatalogue($catalogue);
 		
 		if(empty($args))
-			$args = [];
+			$args=[];
 		
 		foreach($this->messages[$catalogue] as $variant)
 		{
@@ -193,20 +193,20 @@ 
 			foreach($variant as $source => $result)
 			{
 				// we found it, so return the target translation
-				if($source == $string)
+				if($source==$string)
 				{
 					//check if it contains only strings.
 					if(is_string($result))
-						$target = $result;
+						$target=$result;
 					else
 					{
-						$target = $result[0];
+						$target=$result[0];
 					}
 					//found, but untranslated
 					if(empty($target))
 					{
-						return 	$this->postscript[0] .
-								strtr($string, $args) .
+						return 	$this->postscript[0].
+								strtr($string, $args).
 								$this->postscript[1];
 					}
 					else
@@ -218,8 +218,8 @@ 
 		// well we did not find the translation string.
 		$this->source->append($string);
 		
-		return 	$this->postscript[0] .
-				strtr($string, $args) .
+		return 	$this->postscript[0].
+				strtr($string, $args).
 				$this->postscript[1];
 	}
 	
@@ -242,8 +242,8 @@ 
 	{
 		if(is_array($postscript) && count($postscript) >= 2)
 		{
-			$this->postscript[0] = $postscript[0];
-			$this->postscript[1] = $postscript[1];
+			$this->postscript[0]=$postscript[0];
+			$this->postscript[1]=$postscript[1];
 		}
 	}
 }

framework/I18N/core/MessageSource.php

Doc Comments +5 added lines

@@ -250,6 +250,7 @@ 
 	/**
 	 * Set the culture for this message source.
 	 * @param string culture name
+	 * @param string $culture
 	 */
 	public function setCulture($culture)
 	{
@@ -268,6 +269,7 @@ 
 	/**
 	 * Get the last modified unix-time for this particular catalogue+variant.
 	 * @param string catalogue+variant
+	 * @param string $source
 	 * @return int last modified in unix-time format.
 	 */
 	protected function getLastModified($source)
@@ -279,6 +281,7 @@ 
 	 * Load the message for a particular catalogue+variant.
 	 * This methods needs to implemented by subclasses.
 	 * @param string catalogue+variant.
+	 * @param string $variant
 	 * @return array of translation messages.
 	 */
 	protected function &loadData($variant)
@@ -299,6 +302,7 @@ 
 	/**
 	 * Determine if the source is valid.
 	 * @param string catalogue+variant
+	 * @param string $source
 	 * @return boolean true if valid, false otherwise.
 	 */
 	protected function isValidSource($source)
@@ -310,6 +314,7 @@ 
 	 * Get all the variants of a particular catalogue.
 	 * This method must be implemented by subclasses.
 	 * @param string catalogue name
+	 * @param string $catalogue
 	 * @return array list of all variants for this catalogue.
 	 */
 	protected function getCatalogueList($catalogue)

Spacing +25 added lines, -25 removed lines

@@ -22,12 +22,12 @@ 
  */
 use Exception;
 
-require_once(dirname(__FILE__) . '/IMessageSource.php');
+require_once(dirname(__FILE__).'/IMessageSource.php');
 
 /**
  * Get the MessageCache class file.
  */
-require_once(dirname(__FILE__) . '/MessageCache.php');
+require_once(dirname(__FILE__).'/MessageCache.php');
 
 /**
  * Abstract MessageSource class.
@@ -82,7 +82,7 @@ 
 	 * Array of translation messages.
 	 * @var array
 	 */
-	protected $messages = [];
+	protected $messages=[];
 
 	/**
 	 * The source of message translations.
@@ -96,7 +96,7 @@ 
 	 */
 	protected $cache;
 	
-	protected $untranslated = [];
+	protected $untranslated=[];
 
 	/**
 	 * Private constructor. MessageSource must be initialized using
@@ -124,25 +124,25 @@ 
 	 * @return MessageSource a new message source of the specified type.
 	 * @throws InvalidMessageSourceTypeException
 	 */
-	public static function &factory($type, $source = '.', $filename = '')
+	public static function &factory($type, $source='.', $filename='')
 	{
-		$types = ['XLIFF','PHP','gettext','Database'];
+		$types=['XLIFF', 'PHP', 'gettext', 'Database'];
 
 		if(empty($filename) && !in_array($type, $types))
-			throw new Exception('Invalid type "' . $type . '", valid types are ' .
+			throw new Exception('Invalid type "'.$type.'", valid types are '.
 				implode(', ', $types));
 		
-		$class = 'MessageSource_' . $type;
+		$class='MessageSource_'.$type;
 		
 		if(empty($filename))
-			$filename = dirname(__FILE__) . '/' . $class . '.php';
+			$filename=dirname(__FILE__).'/'.$class.'.php';
 						
-		if(is_file($filename) == false)
+		if(is_file($filename)==false)
 			throw new Exception("File $filename not found");
 						
 		include_once $filename;
 		
-		$obj = new $class($source);
+		$obj=new $class($source);
 		
 		return $obj;
 	}
@@ -166,38 +166,38 @@ 
 	 * @return boolean true if loaded, false otherwise.
 	 * @see read()
 	 */
-	public function load($catalogue = 'messages')
+	public function load($catalogue='messages')
 	{
-		$variants = $this->getCatalogueList($catalogue);
+		$variants=$this->getCatalogueList($catalogue);
 		
-		$this->messages = [];
+		$this->messages=[];
 		
 		foreach($variants as $variant)
 		{
-			$source = $this->getSource($variant);
+			$source=$this->getSource($variant);
 			
-			if($this->isValidSource($source) == false) continue;
+			if($this->isValidSource($source)==false) continue;
 
-			$loadData = true;
+			$loadData=true;
 			
 			if($this->cache)
 			{
-				$data = $this->cache->get($variant,
+				$data=$this->cache->get($variant,
 					$this->culture, $this->getLastModified($source));
 				
 				if(is_array($data))
 				{
-					$this->messages[$variant] = $data;
-					$loadData = false;
+					$this->messages[$variant]=$data;
+					$loadData=false;
 				}
 				unset($data);
 			}
 			if($loadData)
 			{
-				$data = &$this->loadData($source);
+				$data=&$this->loadData($source);
 				if(is_array($data))
 				{
-					$this->messages[$variant] = $data;
+					$this->messages[$variant]=$data;
 					if($this->cache)
 						$this->cache->save($data, $variant, $this->culture);
 				}
@@ -233,7 +233,7 @@ 
 	 */
 	public function setCache(MessageCache $cache)
 	{
-		$this->cache = $cache;
+		$this->cache=$cache;
 	}
 	
 	/**
@@ -244,7 +244,7 @@ 
 	public function append($message)
 	{
 		if(!in_array($message, $this->untranslated))
-			$this->untranslated[] = $message;
+			$this->untranslated[]=$message;
 	}
 	
 	/**
@@ -253,7 +253,7 @@ 
 	 */
 	public function setCulture($culture)
 	{
-		$this->culture = $culture;
+		$this->culture=$culture;
 	}
 	
 	/**

framework/I18N/core/NumberFormatInfo.php

Doc Comments +1 added lines

@@ -172,6 +172,7 @@
 	 * @param int the number formatting type, it should be
 	 * NumberFormatInfo::DECIMAL, NumberFormatInfo::CURRENCY,
 	 * NumberFormatInfo::PERCENTAGE, or NumberFormatInfo::SCIENTIFIC
+	 * @param integer $type
 	 * @return NumberFormatInfo NumberFormatInfo for the specified
 	 * culture.
 	 * @see getCurrencyInstance();

Spacing +109 added lines, -109 removed lines

@@ -23,7 +23,7 @@ 
  */
 use Exception;
 
-require_once(dirname(__FILE__) . '/CultureInfo.php');
+require_once(dirname(__FILE__).'/CultureInfo.php');
 
 /**
  * NumberFormatInfo class
@@ -54,24 +54,24 @@ 
 	 * ICU number formatting data.
 	 * @var array
 	 */
-	private $data = [];
+	private $data=[];
 
 	/**
 	 * A list of properties that are accessable/writable.
 	 * @var array
 	 */
-	protected $properties = [];
+	protected $properties=[];
 
 	/**
 	 * The number pattern.
 	 * @var array
 	 */
-	protected $pattern = [];
+	protected $pattern=[];
 
-	const DECIMAL = 0;
-	const CURRENCY = 1;
-	const PERCENTAGE = 2;
-	const SCIENTIFIC = 3;
+	const DECIMAL=0;
+	const CURRENCY=1;
+	const PERCENTAGE=2;
+	const SCIENTIFIC=3;
 
 	/**
 	 * Allow functions that begins with 'set' to be called directly
@@ -80,11 +80,11 @@ 
 	 */
 	public function __get($name)
 	{
-		$getProperty = 'get' . $name;
+		$getProperty='get'.$name;
 		if(in_array($getProperty, $this->properties))
 			return $this->$getProperty();
 		else
-			throw new Exception('Property ' . $name . ' does not exists.');
+			throw new Exception('Property '.$name.' does not exists.');
 	}
 
 	/**
@@ -93,11 +93,11 @@ 
 	 */
 	public function __set($name, $value)
 	{
-		$setProperty = 'set' . $name;
+		$setProperty='set'.$name;
 		if(in_array($setProperty, $this->properties))
 			$this->$setProperty($value);
 		else
-			throw new Exception('Property ' . $name . ' can not be set.');
+			throw new Exception('Property '.$name.' can not be set.');
 	}
 
 	/**
@@ -109,14 +109,14 @@ 
 	 * @param array ICU data for date time formatting.
 	 * @see getInstance()
 	 */
-	public function __construct($data = [], $type = NumberFormatInfo::DECIMAL)
+	public function __construct($data=[], $type=NumberFormatInfo::DECIMAL)
 	{
-		$this->properties = get_class_methods($this);
+		$this->properties=get_class_methods($this);
 
 		if(empty($data))
 			throw new Exception('Please provide the ICU data to initialize.');
 
-		$this->data = $data;
+		$this->data=$data;
 
 		$this->setPattern($type);
 	}
@@ -127,20 +127,20 @@ 
 	 * NumberFormatInfo::PERCENTAGE, or NumberFormatInfo::SCIENTIFIC
 	 * @param int pattern type.
 	 */
-	public function setPattern($type = NumberFormatInfo::DECIMAL)
+	public function setPattern($type=NumberFormatInfo::DECIMAL)
 	{
 		if(is_int($type))
-			$this->pattern =
+			$this->pattern=
 				$this->parsePattern($this->data['NumberPatterns'][$type]);
 		else
-			$this->pattern = $this->parsePattern($type);
+			$this->pattern=$this->parsePattern($type);
 
-		$this->pattern['negInfty'] =
-			$this->data['NumberElements'][6] .
+		$this->pattern['negInfty']=
+			$this->data['NumberElements'][6].
 			$this->data['NumberElements'][9];
 
-		$this->pattern['posInfty'] =
-			$this->data['NumberElements'][11] .
+		$this->pattern['posInfty']=
+			$this->data['NumberElements'][11].
 			$this->data['NumberElements'][9];
 	}
 
@@ -154,13 +154,13 @@ 
 	 * (invariant).
 	 * @return NumberFormatInfo default NumberFormatInfo.
 	 */
-	public static function getInvariantInfo($type = NumberFormatInfo::DECIMAL)
+	public static function getInvariantInfo($type=NumberFormatInfo::DECIMAL)
 	{
 		static $invariant;
-		if($invariant === null)
+		if($invariant===null)
 		{
-			$culture = CultureInfo::getInvariantCulture();
-			$invariant = $culture->NumberFormat;
+			$culture=CultureInfo::getInvariantCulture();
+			$invariant=$culture->NumberFormat;
 			$invariant->setPattern($type);
 		}
 		return $invariant;
@@ -178,26 +178,26 @@ 
 	 * @see getPercentageInstance();
 	 * @see getScientificInstance();
 	 */
-	public static function getInstance($culture = null,
-									   $type = NumberFormatInfo::DECIMAL)
+	public static function getInstance($culture=null,
+									   $type=NumberFormatInfo::DECIMAL)
 	{
-		if ($culture instanceof CultureInfo)
+		if($culture instanceof CultureInfo)
 		{
-			$formatInfo = $culture->NumberFormat;
+			$formatInfo=$culture->NumberFormat;
 			$formatInfo->setPattern($type);
 			return $formatInfo;
 		}
 		   elseif(is_string($culture))
 		   {
-			   $cultureInfo = new CultureInfo($culture);
-			   $formatInfo = $cultureInfo->NumberFormat;
+			   $cultureInfo=new CultureInfo($culture);
+			   $formatInfo=$cultureInfo->NumberFormat;
 			   $formatInfo->setPattern($type);
 			   return $formatInfo;
 		   }
 		   else
 		   {
-			$cultureInfo = new CultureInfo();
-			   $formatInfo = $cultureInfo->NumberFormat;
+			$cultureInfo=new CultureInfo();
+			   $formatInfo=$cultureInfo->NumberFormat;
 			   $formatInfo->setPattern($type);
 			   return $formatInfo;
 		   }
@@ -209,7 +209,7 @@ 
 	 * @return NumberFormatInfo NumberFormatInfo for the specified
 	 * culture.
 	 */
-	public static function getCurrencyInstance($culture = null)
+	public static function getCurrencyInstance($culture=null)
 	{
 		return self::getInstance($culture, self::CURRENCY);
 	}
@@ -220,7 +220,7 @@ 
 	 * @return NumberFormatInfo NumberFormatInfo for the specified
 	 * culture.
 	 */
-	public static function getPercentageInstance($culture = null)
+	public static function getPercentageInstance($culture=null)
 	{
 		return self::getInstance($culture, self::PERCENTAGE);
 	}
@@ -231,7 +231,7 @@ 
 	 * @return NumberFormatInfo NumberFormatInfo for the specified
 	 * culture.
 	 */
-	public static function getScientificInstance($culture = null)
+	public static function getScientificInstance($culture=null)
 	{
 		return self::getInstance($culture, self::SCIENTIFIC);
 	}
@@ -243,67 +243,67 @@ 
 	 */
 	protected function parsePattern($pattern)
 	{
-		$pattern = explode(';', $pattern);
+		$pattern=explode(';', $pattern);
 
-		$negative = null;
+		$negative=null;
 		if(count($pattern) > 1)
-			$negative = $pattern[1];
-		$pattern = $pattern[0];
+			$negative=$pattern[1];
+		$pattern=$pattern[0];
 
-		$comma = ',';
-		$dot = '.';
-		$digit = '0';
-		$hash = '#';
+		$comma=',';
+		$dot='.';
+		$digit='0';
+		$hash='#';
 
 		//find the first group point, and decimal point
-		$groupPos1 = strrpos($pattern, $comma);
-		$decimalPos = strrpos($pattern, $dot);
+		$groupPos1=strrpos($pattern, $comma);
+		$decimalPos=strrpos($pattern, $dot);
 
-		$groupPos2 = false;
-		$groupSize1 = false;
-		$groupSize2 = false;
-		$decimalPoints = is_int($decimalPos)?-1:false;
+		$groupPos2=false;
+		$groupSize1=false;
+		$groupSize2=false;
+		$decimalPoints=is_int($decimalPos) ?-1 : false;
 
-		$info['negPref'] = $this->data['NumberElements'][6];
-		$info['negPost'] = '';
+		$info['negPref']=$this->data['NumberElements'][6];
+		$info['negPost']='';
 
-		$info['negative'] = $negative;
-		$info['positive'] = $pattern;
+		$info['negative']=$negative;
+		$info['positive']=$pattern;
 
 		//find the negative prefix and postfix
 		if($negative)
 		{
-			$prefixPostfix = $this->getPrePostfix($negative);
-			$info['negPref'] = $prefixPostfix[0];
-			$info['negPost'] = $prefixPostfix[1];
+			$prefixPostfix=$this->getPrePostfix($negative);
+			$info['negPref']=$prefixPostfix[0];
+			$info['negPost']=$prefixPostfix[1];
 		}
 
-		$posfix = $this->getPrePostfix($pattern);
-		$info['posPref'] = $posfix[0];
-		$info['posPost'] = $posfix[1];
+		$posfix=$this->getPrePostfix($pattern);
+		$info['posPref']=$posfix[0];
+		$info['posPost']=$posfix[1];
 
 		//var_dump($pattern);
 		//var_dump($decimalPos);
 		if(is_int($groupPos1))
 		{
 			//get the second group
-			$groupPos2 = strrpos(substr($pattern, 0, $groupPos1), $comma);
+			$groupPos2=strrpos(substr($pattern, 0, $groupPos1), $comma);
 
 			//get the number of decimal digits
 			if(is_int($decimalPos))
 			{
-				$groupSize1 = $decimalPos - $groupPos1 - 1;
+				$groupSize1=$decimalPos - $groupPos1 - 1;
 
 			}
 			else
 			{
 				//no decimal point, so traverse from the back
 				//to find the groupsize 1.
-				for($i = strlen($pattern) - 1; $i >= 0; $i--)
+				for($i=strlen($pattern) - 1; $i >= 0; $i--)
 				{
-					if($pattern{$i} == $digit || $pattern{$i} == $hash)
+					if($pattern{$i}==$digit || $pattern{$i}==$hash)
 					{
-						$groupSize1 = $i - $groupPos1;
+						$groupSize1=$i - $groupPos1;
 						break;
 					}
 				}
@@ -311,36 +311,36 @@ 
 
 			//get the second group size
 			if(is_int($groupPos2))
-				$groupSize2 = $groupPos1 - $groupPos2 - 1;
+				$groupSize2=$groupPos1 - $groupPos2 - 1;
 		}
 
 		if(is_int($decimalPos))
 		{
-			for($i = strlen($pattern) - 1; $i >= 0; $i--)
+			for($i=strlen($pattern) - 1; $i >= 0; $i--)
 			{
-				if($pattern{$i} == $dot) break;
-				if($pattern{$i} == $digit)
+				if($pattern{$i}==$dot) break;
+				if($pattern{$i}==$digit)
 				{
-					$decimalPoints = $i - $decimalPos;
+					$decimalPoints=$i - $decimalPos;
 					break;
 				}
 			}
 		}
 
 		if(is_int($decimalPos))
-			$digitPattern = substr($pattern, 0, $decimalPos);
+			$digitPattern=substr($pattern, 0, $decimalPos);
 		else
-			$digitPattern = $pattern;
+			$digitPattern=$pattern;
 
-		$digitPattern = preg_replace('/[^0]/', '', $digitPattern);
+		$digitPattern=preg_replace('/[^0]/', '', $digitPattern);
 
-		$info['groupPos1'] = $groupPos1;
-		$info['groupSize1'] = $groupSize1;
-		$info['groupPos2'] = $groupPos2;
-		$info['groupSize2'] = $groupSize2;
-		$info['decimalPos'] = $decimalPos;
-		$info['decimalPoints'] = $decimalPoints;
-		$info['digitSize'] = strlen($digitPattern);
+		$info['groupPos1']=$groupPos1;
+		$info['groupSize1']=$groupSize1;
+		$info['groupPos2']=$groupPos2;
+		$info['groupSize2']=$groupSize2;
+		$info['decimalPos']=$decimalPos;
+		$info['decimalPoints']=$decimalPoints;
+		$info['digitSize']=strlen($digitPattern);
 		return $info;
 	}
 
@@ -351,9 +351,9 @@ 
 	 */
 	protected function getPrePostfix($pattern)
 	{
-		$regexp = '/[#,\.0]+/';
-		$result = preg_split($regexp, $pattern);
-		return [$result[0],$result[1]];
+		$regexp='/[#,\.0]+/';
+		$result=preg_split($regexp, $pattern);
+		return [$result[0], $result[1]];
 	}
 
 
@@ -372,7 +372,7 @@ 
 	 */
 	public function setDecimalDigits($value)
 	{
-		return $this->pattern['decimalPoints'] = $value;
+		return $this->pattern['decimalPoints']=$value;
 	}
 
 	public function getDigitSize()
@@ -382,7 +382,7 @@ 
 
 	public function setDigitSize($value)
 	{
-		$this->pattern['digitSize'] = $value;
+		$this->pattern['digitSize']=$value;
 	}
 
 	/**
@@ -400,7 +400,7 @@ 
 	 */
 	public function setDecimalSeparator($value)
 	{
-		return $this->data['NumberElements'][0] = $value;
+		return $this->data['NumberElements'][0]=$value;
 	}
 
 	/**
@@ -420,7 +420,7 @@ 
 	 */
 	public function setGroupSeparator($value)
 	{
-		return $this->data['NumberElements'][1] = $value;
+		return $this->data['NumberElements'][1]=$value;
 	}
 
 	/**
@@ -432,8 +432,8 @@ 
 	 */
 	public function getGroupSizes()
 	{
-		$group1 = $this->pattern['groupSize1'];
-		$group2 = $this->pattern['groupSize2'];
+		$group1=$this->pattern['groupSize1'];
+		$group2=$this->pattern['groupSize2'];
 
 		return [$group1, $group2];
 	}
@@ -447,8 +447,8 @@ 
 	 */
 	public function setGroupSizes($groupSize)
 	{
-		$this->pattern['groupSize1'] = $groupSize[0];
-		$this->pattern['groupSize2'] = $groupSize[1];
+		$this->pattern['groupSize1']=$groupSize[0];
+		$this->pattern['groupSize2']=$groupSize[1];
 	}
 
 	/**
@@ -459,8 +459,8 @@ 
 	 */
 	public function getNegativePattern()
 	{
-		$prefix = $this->pattern['negPref'];
-		$postfix = $this->pattern['negPost'];
+		$prefix=$this->pattern['negPref'];
+		$postfix=$this->pattern['negPost'];
 		return [$prefix, $postfix];
 	}
 
@@ -472,8 +472,8 @@ 
 	 */
 	public function setNegativePattern($pattern)
 	{
-		$this->pattern['negPref'] = $pattern[0];
-		$this->pattern['negPost'] = $pattern[1];
+		$this->pattern['negPref']=$pattern[0];
+		$this->pattern['negPost']=$pattern[1];
 	}
 
 	/**
@@ -484,8 +484,8 @@ 
 	 */
 	public function getPositivePattern()
 	{
-		$prefix = $this->pattern['posPref'];
-		$postfix = $this->pattern['posPost'];
+		$prefix=$this->pattern['posPref'];
+		$postfix=$this->pattern['posPost'];
 		return [$prefix, $postfix];
 	}
 
@@ -497,15 +497,15 @@ 
 	 */
 	public function setPositivePattern($pattern)
 	{
-		$this->pattern['posPref'] = $pattern[0];
-		$this->pattern['posPost'] = $pattern[1];
+		$this->pattern['posPref']=$pattern[0];
+		$this->pattern['posPost']=$pattern[1];
 	}
 
 	/**
 	 * Gets the string to use as the currency symbol.
 	 * @return string currency symbol.
 	 */
-	public function getCurrencySymbol($currency = 'USD')
+	public function getCurrencySymbol($currency='USD')
 	{
 		if(isset($this->pattern['symbol']))
 			return $this->pattern['symbol'];
@@ -520,7 +520,7 @@ 
 	 */
 	public function setCurrencySymbol($symbol)
 	{
-		$this->pattern['symbol'] = $symbol;
+		$this->pattern['symbol']=$symbol;
 	}
 
 	/**
@@ -538,7 +538,7 @@ 
 	 */
 	public function setNegativeInfinitySymbol($value)
 	{
-		$this->pattern['negInfty'] = $value;
+		$this->pattern['negInfty']=$value;
 	}
 
 	/**
@@ -556,7 +556,7 @@ 
 	 */
 	public function setPositiveInfinitySymbol($value)
 	{
-		$this->pattern['posInfty'] = $value;
+		$this->pattern['posInfty']=$value;
 	}
 
 	/**
@@ -574,7 +574,7 @@ 
 	 */
 	public function setNegativeSign($value)
 	{
-		$this->data['NumberElements'][6] = $value;
+		$this->data['NumberElements'][6]=$value;
 	}
 
 	/**
@@ -592,7 +592,7 @@ 
 	 */
 	public function setPositiveSign($value)
 	{
-		$this->data['NumberElements'][11] = $value;
+		$this->data['NumberElements'][11]=$value;
 	}
 
 	/**
@@ -610,7 +610,7 @@ 
 	 */
 	public function setNaNSymbol($value)
 	{
-		$this->data['NumberElements'][10] = $value;
+		$this->data['NumberElements'][10]=$value;
 	}
 
 	/**
@@ -628,7 +628,7 @@ 
 	 */
 	public function setPercentSymbol($value)
 	{
-		$this->data['NumberElements'][3] = $value;
+		$this->data['NumberElements'][3]=$value;
 	}
 
 	/**
@@ -646,7 +646,7 @@ 
 	 */
 	public function setPerMilleSymbol($value)
 	{
-		$this->data['NumberElements'][8] = $value;
+		$this->data['NumberElements'][8]=$value;
 	}
 }
 

Braces +3 added lines, -6 removed lines

@@ -186,15 +186,13 @@ 
 			$formatInfo = $culture->NumberFormat;
 			$formatInfo->setPattern($type);
 			return $formatInfo;
-		}
-		   elseif(is_string($culture))
+		} elseif(is_string($culture))
 		   {
 			   $cultureInfo = new CultureInfo($culture);
 			   $formatInfo = $cultureInfo->NumberFormat;
 			   $formatInfo->setPattern($type);
 			   return $formatInfo;
-		   }
-		   else
+		   } else
 		   {
 			$cultureInfo = new CultureInfo();
 			   $formatInfo = $cultureInfo->NumberFormat;
@@ -294,8 +292,7 @@ 
 			{
 				$groupSize1 = $decimalPos - $groupPos1 - 1;
 
-			}
-			else
+			} else
 			{
 				//no decimal point, so traverse from the back
 				//to find the groupsize 1.

framework/I18N/core/TCache_Lite.php

Doc Comments +2 added lines

@@ -488,6 +488,8 @@
 	/**
 	 *
 	 * @access private
+	 * @param string $id
+	 * @param string $data
 	 */
 	public function _memoryCacheAdd($id, $data)
 	{

Switch Indentation +9 added lines, -9 removed lines

@@ -607,15 +607,15 @@
 	public function _hash($data, $controlType)
 	{
 		switch ($controlType) {
-		case 'md5':
-			return md5($data);
-		case 'crc32':
-			return sprintf('% 32d', crc32($data));
-		case 'strlen':
-			return sprintf('% 32d', strlen($data));
-		default:
-			$this->raiseError('Unknown controlType ! ' .
-			'(available values are only \'md5\', \'crc32\', \'strlen\')', -5);
+			case 'md5':
+				return md5($data);
+			case 'crc32':
+				return sprintf('% 32d', crc32($data));
+			case 'strlen':
+				return sprintf('% 32d', strlen($data));
+			default:
+				$this->raiseError('Unknown controlType ! ' .
+				'(available values are only \'md5\', \'crc32\', \'strlen\')', -5);
 		}
 	}
 

Spacing +105 added lines, -105 removed lines

@@ -57,7 +57,7 @@ 
 	 *
 	 * @var string $_cacheDir
 	 */
-	protected $_cacheDir = '/tmp/';
+	protected $_cacheDir='/tmp/';
 
 	/**
 	 * Enable / disable caching
@@ -66,14 +66,14 @@ 
 	 *
 	 * @var boolean $_caching
 	 */
-	protected $_caching = true;
+	protected $_caching=true;
 
 	/**
 	 * Cache lifetime (in seconds)
 	 *
 	 * @var int $_lifeTime
 	 */
-	protected $_lifeTime = 3600;
+	protected $_lifeTime=3600;
 
 	/**
 	 * Enable / disable fileLocking
@@ -82,7 +82,7 @@ 
 	 *
 	 * @var boolean $_fileLocking
 	 */
-	protected $_fileLocking = true;
+	protected $_fileLocking=true;
 
 	/**
 	 * Timestamp of the last valid cache
@@ -108,7 +108,7 @@ 
 	 *
 	 * @var boolean $_writeControl
 	 */
-	protected $_writeControl = true;
+	protected $_writeControl=true;
 
 	/**
 	 * Enable / disable read control
@@ -118,7 +118,7 @@ 
 	 *
 	 * @var boolean $_writeControl
 	 */
-	protected $_readControl = true;
+	protected $_readControl=true;
 
 	/**
 	 * Type of read control (only if read control is enabled)
@@ -131,7 +131,7 @@ 
 	 *
 	 * @var boolean $_readControlType
 	 */
-	protected $_readControlType = 'crc32';
+	protected $_readControlType='crc32';
 
 	/**
 	 * Current cache id
@@ -154,7 +154,7 @@ 
 	 *
 	 * @var boolean $_memoryCaching
 	 */
-	protected $_memoryCaching = false;
+	protected $_memoryCaching=false;
 
 	/**
 	 * Enable / Disable "Only Memory Caching"
@@ -162,28 +162,28 @@ 
 	 *
 	 * @var boolean $_onlyMemoryCaching
 	 */
-	protected $_onlyMemoryCaching = false;
+	protected $_onlyMemoryCaching=false;
 
 	/**
 	 * Memory caching array
 	 *
 	 * @var array $_memoryCachingArray
 	 */
-	protected $_memoryCachingArray = [];
+	protected $_memoryCachingArray=[];
 
 	/**
 	 * Memory caching counter
 	 *
 	 * @var int $memoryCachingCounter
 	 */
-	protected $_memoryCachingCounter = 0;
+	protected $_memoryCachingCounter=0;
 
 	/**
 	 * Memory caching limit
 	 *
 	 * @var int $memoryCachingLimit
 	 */
-	protected $_memoryCachingLimit = 1000;
+	protected $_memoryCachingLimit=1000;
 
 	/**
 	 * File Name protection
@@ -195,7 +195,7 @@ 
 	 *
 	 * @var boolean $fileNameProtection
 	 */
-	protected $_fileNameProtection = true;
+	protected $_fileNameProtection=true;
 
 	/**
 	 * Enable / disable automatic serialization
@@ -205,7 +205,7 @@ 
 	 *
 	 * @var boolean $_serialize
 	 */
-	protected $_automaticSerialization = false;
+	protected $_automaticSerialization=false;
 
 	// --- Public methods ---
 
@@ -231,9 +231,9 @@ 
 	 * @param array $options options
 	 * @access public
 	 */
-	public function __construct($options = [null])
+	public function __construct($options=[null])
 	{
-		$availableOptions = [	'automaticSerialization',
+		$availableOptions=['automaticSerialization',
 									'fileNameProtection',
 									'memoryCaching',
 									'onlyMemoryCaching',
@@ -247,11 +247,11 @@ 
 									'readControlType'];
 		foreach($options as $key => $value) {
 			if(in_array($key, $availableOptions)) {
-				$property = '_' . $key;
-				$this->$property = $value;
+				$property='_'.$key;
+				$this->$property=$value;
 			}
 		}
-		$this->_refreshTime = time() - $this->_lifeTime;
+		$this->_refreshTime=time() - $this->_lifeTime;
 	}
 
 	/**
@@ -264,41 +264,41 @@ 
 	 * @return string data of the cache (or false if no cache available)
 	 * @access public
 	 */
-	public function get($id, $group = 'default', $doNotTestCacheValidity = false)
+	public function get($id, $group='default', $doNotTestCacheValidity=false)
 	{
-		$this->_id = $id;
-		$this->_group = $group;
-		$data = false;
-		if ($this->_caching) {
+		$this->_id=$id;
+		$this->_group=$group;
+		$data=false;
+		if($this->_caching) {
 			$this->_setFileName($id, $group);
-			if ($this->_memoryCaching) {
-				if (isset($this->_memoryCachingArray[$this->_file])) {
-					if ($this->_automaticSerialization) {
+			if($this->_memoryCaching) {
+				if(isset($this->_memoryCachingArray[$this->_file])) {
+					if($this->_automaticSerialization) {
 						return unserialize(
 									$this->_memoryCachingArray[$this->_file]);
 					} else {
 						return $this->_memoryCachingArray[$this->_file];
 					}
 				} else {
-					if ($this->_onlyMemoryCaching) {
+					if($this->_onlyMemoryCaching) {
 						return false;
 					}
 				}
 			}
-			if ($doNotTestCacheValidity) {
-				if (file_exists($this->_file)) {
-					$data = $this->_read();
+			if($doNotTestCacheValidity) {
+				if(file_exists($this->_file)) {
+					$data=$this->_read();
 				}
 			} else {
-				if (@filemtime($this->_file) > $this->_refreshTime) {
-					$data = $this->_read();
+				if(@filemtime($this->_file) > $this->_refreshTime) {
+					$data=$this->_read();
 				}
 			}
-			if (($data) and ($this->_memoryCaching)) {
+			if(($data) and ($this->_memoryCaching)) {
 				$this->_memoryCacheAdd($this->_file, $data);
 			}
-			if ($this->_automaticSerialization && is_string($data)) {
-				$data = unserialize($data);
+			if($this->_automaticSerialization && is_string($data)) {
+				$data=unserialize($data);
 			}
 			return $data;
 		}
@@ -315,23 +315,23 @@ 
 	 * @return boolean true if no problem
 	 * @access public
 	 */
-	public function save($data, $id = null, $group = 'default')
+	public function save($data, $id=null, $group='default')
 	{
-		if ($this->_caching) {
-			if ($this->_automaticSerialization) {
-				$data = serialize($data);
+		if($this->_caching) {
+			if($this->_automaticSerialization) {
+				$data=serialize($data);
 			}
-			if (isset($id)) {
+			if(isset($id)) {
 				$this->_setFileName($id, $group);
 			}
-			if ($this->_memoryCaching) {
+			if($this->_memoryCaching) {
 				$this->_memoryCacheAdd($this->_file, $data);
-				if ($this->_onlyMemoryCaching) {
+				if($this->_onlyMemoryCaching) {
 					return true;
 				}
 			}
-			if ($this->_writeControl) {
-				if (!$this->_writeAndControl($data)) {
+			if($this->_writeControl) {
+				if(!$this->_writeAndControl($data)) {
 					@touch($this->_file, time() - 2 * abs($this->_lifeTime));
 					return false;
 				} else {
@@ -352,10 +352,10 @@ 
 	 * @return boolean true if no problem
 	 * @access public
 	 */
-	public function remove($id, $group = 'default')
+	public function remove($id, $group='default')
 	{
 		$this->_setFileName($id, $group);
-		if (!@unlink($this->_file)) {
+		if(!@unlink($this->_file)) {
 			$this->raiseError('TCache_Lite : Unable to remove cache !', -3);
 			return false;
 		}
@@ -372,35 +372,35 @@ 
 	 * @return boolean true if no problem
 	 * @access public
 	 */
-	public function clean($group = false)
+	public function clean($group=false)
 	{
-		if ($this->_fileNameProtection) {
-			$motif = ($group) ? 'cache_' . md5($group) . '_' : 'cache_';
+		if($this->_fileNameProtection) {
+			$motif=($group) ? 'cache_'.md5($group).'_' : 'cache_';
 		} else {
-			$motif = ($group) ? 'cache_' . $group . '_' : 'cache_';
+			$motif=($group) ? 'cache_'.$group.'_' : 'cache_';
 		}
-		if ($this->_memoryCaching) {
-			while (list($key, $value) = each($this->_memoryCaching)) {
-				if (strpos($key, $motif, 0)) {
+		if($this->_memoryCaching) {
+			while(list($key, $value)=each($this->_memoryCaching)) {
+				if(strpos($key, $motif, 0)) {
 					unset($this->_memoryCaching[$key]);
-					$this->_memoryCachingCounter =
+					$this->_memoryCachingCounter=
 							$this->_memoryCachingCounter - 1;
 				}
 			}
-			if ($this->_onlyMemoryCaching) {
+			if($this->_onlyMemoryCaching) {
 				return true;
 			}
 		}
-		if (!($dh = opendir($this->_cacheDir))) {
+		if(!($dh=opendir($this->_cacheDir))) {
 			$this->raiseError('TCache_Lite : Unable to open cache directory !');
 			return false;
 		}
-		while ($file = readdir($dh)) {
-			if (($file != '.') && ($file != '..')) {
-				$file = $this->_cacheDir . $file;
-				if (is_file($file)) {
-					if (strpos($file, $motif, 0)) {
-						if (!@unlink($file)) {
+		while($file=readdir($dh)) {
+			if(($file!='.') && ($file!='..')) {
+				$file=$this->_cacheDir.$file;
+				if(is_file($file)) {
+					if(strpos($file, $motif, 0)) {
+						if(!@unlink($file)) {
 			 $this->raiseError('Cache_Lite : Unable to remove cache !', -3);
 							return false;
 						}
@@ -419,22 +419,22 @@ 
 		 */
 	public function setLifeTime($newLifeTime)
 	{
-		$this->_lifeTime = $newLifeTime;
-		$this->_refreshTime = time() - $newLifeTime;
+		$this->_lifeTime=$newLifeTime;
+		$this->_refreshTime=time() - $newLifeTime;
 	}
 
 	/**
 	 *
 	 * @access public
 	 */
-	public function saveMemoryCachingState($id, $group = 'default')
+	public function saveMemoryCachingState($id, $group='default')
 	{
-		if ($this->_caching) {
-			$array = [
+		if($this->_caching) {
+			$array=[
 				'counter' => $this->_memoryCachingCounter,
 				'array' => $this->_memoryCachingState
 			];
-			$data = serialize($array);
+			$data=serialize($array);
 			$this->save($data, $id, $group);
 		}
 	}
@@ -443,15 +443,15 @@ 
 	 *
 	 * @access public
 	 */
-	public function getMemoryCachingState($id, $group = 'default',
-									$doNotTestCacheValidity = false)
+	public function getMemoryCachingState($id, $group='default',
+									$doNotTestCacheValidity=false)
 	{
-		if ($this->_caching) {
-			if ($data = $this->get($id, $group, $doNotTestCacheValidity))
+		if($this->_caching) {
+			if($data=$this->get($id, $group, $doNotTestCacheValidity))
 			{
-				$array = unserialize($data);
-				$this->_memoryCachingCounter = $array['counter'];
-				$this->_memoryCachingArray = $array['array'];
+				$array=unserialize($data);
+				$this->_memoryCachingCounter=$array['counter'];
+				$this->_memoryCachingArray=$array['array'];
 			}
 		}
 	}
@@ -491,12 +491,12 @@ 
 	 */
 	public function _memoryCacheAdd($id, $data)
 	{
-		$this->_memoryCachingArray[$this->_file] = $data;
-		if ($this->_memoryCachingCounter >= $this->_memoryCachingLimit) {
-			list($key, $value) = each($this->_memoryCachingArray);
+		$this->_memoryCachingArray[$this->_file]=$data;
+		if($this->_memoryCachingCounter >= $this->_memoryCachingLimit) {
+			list($key, $value)=each($this->_memoryCachingArray);
 			unset($this->_memoryCachingArray[$key]);
 		} else {
-			$this->_memoryCachingCounter = $this->_memoryCachingCounter + 1;
+			$this->_memoryCachingCounter=$this->_memoryCachingCounter + 1;
 		}
 	}
 
@@ -509,11 +509,11 @@ 
 	 */
 	public function _setFileName($id, $group)
 	{
-		if ($this->_fileNameProtection) {
-			$this->_file = ($this->_cacheDir . 'cache_' . md5($group) . '_'
+		if($this->_fileNameProtection) {
+			$this->_file=($this->_cacheDir.'cache_'.md5($group).'_'
 									. md5($id));
 		} else {
-			$this->_file = $this->_cacheDir . 'cache_' . $group . '_' . $id;
+			$this->_file=$this->_cacheDir.'cache_'.$group.'_'.$id;
 		}
 	}
 
@@ -530,22 +530,22 @@ 
 	 */
 	public function _read()
 	{
-		$fp = @fopen($this->_file, "rb");
-		if ($this->_fileLocking) @flock($fp, LOCK_SH);
-		if ($fp) {
+		$fp=@fopen($this->_file, "rb");
+		if($this->_fileLocking) @flock($fp, LOCK_SH);
+		if($fp) {
 			// because the filesize can be cached by PHP itself...
 			clearstatcache();
-			$length = @filesize($this->_file);
-			if ($this->_readControl) {
-				$hashControl = @fread($fp, 32);
-				$length = $length - 32;
+			$length=@filesize($this->_file);
+			if($this->_readControl) {
+				$hashControl=@fread($fp, 32);
+				$length=$length - 32;
 			}
-			$data = @fread($fp, $length);
-			if ($this->_fileLocking) @flock($fp, LOCK_UN);
+			$data=@fread($fp, $length);
+			if($this->_fileLocking) @flock($fp, LOCK_UN);
 			@fclose($fp);
-			if ($this->_readControl) {
-				$hashData = $this->_hash($data, $this->_readControlType);
-				if ($hashData != $hashControl) {
+			if($this->_readControl) {
+				$hashData=$this->_hash($data, $this->_readControlType);
+				if($hashData!=$hashControl) {
 					@touch($this->_file, time() - 2 * abs($this->_lifeTime));
 					return false;
 				}
@@ -565,15 +565,15 @@ 
 	 */
 	public function _write($data)
 	{
-		$fp = @fopen($this->_file, "wb");
-		if ($fp) {
-			if ($this->_fileLocking) @flock($fp, LOCK_EX);
-			if ($this->_readControl) {
+		$fp=@fopen($this->_file, "wb");
+		if($fp) {
+			if($this->_fileLocking) @flock($fp, LOCK_EX);
+			if($this->_readControl) {
 				@fwrite($fp, $this->_hash($data, $this->_readControlType), 32);
 			}
-			$len = strlen($data);
+			$len=strlen($data);
 			@fwrite($fp, $data, $len);
-			if ($this->_fileLocking) @flock($fp, LOCK_UN);
+			if($this->_fileLocking) @flock($fp, LOCK_UN);
 			@fclose($fp);
 			return true;
 		}
@@ -592,8 +592,8 @@ 
 	public function _writeAndControl($data)
 	{
 		$this->_write($data);
-		$dataRead = $this->_read($data);
-		return ($dataRead == $data);
+		$dataRead=$this->_read($data);
+		return ($dataRead==$data);
 	}
 
 	/**
@@ -606,7 +606,7 @@ 
 	 */
 	public function _hash($data, $controlType)
 	{
-		switch ($controlType) {
+		switch($controlType) {
 		case 'md5':
 			return md5($data);
 		case 'crc32':
@@ -614,7 +614,7 @@ 
 		case 'strlen':
 			return sprintf('% 32d', strlen($data));
 		default:
-			$this->raiseError('Unknown controlType ! ' .
+			$this->raiseError('Unknown controlType ! '.
 			'(available values are only \'md5\', \'crc32\', \'strlen\')', -5);
 		}
 	}