pradosoft / prado

framework/Web/Javascripts/TJavaScriptLiteral.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 
 	public function __toString()
 	{
-		return (string)$this->_s;
+		return (string) $this->_s;
 	}
 
 	public function toJavaScriptLiteral()

framework/Web/THttpUtility.php

Spacing +3 added lines, -3 removed lines

@@ -20,9 +20,9 @@
  */
 class THttpUtility
 {
-	private static $_encodeTable = ['<' => '&lt;','>' => '&gt;','"' => '&quot;'];
-	private static $_decodeTable = ['&lt;' => '<','&gt;' => '>','&quot;' => '"'];
-	private static $_stripTable = ['&lt;' => '','&gt;' => '','&quot;' => ''];
+	private static $_encodeTable = ['<' => '&lt;', '>' => '&gt;', '"' => '&quot;'];
+	private static $_decodeTable = ['&lt;' => '<', '&gt;' => '>', '&quot;' => '"'];
+	private static $_stripTable = ['&lt;' => '', '&gt;' => '', '&quot;' => ''];
 
 	/**
 	 * HTML-encodes a string.

framework/Data/Common/Pgsql/TPgsqlMetaData.php

Upper-Lower-Casing +5 added lines, -5 removed lines

@@ -137,7 +137,7 @@ 
 				nspname = :schema))
 			AND a.attnum > 0 AND NOT a.attisdropped
 		ORDER BY a.attnum
-EOD;
+eod;
 		$this->getDbConnection()->setActive(true);
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
@@ -197,7 +197,7 @@ 
 		SELECT count(c.relname) FROM pg_catalog.pg_class c
 		LEFT JOIN pg_catalog.pg_namespace n ON (n.oid = c.relnamespace)
 		WHERE (n.nspname=:schema) AND (c.relkind = 'v'::"char") AND c.relname = :table
-EOD;
+eod;
 		$this->getDbConnection()->setActive(true);
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':schema', $schemaName);
@@ -332,7 +332,7 @@ 
 					WHERE nspname=:schema))
 	ORDER BY
 			1
-EOD;
+eod;
 		$this->getDbConnection()->setActive(true);
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
@@ -372,7 +372,7 @@ 
 			)
 		)
 				AND attnum IN ({$index})
-EOD;
+eod;
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
 		$command->bindValue(':schema', $schemaName);
@@ -434,7 +434,7 @@ 
 		$sql = <<<EOD
 SELECT table_name, table_schema FROM information_schema.tables
 WHERE table_schema=:schema AND table_type='BASE TABLE'
-EOD;
+eod;
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindParam(':schema', $schema);
 		$rows = $command->queryAll();

Spacing +30 added lines, -30 removed lines

@@ -89,10 +89,10 @@ 
 	 */
 	protected function getSchemaTableName($table)
 	{
-		if (count($parts = explode('.', str_replace('"', '', $table))) > 1) {
+		if(count($parts = explode('.', str_replace('"', '', $table))) > 1) {
 			return [$parts[0], $parts[1]];
 		} else {
-			return [$this->getDefaultSchema(),$parts[0]];
+			return [$this->getDefaultSchema(), $parts[0]];
 		}
 	}
 
@@ -144,11 +144,11 @@ 
 		$command->bindValue(':schema', $schemaName);
 		$tableInfo = $this->createNewTableInfo($schemaName, $tableName);
 		$index = 0;
-		foreach ($command->query() as $col) {
+		foreach($command->query() as $col) {
 			$col['index'] = $index++;
 			$this->processColumn($tableInfo, $col);
 		}
-		if ($index === 0) {
+		if($index === 0) {
 			throw new TDbException('dbmetadata_invalid_table_view', $table);
 		}
 		return $tableInfo;
@@ -163,7 +163,7 @@ 
 	{
 		$info['SchemaName'] = $this->assertIdentifier($schemaName);
 		$info['TableName'] = $this->assertIdentifier($tableName);
-		if ($this->getIsView($schemaName, $tableName)) {
+		if($this->getIsView($schemaName, $tableName)) {
 			$info['IsView'] = true;
 		}
 		list($primary, $foreign) = $this->getConstraintKeys($schemaName, $tableName);
@@ -178,7 +178,7 @@ 
 	 */
 	protected function assertIdentifier($name)
 	{
-		if (strpos($name, '"') !== false) {
+		if(strpos($name, '"') !== false) {
 			$ref = 'http://www.postgresql.org/docs/7.4/static/sql-syntax.html#SQL-SYNTAX-IDENTIFIERS';
 			throw new TDbException('dbcommon_invalid_identifier_name', $name, $ref);
 		}
@@ -216,34 +216,34 @@ 
 		$info['ColumnName'] = '"' . $columnId . '"'; //quote the column names!
 		$info['ColumnId'] = $columnId;
 		$info['ColumnIndex'] = $col['index'];
-		if (!$col['attnotnull']) {
+		if(!$col['attnotnull']) {
 			$info['AllowNull'] = true;
 		}
-		if (in_array($columnId, $tableInfo->getPrimaryKeys())) {
+		if(in_array($columnId, $tableInfo->getPrimaryKeys())) {
 			$info['IsPrimaryKey'] = true;
 		}
-		if ($this->isForeignKeyColumn($columnId, $tableInfo)) {
+		if($this->isForeignKeyColumn($columnId, $tableInfo)) {
 			$info['IsForeignKey'] = true;
 		}
 
-		if ($col['atttypmod'] > 0) {
+		if($col['atttypmod'] > 0) {
 			$info['ColumnSize'] = $col['atttypmod'] - 4;
 		}
-		if ($col['atthasdef']) {
+		if($col['atthasdef']) {
 			$info['DefaultValue'] = $col['adsrc'];
 		}
-		if ($col['attisserial'] || substr($col['adsrc'], 0, 8) === 'nextval(') {
-			if (($sequence = $this->getSequenceName($tableInfo, $col['adsrc'])) !== null) {
+		if($col['attisserial'] || substr($col['adsrc'], 0, 8) === 'nextval(') {
+			if(($sequence = $this->getSequenceName($tableInfo, $col['adsrc'])) !== null) {
 				$info['SequenceName'] = $sequence;
 				unset($info['DefaultValue']);
 			}
 		}
 		$matches = [];
-		if (preg_match('/\((\d+)(?:,(\d+))?+\)/', $col['type'], $matches)) {
+		if(preg_match('/\((\d+)(?:,(\d+))?+\)/', $col['type'], $matches)) {
 			$info['DbType'] = preg_replace('/\(\d+(?:,\d+)?\)/', '', $col['type']);
-			if ($this->isPrecisionType($info['DbType'])) {
+			if($this->isPrecisionType($info['DbType'])) {
 				$info['NumericPrecision'] = intval($matches[1]);
-				if (count($matches) > 2) {
+				if(count($matches) > 2) {
 					$info['NumericScale'] = intval($matches[2]);
 				}
 			} else {
@@ -262,8 +262,8 @@ 
 	protected function getSequenceName($tableInfo, $src)
 	{
 		$matches = [];
-		if (preg_match('/nextval\([^\']*\'([^\']+)\'[^\)]*\)/i', $src, $matches)) {
-			if (is_int(strpos($matches[1], '.'))) {
+		if(preg_match('/nextval\([^\']*\'([^\']+)\'[^\)]*\)/i', $src, $matches)) {
+			if(is_int(strpos($matches[1], '.'))) {
 				return $matches[1];
 			} else {
 				return $tableInfo->getSchemaName() . '.' . $matches[1];
@@ -341,19 +341,19 @@ 
 		$command->bindValue(':schema', $schemaName);
 		$primary = [];
 		$foreign = [];
-		foreach ($command->query() as $row) {
-			switch ($row['contype']) {
+		foreach($command->query() as $row) {
+			switch($row['contype']) {
 				case 'p':
 					$primary = $this->getPrimaryKeys($tableName, $schemaName, $row['indkey']);
 					break;
 				case 'f':
-					if (($fkey = $this->getForeignKeys($row['consrc'])) !== null) {
+					if(($fkey = $this->getForeignKeys($row['consrc'])) !== null) {
 						$foreign[] = $fkey;
 					}
 					break;
 			}
 		}
-		return [$primary,$foreign];
+		return [$primary, $foreign];
 	}
 
 	/**
@@ -379,7 +379,7 @@ 
 		$command->bindValue(':schema', $schemaName);
 //		$command->bindValue(':columnIndex', join(', ', explode(' ', $columnIndex)));
 		$primary = [];
-		foreach ($command->query() as $row) {
+		foreach($command->query() as $row) {
 			$primary[] = $row['attname'];
 		}
 
@@ -396,10 +396,10 @@ 
 		$matches = [];
 		$brackets = '\(([^\)]+)\)';
 		$find = "/FOREIGN\s+KEY\s+{$brackets}\s+REFERENCES\s+([^\(]+){$brackets}/i";
-		if (preg_match($find, $src, $matches)) {
+		if(preg_match($find, $src, $matches)) {
 			$keys = preg_split('/,\s+/', $matches[1]);
 			$fkeys = [];
-			foreach (preg_split('/,\s+/', $matches[3]) as $i => $fkey) {
+			foreach(preg_split('/,\s+/', $matches[3]) as $i => $fkey) {
 				$fkeys[$keys[$i]] = $fkey;
 			}
 			return ['table' => str_replace('"', '', $matches[2]), 'keys' => $fkeys];
@@ -413,8 +413,8 @@ 
 	 */
 	protected function isForeignKeyColumn($columnId, $tableInfo)
 	{
-		foreach ($tableInfo->getForeignKeys() as $fk) {
-			if (in_array($columnId, array_keys($fk['keys']))) {
+		foreach($tableInfo->getForeignKeys() as $fk) {
+			if(in_array($columnId, array_keys($fk['keys']))) {
 				return true;
 			}
 		}
@@ -429,7 +429,7 @@ 
 	 */
 	public function findTableNames($schema = 'public')
 	{
-		if ($schema === '') {
+		if($schema === '') {
 			$schema = self::DEFAULT_SCHEMA;
 		}
 		$sql = <<<EOD
@@ -440,8 +440,8 @@ 
 		$command->bindParam(':schema', $schema);
 		$rows = $command->queryAll();
 		$names = [];
-		foreach ($rows as $row) {
-			if ($schema === self::DEFAULT_SCHEMA) {
+		foreach($rows as $row) {
+			if($schema === self::DEFAULT_SCHEMA) {
 				$names[] = $row['table_name'];
 			} else {
 				$names[] = $row['table_schema'] . '.' . $row['table_name'];

framework/Data/ActiveRecord/TActiveRecordManager.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 	 * @var TActiveRecordInvalidFinderResult
 	 * @since 3.1.5
 	 */
-	private $_invalidFinderResult = TActiveRecordInvalidFinderResult::Null;
+	private $_invalidFinderResult = TActiveRecordInvalidFinderResult::null;
 
 	/**
 	 * @return ICache application cache.

Spacing +4 added lines, -4 removed lines

@@ -95,9 +95,9 @@ 
 	public static function getInstance($self = null)
 	{
 		static $instance;
-		if ($self !== null) {
+		if($self !== null) {
 			$instance = $self;
-		} elseif ($instance === null) {
+		} elseif($instance === null) {
 			$instance = new self;
 		}
 		return $instance;
@@ -108,7 +108,7 @@ 
 	 */
 	public function getRecordGateway()
 	{
-		if ($this->_gateway === null) {
+		if($this->_gateway === null) {
 			$this->_gateway = $this->createRecordGateway();
 		}
 		return $this->_gateway;
@@ -129,7 +129,7 @@ 
 	public function setGatewayClass($value)
 	{
 		$this->_gateway = null;
-		$this->_gatewayClass = (string)$value;
+		$this->_gatewayClass = (string) $value;
 	}
 
 	/**

framework/Data/ActiveRecord/TActiveRecordConfig.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
 	 * @var TActiveRecordInvalidFinderResult
 	 * @since 3.1.5
 	 */
-	private $_invalidFinderResult = TActiveRecordInvalidFinderResult::Null;
+	private $_invalidFinderResult = TActiveRecordInvalidFinderResult::null;
 
 	/**
 	 * Initialize the active record manager.

Spacing +2 added lines, -2 removed lines

@@ -111,7 +111,7 @@ 
 	{
 		parent::init($xml);
 		$manager = $this -> getManager();
-		if ($this->getEnableCache()) {
+		if($this->getEnableCache()) {
 			$manager->setCache($this->getApplication()->getCache());
 		}
 		$manager->setDbConnection($this->getDbConnection());
@@ -124,7 +124,7 @@ 
 	 */
 	public function getManager()
 	{
-		if ($this->_manager === null) {
+		if($this->_manager === null) {
 			$this->_manager = Prado::createComponent($this -> getManagerClass());
 		}
 		return TActiveRecordManager::getInstance($this->_manager);

framework/Web/UI/WebControls/TReCaptcha.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -328,7 +328,7 @@
 	{
 		$req = $this->recaptcha_qsencode($data);
 
-		$http_request = "POST $path HTTP/1.0\r\n";
+		$http_request = "post $path HTTP/1.0\r\n";
 		$http_request .= "Host: $host\r\n";
 		$http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n";
 		$http_request .= "Content-Length: " . strlen($req) . "\r\n";

Spacing +14 added lines, -15 removed lines

@@ -167,13 +167,13 @@ 
 	public function getClientSideOptions()
 	{
 		$options = [];
-		if ($theme = $this->getThemeName()) {
+		if($theme = $this->getThemeName()) {
 			$options['theme'] = $theme;
 		}
-		if ($lang = $this->getLanguage()) {
+		if($lang = $this->getLanguage()) {
 			$options['lang'] = $lang;
 		}
-		if ($trans = $this->getCustomTranslations()) {
+		if($trans = $this->getCustomTranslations()) {
 			$options['custom_translations'] = $trans;
 		}
 		return $options;
@@ -181,8 +181,7 @@ 
 
 	public function validate()
 	{
-		if (!
-			  (
+		if(!(
 			($challenge = @$_POST[$this->getChallengeFieldName()])
 			and
 			($response = @$_POST[$this->getResponseFieldName()])
@@ -207,10 +206,10 @@ 
 	{
 		parent::onPreRender($param);
 
-		if ("" == $this->getPublicKey()) {
+		if("" == $this->getPublicKey()) {
 			throw new TConfigurationException('recaptcha_publickey_unknown');
 		}
-		if ("" == $this->getPrivateKey()) {
+		if("" == $this->getPrivateKey()) {
 			throw new TConfigurationException('recaptcha_privatekey_unknown');
 		}
 
@@ -230,7 +229,7 @@ 
 	{
 		// if we're in a callback, then schedule re-rendering of the control
 		// if not, don't do anything, because a new challenge will be rendered anyway
-		if ($this->Page->IsCallback) {
+		if($this->Page->IsCallback) {
 			$this->Page->CallbackClient->jQuery($this->getClientID() . ' #recaptcha_reload', 'click');
 		}
 	}
@@ -243,7 +242,7 @@ 
 		$divid = $id . '_1_recaptchadiv';
 		$writer->write('<div id="' . htmlspecialchars($divid) . '">');
 
-		if (!$this->Page->IsCallback) {
+		if(!$this->Page->IsCallback) {
 			$writer->write(TJavaScript::renderScriptBlock(
 					'var RecaptchaOptions = ' . TJavaScript::jsonEncode($this->getClientSideOptions()) . ';'
 				));
@@ -294,7 +293,7 @@ 
 	{
 		$server = $use_ssl ? self::RECAPTCHA_API_SECURE_SERVER : $server = self::RECAPTCHA_API_SERVER;
 		$errorpart = '';
-		if ($error) {
+		if($error) {
 			$errorpart = "&amp;error=" . $error;
 		}
 
@@ -314,7 +313,7 @@ 
 	private function recaptcha_qsencode($data)
 	{
 		$req = "";
-		foreach ($data as $key => $value) {
+		foreach($data as $key => $value) {
 			$req .= $key . '=' . urlencode(stripslashes($value)) . '&';
 		}
 
@@ -344,13 +343,13 @@ 
 		$http_request .= $req;
 
 		$response = '';
-		if (false == ($fs = @fsockopen($host, $port, $errno, $errstr, 10))) {
+		if(false == ($fs = @fsockopen($host, $port, $errno, $errstr, 10))) {
 			die('Could not open socket');
 		}
 
 		fwrite($fs, $http_request);
 
-		while (!feof($fs)) {
+		while(!feof($fs)) {
 			$response .= fgets($fs, 1160);
 		} // One TCP-IP packet
 		fclose($fs);
@@ -371,7 +370,7 @@ 
 	private function recaptcha_check_answer($privkey, $remoteip, $challenge, $response, $extra_params = [])
 	{
 		//discard spam submissions
-		if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) {
+		if($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) {
 			return false;
 		}
 
@@ -388,7 +387,7 @@ 
 
 		$answers = explode("\n", $response [1]);
 
-		if (trim($answers [0]) == 'true') {
+		if(trim($answers [0]) == 'true') {
 			return true;
 		} else {
 			return false;

framework/I18N/core/MessageSource_XLIFF.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -523,7 +523,7 @@
   </body>
  </file>
 </xliff>
-EOD;
+eod;
 		return $xml;
 	}
 }

Spacing +49 added lines, -49 removed lines

@@ -58,7 +58,7 @@ 
 	 */
 	public function __construct($source)
 	{
-		$this->source = (string)$source;
+		$this->source = (string) $source;
 	}
 
 	/**
@@ -69,7 +69,7 @@ 
 	protected function &loadData($filename)
 	{
 		//load it.
-		if (false === ($XML = simplexml_load_file($filename))) {
+		if(false === ($XML = simplexml_load_file($filename))) {
 			return false;
 		}
 
@@ -77,11 +77,11 @@ 
 
 		$translations = [];
 
-		foreach ($translationUnit as $unit) {
-			$source = (string)$unit->source;
-			$translations[$source][] = (string)$unit->target;
-			$translations[$source][] = (string)$unit['id'];
-			$translations[$source][] = (string)$unit->note;
+		foreach($translationUnit as $unit) {
+			$source = (string) $unit->source;
+			$translations[$source][] = (string) $unit->target;
+			$translations[$source][] = (string) $unit['id'];
+			$translations[$source][] = (string) $unit->note;
 		}
 
 		return $translations;
@@ -131,8 +131,8 @@ 
 		$catalogues = [$source];
 		$variant = null;
 
-		for ($i = 0, $k = count($variants); $i < $k; ++$i) {
-			if (isset($variants[$i]{0})) {
+		for($i = 0, $k = count($variants); $i < $k; ++$i) {
+			if(isset($variants[$i]{0})) {
 				$variant .= ($variant) ? '_' . $variants[$i] : $variants[$i];
 				$catalogues[] = $catalogue . $this->dataSeparator . $variant . $this->dataExt;
 			}
@@ -142,7 +142,7 @@ 
 		$catalogues = array_merge($byDir, array_reverse($catalogues));
 		$files = [];
 
-		foreach ($catalogues as $file) {
+		foreach($catalogues as $file) {
 			$files[] = $file;
 			$files[] = preg_replace('/\.xml$/', '.xlf', $file);
 		}
@@ -163,8 +163,8 @@ 
 		$catalogues = [];
 		$variant = null;
 
-		for ($i = 0, $k = count($variants); $i < $k; ++$i) {
-			if (isset($variants[$i]{0})) {
+		for($i = 0, $k = count($variants); $i < $k; ++$i) {
+			if(isset($variants[$i]{0})) {
 				$variant .= ($variant) ? '_' . $variants[$i] : $variants[$i];
 				$catalogues[] = $variant . '/' . $catalogue . $this->dataExt;
 			}
@@ -196,8 +196,8 @@ 
 		$files = scandir($dir);
 		$catalogue = [];
 
-		foreach ($files as $file) {
-			if (is_dir($dir . '/' . $file) && preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/', $file)) {
+		foreach($files as $file) {
+			if(is_dir($dir . '/' . $file) && preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/', $file)) {
 				$catalogue = array_merge(
 					$catalogue,
 					$this->getCatalogues($dir . '/' . $file, $file)
@@ -205,13 +205,13 @@ 
 			}
 
 			$pos = strpos($file, $this->dataExt);
-			if ($pos > 0 && substr($file, -1 * strlen($this->dataExt)) == $this->dataExt) {
+			if($pos > 0 && substr($file, -1 * strlen($this->dataExt)) == $this->dataExt) {
 				$name = substr($file, 0, $pos);
 				$dot = strrpos($name, $this->dataSeparator);
 				$culture = $variant;
 				$cat = $name;
 
-				if (is_int($dot)) {
+				if(is_int($dot)) {
 					$culture = substr($name, $dot + 1, strlen($name));
 					$cat = substr($name, 0, $dot);
 				}
@@ -235,13 +235,13 @@ 
 	 */
 	private function getVariants($catalogue = 'messages')
 	{
-		if ($catalogue === null) {
+		if($catalogue === null) {
 			$catalogue = 'messages';
 		}
 
-		foreach ($this->getCatalogueList($catalogue) as $variant) {
+		foreach($this->getCatalogueList($catalogue) as $variant) {
 			$file = $this->getSource($variant);
-			if (is_file($file)) {
+			if(is_file($file)) {
 				return [$variant, $file];
 			}
 		}
@@ -258,19 +258,19 @@ 
 	public function save($catalogue = 'messages')
 	{
 		$messages = $this->untranslated;
-		if (count($messages) <= 0) {
+		if(count($messages) <= 0) {
 			return false;
 		}
 
 		$variants = $this->getVariants($catalogue);
 
-		if ($variants) {
+		if($variants) {
 			list($variant, $filename) = $variants;
 		} else {
 			list($variant, $filename) = $this->createMessageTemplate($catalogue);
 		}
 
-		if (is_writable($filename) == false) {
+		if(is_writable($filename) == false) {
 			throw new TIOException("Unable to save to file {$filename}, file must be writable.");
 		}
 
@@ -283,14 +283,14 @@ 
 		$body = $xpath->query('//body')->item(0);
 
 		$lastNodes = $xpath->query('//trans-unit[last()]');
-		if (($last = $lastNodes->item(0)) !== null) {
-			$count = (int)$last->getAttribute('id');
+		if(($last = $lastNodes->item(0)) !== null) {
+			$count = (int) $last->getAttribute('id');
 		} else {
 			$count = 0;
 		}
 
 		//for each message add it to the XML file using DOM
-		foreach ($messages as $message) {
+		foreach($messages as $message) {
 			$unit = $dom->createElement('trans-unit');
 			$unit->setAttribute('id', ++$count);
 
@@ -317,7 +317,7 @@ 
 
 		//save it and clear the cache for this variant
 		$dom->save($filename);
-		if (!empty($this->cache)) {
+		if(!empty($this->cache)) {
 			$this->cache->clean($variant, $this->culture);
 		}
 
@@ -336,13 +336,13 @@ 
 	{
 		$variants = $this->getVariants($catalogue);
 
-		if ($variants) {
+		if($variants) {
 			list($variant, $filename) = $variants;
 		} else {
 			return false;
 		}
 
-		if (is_writable($filename) == false) {
+		if(is_writable($filename) == false) {
 			throw new TIOException("Unable to update file {$filename}, file must be writable.");
 		}
 
@@ -354,29 +354,29 @@ 
 		$units = $xpath->query('//trans-unit');
 
 		//for each of the existin units
-		foreach ($units as $unit) {
+		foreach($units as $unit) {
 			$found = false;
 			$targetted = false;
 			$commented = false;
 
 			//in each unit, need to find the source, target and comment nodes
 			//it will assume that the source is before the target.
-			foreach ($unit->childNodes as $node) {
+			foreach($unit->childNodes as $node) {
 				//source node
-				if ($node->nodeName == 'source' && $node->firstChild->wholeText == $text) {
+				if($node->nodeName == 'source' && $node->firstChild->wholeText == $text) {
 					$found = true;
 				}
 
 				//found source, get the target and notes
-				if ($found) {
+				if($found) {
 					//set the new translated string
-					if ($node->nodeName == 'target') {
+					if($node->nodeName == 'target') {
 						$node->nodeValue = $target;
 						$targetted = true;
 					}
 
 					//set the notes
-					if (!empty($comments) && $node->nodeName == 'note') {
+					if(!empty($comments) && $node->nodeName == 'note') {
 						$node->nodeValue = $comments;
 						$commented = true;
 					}
@@ -384,17 +384,17 @@ 
 			}
 
 			//append a target
-			if ($found && !$targetted) {
+			if($found && !$targetted) {
 				$unit->appendChild($dom->createElement('target', $target));
 			}
 
 			//append a note
-			if ($found && !$commented && !empty($comments)) {
+			if($found && !$commented && !empty($comments)) {
 				$unit->appendChild($dom->createElement('note', $comments));
 			}
 
 			//finished searching
-			if ($found) {
+			if($found) {
 				break;
 			}
 		}
@@ -402,8 +402,8 @@ 
 		$fileNode = $xpath->query('//file')->item(0);
 		$fileNode->setAttribute('date', @date('Y-m-d\TH:i:s\Z'));
 
-		if ($dom->save($filename) > 0) {
-			if (!empty($this->cache)) {
+		if($dom->save($filename) > 0) {
+			if(!empty($this->cache)) {
 				$this->cache->clean($variant, $this->culture);
 			}
 
@@ -422,13 +422,13 @@ 
 	public function delete($message, $catalogue = 'messages')
 	{
 		$variants = $this->getVariants($catalogue);
-		if ($variants) {
+		if($variants) {
 			list($variant, $filename) = $variants;
 		} else {
 			return false;
 		}
 
-		if (is_writable($filename) == false) {
+		if(is_writable($filename) == false) {
 			throw new TIOException("Unable to modify file {$filename}, file must be writable.");
 		}
 
@@ -440,19 +440,19 @@ 
 		$units = $xpath->query('//trans-unit');
 
 		//for each of the existin units
-		foreach ($units as $unit) {
+		foreach($units as $unit) {
 			//in each unit, need to find the source, target and comment nodes
 			//it will assume that the source is before the target.
-			foreach ($unit->childNodes as $node) {
+			foreach($unit->childNodes as $node) {
 				//source node
-				if ($node->nodeName == 'source' && $node->firstChild->wholeText == $message) {
+				if($node->nodeName == 'source' && $node->firstChild->wholeText == $message) {
 					//we found it, remove and save the xml file.
 					$unit->parentNode->removeChild($unit);
 					$fileNode = $xpath->query('//file')->item(0);
 					$fileNode->setAttribute('date', @date('Y-m-d\TH:i:s\Z'));
 
-					if (false !== $dom->save($filename)) {
-						if (!empty($this->cache)) {
+					if(false !== $dom->save($filename)) {
+						if(!empty($this->cache)) {
 							$this->cache->clean($variant, $this->culture);
 						}
 						return true;
@@ -468,7 +468,7 @@ 
 
 	protected function createMessageTemplate($catalogue)
 	{
-		if ($catalogue === null) {
+		if($catalogue === null) {
 			$catalogue = 'messages';
 		}
 
@@ -477,12 +477,12 @@ 
 		$file = $this->getSource($variant);
 		$dir = dirname($file);
 
-		if (!is_dir($dir)) {
+		if(!is_dir($dir)) {
 			@mkdir($dir);
 			@chmod($dir, PRADO_CHMOD);
 		}
 
-		if (!is_dir($dir)) {
+		if(!is_dir($dir)) {
 			throw new TException("Unable to create directory $dir");
 		}
 

framework/I18N/core/Gettext/TGettext.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -126,7 +126,7 @@
 	public static function poFile2moFile($pofile, $mofile)
 	{
 		if (!is_file($pofile)) {
-			throw new Exception("File $pofile doesn't exist.");
+			throw new Exception("file $pofile doesn't exist.");
 		}
 
 		include_once dirname(__FILE__) . '/PO.php';

Spacing +9 added lines, -9 removed lines

@@ -102,7 +102,7 @@ 
 	{
 		$format = strToUpper($format);
 		$filename = dirname(__FILE__) . '/' . $format . '.php';
-		if (is_file($filename) == false) {
+		if(is_file($filename) == false) {
 			throw new Exception("Class file $file not found");
 		}
 
@@ -126,19 +126,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';
 
 		$PO = new TGettext_PO($pofile);
-		if (true !== ($e = $PO->load())) {
+		if(true !== ($e = $PO->load())) {
 			return $e;
 		}
 
 		$MO = $PO->toMO();
-		if (true !== ($e = $MO->save($mofile))) {
+		if(true !== ($e = $MO->save($mofile))) {
 			return $e;
 		}
 		unset($PO, $MO);
@@ -157,7 +157,7 @@ 
 	 */
 	public static function prepare($string, $reverse = false)
 	{
-		if ($reverse) {
+		if($reverse) {
 			$smap = ['"', "\n", "\t", "\r"];
 			$rmap = ['\"', '\\n"' . "\n" . '"', '\\t', '\\r'];
 			return (string) str_replace($smap, $rmap, $string);
@@ -180,8 +180,8 @@ 
 	public static function meta2array($meta)
 	{
 		$array = [];
-		foreach (explode("\n", $meta) as $info) {
-			if ($info = trim($info)) {
+		foreach(explode("\n", $meta) as $info) {
+			if($info = trim($info)) {
 				list($key, $value) = explode(':', $info, 2);
 				$array[trim($key)] = trim($value);
 			}
@@ -245,8 +245,8 @@ 
 	 */
 	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;

framework/I18N/core/MessageSource_PHP.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -418,7 +418,7 @@
 	'trans-unit' => array(
 	)
 );
-EOD;
+eod;
 		return $php;
 	}
 }

Spacing +36 added lines, -36 removed lines

@@ -55,7 +55,7 @@ 
 	 */
 	public function __construct($source)
 	{
-		$this->source = (string)$source;
+		$this->source = (string) $source;
 	}
 
 	/**
@@ -66,7 +66,7 @@ 
 	protected function &loadData($filename)
 	{
 		//load it.
-		if (false === ($php = include($filename))) {
+		if(false === ($php = include($filename))) {
 			return false;
 		}
 
@@ -74,11 +74,11 @@ 
 
 		$translations = [];
 
-		foreach ($translationUnit as $k => $unit) {
-			$source = (string)$unit['source'];
-			$translations[$source][] = (string)$unit['target'];
-			$translations[$source][] = (string)$k;
-			$translations[$source][] = array_key_exists('note', $unit) ? (string)$unit['note'] : '';
+		foreach($translationUnit as $k => $unit) {
+			$source = (string) $unit['source'];
+			$translations[$source][] = (string) $unit['target'];
+			$translations[$source][] = (string) $k;
+			$translations[$source][] = array_key_exists('note', $unit) ? (string) $unit['note'] : '';
 		}
 
 		return $translations;
@@ -128,8 +128,8 @@ 
 		$catalogues = [$source];
 		$variant = null;
 
-		for ($i = 0, $k = count($variants); $i < $k; ++$i) {
-			if (isset($variants[$i]{0})) {
+		for($i = 0, $k = count($variants); $i < $k; ++$i) {
+			if(isset($variants[$i]{0})) {
 				$variant .= ($variant) ? '_' . $variants[$i] : $variants[$i];
 				$catalogues[] = $catalogue . $this->dataSeparator . $variant . $this->dataExt;
 			}
@@ -152,8 +152,8 @@ 
 		$catalogues = [];
 		$variant = null;
 
-		for ($i = 0, $k = count($variants); $i < $k; ++$i) {
-			if (isset($variants[$i]{0})) {
+		for($i = 0, $k = count($variants); $i < $k; ++$i) {
+			if(isset($variants[$i]{0})) {
 				$variant .= ($variant) ? '_' . $variants[$i] : $variants[$i];
 				$catalogues[] = $variant . '/' . $catalogue . $this->dataExt;
 			}
@@ -185,8 +185,8 @@ 
 		$files = scandir($dir);
 		$catalogue = [];
 
-		foreach ($files as $file) {
-			if (is_dir($dir . '/' . $file) && preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/', $file)) {
+		foreach($files as $file) {
+			if(is_dir($dir . '/' . $file) && preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/', $file)) {
 				$catalogue = array_merge(
 					$catalogue,
 					$this->getCatalogues($dir . '/' . $file, $file)
@@ -194,13 +194,13 @@ 
 			}
 
 			$pos = strpos($file, $this->dataExt);
-			if ($pos > 0 && substr($file, -1 * strlen($this->dataExt)) == $this->dataExt) {
+			if($pos > 0 && substr($file, -1 * strlen($this->dataExt)) == $this->dataExt) {
 				$name = substr($file, 0, $pos);
 				$dot = strrpos($name, $this->dataSeparator);
 				$culture = $variant;
 				$cat = $name;
 
-				if (is_int($dot)) {
+				if(is_int($dot)) {
 					$culture = substr($name, $dot + 1, strlen($name));
 					$cat = substr($name, 0, $dot);
 				}
@@ -224,13 +224,13 @@ 
 	 */
 	private function getVariants($catalogue = 'messages')
 	{
-		if ($catalogue === null) {
+		if($catalogue === null) {
 			$catalogue = 'messages';
 		}
 
-		foreach ($this->getCatalogueList($catalogue) as $variant) {
+		foreach($this->getCatalogueList($catalogue) as $variant) {
 			$file = $this->getSource($variant);
-			if (is_file($file)) {
+			if(is_file($file)) {
 				return [$variant, $file];
 			}
 		}
@@ -242,11 +242,11 @@ 
 		$php['info']['date'] = @date('Y-m-d\TH:i:s\Z');
 
 		//save it and clear the cache for this variant
-		if (false === file_put_contents($filename, "<?php\nreturn " . var_export($php, true) . ';')) {
+		if(false === file_put_contents($filename, "<?php\nreturn " . var_export($php, true) . ';')) {
 			return false;
 		}
 
-		if (!empty($this->cache)) {
+		if(!empty($this->cache)) {
 			$this->cache->clean($variant, $this->culture);
 		}
 
@@ -263,19 +263,19 @@ 
 	public function save($catalogue = 'messages')
 	{
 		$messages = $this->untranslated;
-		if (count($messages) <= 0) {
+		if(count($messages) <= 0) {
 			return false;
 		}
 
 		$variants = $this->getVariants($catalogue);
 
-		if ($variants) {
+		if($variants) {
 			list($variant, $filename) = $variants;
 		} else {
 			list($variant, $filename) = $this->createMessageTemplate($catalogue);
 		}
 
-		if (is_writable($filename) == false) {
+		if(is_writable($filename) == false) {
 			throw new TIOException("Unable to save to file {$filename}, file must be writable.");
 		}
 
@@ -283,7 +283,7 @@ 
 		$php = include($filename);
 
 		//for each message add it to the XML file using DOM
-		foreach ($messages as $message) {
+		foreach($messages as $message) {
 			$php['trans-unit'][] = [
 				'source' => $message,
 				'target' => '',
@@ -305,13 +305,13 @@ 
 	{
 		$variants = $this->getVariants($catalogue);
 
-		if ($variants) {
+		if($variants) {
 			list($variant, $filename) = $variants;
 		} else {
 			return false;
 		}
 
-		if (is_writable($filename) == false) {
+		if(is_writable($filename) == false) {
 			throw new TIOException("Unable to update file {$filename}, file must be writable.");
 		}
 
@@ -319,10 +319,10 @@ 
 		$php = include($filename);
 
 		//for each of the existin units
-		foreach ($php['trans-unit'] as $k => $unit) {
-			if ($unit['source'] == $text) {
+		foreach($php['trans-unit'] as $k => $unit) {
+			if($unit['source'] == $text) {
 				$php['trans-unit'][$k]['target'] = $target;
-				if (!empty($comments)) {
+				if(!empty($comments)) {
 					$php['trans-unit'][$k]['note'] = $comments;
 				}
 
@@ -342,13 +342,13 @@ 
 	public function delete($message, $catalogue = 'messages')
 	{
 		$variants = $this->getVariants($catalogue);
-		if ($variants) {
+		if($variants) {
 			list($variant, $filename) = $variants;
 		} else {
 			return false;
 		}
 
-		if (is_writable($filename) == false) {
+		if(is_writable($filename) == false) {
 			throw new TIOException("Unable to modify file {$filename}, file must be writable.");
 		}
 
@@ -356,8 +356,8 @@ 
 		$php = include($filename);
 
 		//for each of the existin units
-		foreach ($php['trans-unit'] as $k => $unit) {
-			if ($unit['source'] == $message) {
+		foreach($php['trans-unit'] as $k => $unit) {
+			if($unit['source'] == $message) {
 				unset($php['trans-unit'][$k]);
 				return $this->internalSaveFile($php, $filename, $variant);
 			}
@@ -368,7 +368,7 @@ 
 
 	protected function createMessageTemplate($catalogue)
 	{
-		if ($catalogue === null) {
+		if($catalogue === null) {
 			$catalogue = 'messages';
 		}
 
@@ -377,12 +377,12 @@ 
 		$file = $this->getSource($variant);
 		$dir = dirname($file);
 
-		if (!is_dir($dir)) {
+		if(!is_dir($dir)) {
 			@mkdir($dir);
 			@chmod($dir, PRADO_CHMOD);
 		}
 
-		if (!is_dir($dir)) {
+		if(!is_dir($dir)) {
 			throw new TException("Unable to create directory $dir");
 		}