thecodingmachine / database.tdbm

src/Mouf/Database/TDBM/Controllers/TdbmInstallController.php

Unused Use Statements -4 removed lines

@@ -2,12 +2,8 @@
 namespace Mouf\Database\TDBM\Controllers;
 
 use Mouf\Composer\ClassNameMapper;
-use Mouf\MoufUtils;
-
 use Mouf\Actions\InstallUtils;
-
 use Mouf\MoufManager;
-
 use Mouf\Html\HtmlElement\HtmlBlock;
 use Mouf\Mvc\Splash\Controllers\Controller;
 

Doc Comments +3 added lines

@@ -170,6 +170,9 @@
 	
 	protected $errorMsg;
 	
+	/**
+	 * @param string $msg
+	 */
 	private function displayErrorMsg($msg) {
 		$this->errorMsg = $msg;
 		$this->content->addFile(dirname(__FILE__)."/../../../../views/installError.php", $this);

Indentation +4 added lines, -4 removed lines

@@ -111,12 +111,12 @@ 
 		$this->beanNamespace = $this->moufManager->getVariable("tdbmDefaultBeanNamespace_tdbmService");
 		
 		if ($this->daoNamespace == null && $this->beanNamespace == null) {
-            $classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
+			$classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
 
-            $autoloadNamespaces = $classNameMapper->getManagedNamespaces();
+			$autoloadNamespaces = $classNameMapper->getManagedNamespaces();
 			if ($autoloadNamespaces) {
 				$this->autoloadDetected = true;
-                $rootNamespace = $autoloadNamespaces[0];
+				$rootNamespace = $autoloadNamespaces[0];
 				$this->daoNamespace = $rootNamespace."Dao";
 				$this->beanNamespace = $rootNamespace."Dao\\Bean";
 			} else {
@@ -146,7 +146,7 @@ 
 	 * @param string $selfedit
 	 * @throws \Mouf\MoufException
 	 */
-    public function generate($daonamespace, $beannamespace, $keepSupport = 0, $storeInUtc = 0, $castDatesToDateTime = 1, $selfedit="false") {
+	public function generate($daonamespace, $beannamespace, $keepSupport = 0, $storeInUtc = 0, $castDatesToDateTime = 1, $selfedit="false") {
 		$this->selfedit = $selfedit;
 		
 		if ($selfedit == "true") {

Spacing +1 added lines, -1 removed lines

@@ -146,7 +146,7 @@
 	 * @param string $selfedit
 	 * @throws \Mouf\MoufException
 	 */
-    public function generate($daonamespace, $beannamespace, $keepSupport = 0, $storeInUtc = 0, $castDatesToDateTime = 1, $selfedit="false") {
+    public function generate($daonamespace, $beannamespace, $keepSupport = 0, $storeInUtc = 0, $castDatesToDateTime = 1, $selfedit = "false") {
 		$this->selfedit = $selfedit;
 		
 		if ($selfedit == "true") {

src/Mouf/Database/TDBM/Filters/InFilter.php

Spacing +2 added lines, -2 removed lines

@@ -85,7 +85,7 @@ 
 	 * @param string $columnName
 	 * @param array<string> $values
 	 */
-	public function __construct($tableName=null, $columnName=null, $values=array()) {
+	public function __construct($tableName = null, $columnName = null, $values = array()) {
 		$this->tableName = $tableName;
 		$this->columnName = $columnName;
 		$this->values = $values;
@@ -117,7 +117,7 @@ 
 			}
 		}
 
-		return $this->tableName.'.'.$this->columnName.' IN ('.implode(',',$values_sql).")";
+		return $this->tableName.'.'.$this->columnName.' IN ('.implode(',', $values_sql).")";
 	}
 
 	/**

src/Mouf/Database/TDBM/Filters/OrderBySQLString.php

Indentation +3 added lines, -3 removed lines

@@ -133,14 +133,14 @@
 		$work_table = explode("'", $work_str);
 
 		if (count($work_table) == 0)
-		    return '';
+			return '';
 
 		// if we start with a ', let's remove the first text
 		if (strstr($work_str,"'") === 0)
-		    array_shift($work_table);
+			array_shift($work_table);
 			
 		if (count($work_table) == 0)
-		    return '';
+			return '';
 
 		// Now, let's take only the stuff outside the quotes.
 		$work_str2 = '';

Spacing +8 added lines, -8 removed lines

@@ -60,7 +60,7 @@ 
 	 * 
 	 * @param string $sqlString
 	 */
-	public function __construct($sqlString=null) {
+	public function __construct($sqlString = null) {
 		$this->sqlString = $sqlString;
 	}
 	
@@ -86,8 +86,8 @@ 
 			$result = -1;
 			while (true) {
 				$result = strrpos($phrase, "'", $result+1);
-				if ($result===false) {
-					if ($sentence!='')
+				if ($result === false) {
+					if ($sentence != '')
 					$sentence .= ',';
 					$sentence .= $phrase;
 
@@ -102,7 +102,7 @@ 
 				else
 				{
 					$valid_result = true;
-					if ($result>0 && $phrase{$result-1}=='\\') {
+					if ($result>0 && $phrase{$result-1} == '\\') {
 						$valid_result = false;
 					}
 					if ($valid_result)
@@ -128,7 +128,7 @@ 
 		// First, let's remove all the stuff in quotes:
 
 		// Let's remove all the \' found
-		$work_str = str_replace("\\'",'',$this->sqlString);
+		$work_str = str_replace("\\'", '', $this->sqlString);
 		// Now, let's split the string using '
 		$work_table = explode("'", $work_str);
 
@@ -136,7 +136,7 @@ 
 		    return '';
 
 		// if we start with a ', let's remove the first text
-		if (strstr($work_str,"'") === 0)
+		if (strstr($work_str, "'") === 0)
 		    array_shift($work_table);
 			
 		if (count($work_table) == 0)
@@ -147,13 +147,13 @@ 
 
 		$i = 0;
 		foreach ($work_table as $str_fragment) {
-			if (($i % 2) == 0)
+			if (($i%2) == 0)
 			$work_str2 .= $str_fragment.' ';
 			$i++;
 		}
 
 		// Now, let's run a regexp to find all the strings matching the pattern xxx.yyy
-		preg_match_all('/([a-zA-Z_](?:[a-zA-Z0-9_]*))\.(?:[a-zA-Z_](?:[a-zA-Z0-9_]*))/', $work_str2,$capture_result);
+		preg_match_all('/([a-zA-Z_](?:[a-zA-Z0-9_]*))\.(?:[a-zA-Z_](?:[a-zA-Z0-9_]*))/', $work_str2, $capture_result);
 
 		$tables_used = $capture_result[1];
 		// remove doubles:

Braces +19 added lines, -14 removed lines

@@ -87,8 +87,9 @@ 
 			while (true) {
 				$result = strrpos($phrase, "'", $result+1);
 				if ($result===false) {
-					if ($sentence!='')
-					$sentence .= ',';
+					if ($sentence!='') {
+										$sentence .= ',';
+					}
 					$sentence .= $phrase;
 
 					if ($is_inside_quotes) {
@@ -98,15 +99,15 @@ 
 						$sentence = '';
 						break;
 					}
-				}
-				else
+				} else
 				{
 					$valid_result = true;
 					if ($result>0 && $phrase{$result-1}=='\\') {
 						$valid_result = false;
 					}
-					if ($valid_result)
-					$is_inside_quotes = !$is_inside_quotes;
+					if ($valid_result) {
+										$is_inside_quotes = !$is_inside_quotes;
+					}
 				}
 			}
 
@@ -132,23 +133,27 @@ 
 		// Now, let's split the string using '
 		$work_table = explode("'", $work_str);
 
-		if (count($work_table) == 0)
-		    return '';
+		if (count($work_table) == 0) {
+				    return '';
+		}
 
 		// if we start with a ', let's remove the first text
-		if (strstr($work_str,"'") === 0)
-		    array_shift($work_table);
+		if (strstr($work_str,"'") === 0) {
+				    array_shift($work_table);
+		}
 			
-		if (count($work_table) == 0)
-		    return '';
+		if (count($work_table) == 0) {
+				    return '';
+		}
 
 		// Now, let's take only the stuff outside the quotes.
 		$work_str2 = '';
 
 		$i = 0;
 		foreach ($work_table as $str_fragment) {
-			if (($i % 2) == 0)
-			$work_str2 .= $str_fragment.' ';
+			if (($i % 2) == 0) {
+						$work_str2 .= $str_fragment.' ';
+			}
 			$i++;
 		}
 

Unused Use Statements -2 removed lines

@@ -1,8 +1,6 @@
 <?php
 namespace Mouf\Database\TDBM\Filters;
 
-use Mouf\Database\DBConnection\ConnectionInterface;
-
 /*
  Copyright (C) 2006-2011 David Négrier - THE CODING MACHINE
 

src/Mouf/Database/TDBM/Filters/OrderByColumn.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 	 * @param string $columnName
 	 * @param string $order
 	 */
-	public function __construct($tableName=null, $columnName=null, $order=null) {
+	public function __construct($tableName = null, $columnName = null, $order = null) {
 		$this->tableName = $tableName;
 		$this->columnName = $columnName;
 		$this->order = $order;

src/Mouf/Database/TDBM/Filters/NotFilter.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 	 * 
 	 * @param FilterInterface $filter
 	 */
-	public function __construct($filter=null) {
+	public function __construct($filter = null) {
 		$this->filter = $filter;
 	}
 

src/Mouf/Database/TDBM/Filters/SqlStringFilter.php

Spacing +8 added lines, -8 removed lines

@@ -62,7 +62,7 @@ 
 	 * 
 	 * @param string $sqlString
 	 */
-	public function __construct($sqlString=null) {
+	public function __construct($sqlString = null) {
 		$this->sqlString = $sqlString;
 	}
 
@@ -95,32 +95,32 @@ 
 		// First, let's remove all the stuff in quotes:
 
 		// Let's remove all the \' found
-		$work_str = str_replace("\\'",'',$this->sqlString);
+		$work_str = str_replace("\\'", '', $this->sqlString);
 		// Now, let's split the string using '
 		$work_table = explode("'", $work_str);
 
-		if (count($work_table)==0)
+		if (count($work_table) == 0)
 		return '';
 
 		// if we start with a ', let's remove the first text
-		if (strstr($work_str,"'")===0)
+		if (strstr($work_str, "'") === 0)
 		array_shift($work_table);
 			
-		if (count($work_table)==0)
+		if (count($work_table) == 0)
 		return '';
 
 		// Now, let's take only the stuff outside the quotes.
 		$work_str2 = '';
 
-		$i=0;
+		$i = 0;
 		foreach ($work_table as $str_fragment) {
-			if (($i % 2) == 0)
+			if (($i%2) == 0)
 			$work_str2 .= $str_fragment.' ';
 			$i++;
 		}
 
 		// Now, let's run a regexp to find all the strings matching the pattern xxx.yyy
-		preg_match_all('/([a-zA-Z_](?:[a-zA-Z0-9_]*))\.(?:[a-zA-Z_](?:[a-zA-Z0-9_]*))/', $work_str2,$capture_result);
+		preg_match_all('/([a-zA-Z_](?:[a-zA-Z0-9_]*))\.(?:[a-zA-Z_](?:[a-zA-Z0-9_]*))/', $work_str2, $capture_result);
 
 		$tables_used = $capture_result[1];
 		// remove doubles:

Braces +12 added lines, -8 removed lines

@@ -99,23 +99,27 @@
 		// Now, let's split the string using '
 		$work_table = explode("'", $work_str);
 
-		if (count($work_table)==0)
-		return '';
+		if (count($work_table)==0) {
+				return '';
+		}
 
 		// if we start with a ', let's remove the first text
-		if (strstr($work_str,"'")===0)
-		array_shift($work_table);
+		if (strstr($work_str,"'")===0) {
+				array_shift($work_table);
+		}
 			
-		if (count($work_table)==0)
-		return '';
+		if (count($work_table)==0) {
+				return '';
+		}
 
 		// Now, let's take only the stuff outside the quotes.
 		$work_str2 = '';
 
 		$i=0;
 		foreach ($work_table as $str_fragment) {
-			if (($i % 2) == 0)
-			$work_str2 .= $str_fragment.' ';
+			if (($i % 2) == 0) {
+						$work_str2 .= $str_fragment.' ';
+			}
 			$i++;
 		}
 

src/Mouf/Database/TDBM/Filters/AndFilter.php

Spacing +3 added lines, -3 removed lines

@@ -49,7 +49,7 @@ 
 	 * 
 	 * @param array<FilterInterface> $filters
 	 */
-	public function __construct(array $filters=array()) {
+	public function __construct(array $filters = array()) {
 		$this->filters = $filters;
 	}
 
@@ -91,7 +91,7 @@ 
 		}
 
 		if (count($filters_sql)>0) {
-			return '('.implode(' AND ',$filters_sql).')';
+			return '('.implode(' AND ', $filters_sql).')';
 		} else {
 			return '';
 		}
@@ -114,7 +114,7 @@ 
 				throw new TDBMException("Error in AndFilter: One of the parameters is not a filter.");
 			}
 			
-			$tables = array_merge($tables,$filter->getUsedTables());
+			$tables = array_merge($tables, $filter->getUsedTables());
 		}
 		// Remove tables in double.
 		$tables = array_flip(array_flip($tables));

src/Mouf/Database/TDBM/Filters/BetweenFilter.php

Spacing +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
      * @param string $value1
      * @param string $value2
 	 */
-	public function __construct($tableName=null, $columnName=null, $value1=null, $value2=null) {
+	public function __construct($tableName = null, $columnName = null, $value1 = null, $value2 = null) {
 		$this->tableName = $tableName;
 		$this->columnName = $columnName;
 		$this->value1 = $value1;

Indentation +4 added lines, -4 removed lines

@@ -98,8 +98,8 @@ 
 	 * 
 	 * @param string $tableName
 	 * @param string $columnName
-     * @param string $value1
-     * @param string $value2
+	 * @param string $value1
+	 * @param string $value2
 	 */
 	public function __construct($tableName=null, $columnName=null, $value1=null, $value2=null) {
 		$this->tableName = $tableName;
@@ -113,9 +113,9 @@ 
 	 *
 	 * @param ConnectionInterface $dbConnection
 	 * @return string
-     * @throws \Mouf\Database\TDBM\TDBMException
+	 * @throws \Mouf\Database\TDBM\TDBMException
 	 */
-    public function toSql(ConnectionInterface $dbConnection) {
+	public function toSql(ConnectionInterface $dbConnection) {
 		if ($this->enableCondition != null && !$this->enableCondition->isOk()) {
 			return "";
 		}

src/Mouf/Database/TDBM/Filters/OrFilter.php

Spacing +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
 	 * 
 	 * @param array<FilterInterface> $filters
 	 */
-	public function __construct(array $filters=array()) {
+	public function __construct(array $filters = array()) {
 		$this->filters = $filters;
 	}
 
@@ -91,7 +91,7 @@ 
 		}
 
 		if (count($filters_sql)>0) {
-			return '('.implode(' OR ',$filters_sql).')';
+			return '('.implode(' OR ', $filters_sql).')';
 		} else {
 			return '';
 		}
@@ -114,7 +114,7 @@ 
                 throw new TDBMException("Error in OrFilter: One of the parameters is not a filter.");
             }
 
-            $tables = array_merge($tables,$filter->getUsedTables());
+            $tables = array_merge($tables, $filter->getUsedTables());
         }
         // Remove tables in double.
         $tables = array_flip(array_flip($tables));

Indentation +20 added lines, -20 removed lines

@@ -68,9 +68,9 @@ 
 	 *
 	 * @param ConnectionInterface $dbConnection
 	 * @return string
-     * @throws TDBMException
+	 * @throws TDBMException
 	 */
-    public function toSql(ConnectionInterface $dbConnection) {
+	public function toSql(ConnectionInterface $dbConnection) {
 		if ($this->enableCondition != null && !$this->enableCondition->isOk()) {
 			return "";
 		}
@@ -102,22 +102,22 @@ 
 	 *
 	 * @return array<string>
 	 */
-    public function getUsedTables() {
-        if ($this->enableCondition != null && !$this->enableCondition->isOk()) {
-            return array();
-        }
-
-        $tables = array();
-        foreach ($this->filters as $filter) {
-
-            if (!$filter instanceof FilterInterface) {
-                throw new TDBMException("Error in OrFilter: One of the parameters is not a filter.");
-            }
-
-            $tables = array_merge($tables,$filter->getUsedTables());
-        }
-        // Remove tables in double.
-        $tables = array_flip(array_flip($tables));
-        return $tables;
-    }
+	public function getUsedTables() {
+		if ($this->enableCondition != null && !$this->enableCondition->isOk()) {
+			return array();
+		}
+
+		$tables = array();
+		foreach ($this->filters as $filter) {
+
+			if (!$filter instanceof FilterInterface) {
+				throw new TDBMException("Error in OrFilter: One of the parameters is not a filter.");
+			}
+
+			$tables = array_merge($tables,$filter->getUsedTables());
+		}
+		// Remove tables in double.
+		$tables = array_flip(array_flip($tables));
+		return $tables;
+	}
 }