Completed
Push — prado4-sauce ( 31ba42...77d75b )
by Fabio
16:20 queued 08:27
created
framework/Data/SqlMap/TSqlMapGateway.php 2 patches
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 	 */
68 68
 	public function queryForObject($statementName, $parameter=null, $result=null)
69 69
 	{
70
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
70
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
71 71
 		return $statement->executeQueryForObject($this->getDbConnection(), $parameter, $result);
72 72
 	}
73 73
 
@@ -88,8 +88,8 @@  discard block
 block discarded – undo
88 88
 	 */
89 89
 	public function queryForList($statementName, $parameter=null, $result=null, $skip=-1, $max=-1)
90 90
 	{
91
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
92
-		return $statement->executeQueryForList($this->getDbConnection(),$parameter, $result, $skip, $max);
91
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
92
+		return $statement->executeQueryForList($this->getDbConnection(), $parameter, $result, $skip, $max);
93 93
 	}
94 94
 
95 95
 	/**
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 	 */
110 110
 	public function queryWithRowDelegate($statementName, $delegate, $parameter=null, $result=null, $skip=-1, $max=-1)
111 111
 	{
112
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
112
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
113 113
 		return $statement->executeQueryForList($this->getDbConnection(), $parameter, $result, $skip, $max, $delegate);
114 114
 	}
115 115
 
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 	 */
126 126
 	public function queryForPagedList($statementName, $parameter=null, $pageSize=10, $page=0)
127 127
 	{
128
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
128
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
129 129
 		return new TSqlMapPagedList($statement, $parameter, $pageSize, null, $page);
130 130
 	}
131 131
 
@@ -144,10 +144,10 @@  discard block
 block discarded – undo
144 144
 	 * @param integer The number of the page to initially load into the list.
145 145
 	 * @return TPagedList A PaginatedList of beans containing the rows.
146 146
 	 */
147
-	public function queryForPagedListWithRowDelegate($statementName,$delegate, $parameter=null, $pageSize=10, $page=0)
147
+	public function queryForPagedListWithRowDelegate($statementName, $delegate, $parameter=null, $pageSize=10, $page=0)
148 148
 	{
149
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
150
-		return new TSqlMapPagedList($statement, $parameter, $pageSize, $delegate,$page);
149
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
150
+		return new TSqlMapPagedList($statement, $parameter, $pageSize, $delegate, $page);
151 151
 	}
152 152
 
153 153
 
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 	 */
166 166
 	public function queryForMap($statementName, $parameter=null, $keyProperty=null, $valueProperty=null, $skip=-1, $max=-1)
167 167
 	{
168
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
168
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
169 169
 		return $statement->executeQueryForMap($this->getDbConnection(), $parameter, $keyProperty, $valueProperty, $skip, $max);
170 170
 	}
171 171
 
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 	 */
185 185
 	public function queryForMapWithRowDelegate($statementName, $delegate, $parameter=null, $keyProperty=null, $valueProperty=null, $skip=-1, $max=-1)
186 186
 	{
187
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
187
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
188 188
 		return $statement->executeQueryForMap($this->getDbConnection(), $parameter, $keyProperty, $valueProperty, $skip, $max, $delegate);
189 189
 	}
190 190
 
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
 	 */
207 207
 	public function insert($statementName, $parameter=null)
208 208
 	{
209
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
209
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
210 210
 		return $statement->executeInsert($this->getDbConnection(), $parameter);
211 211
 	}
212 212
 
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
 	 */
226 226
 	public function update($statementName, $parameter=null)
227 227
 	{
228
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
228
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
229 229
 		return $statement->executeUpdate($this->getDbConnection(), $parameter);
230 230
 	}
231 231
 
Please login to merge, or discard this patch.
Doc Comments   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -36,6 +36,9 @@  discard block
 block discarded – undo
36 36
 	 */
37 37
 	private $_manager;
38 38
 
39
+	/**
40
+	 * @param TSqlMapManager $manager
41
+	 */
39 42
 	public function __construct($manager)
40 43
 	{
41 44
 		$this->_manager=$manager;
@@ -125,7 +128,7 @@  discard block
 block discarded – undo
125 128
 	 * @param mixed The object used to set the parameters in the SQL.
126 129
 	 * @param integer The maximum number of objects to store in each page.
127 130
 	 * @param integer The number of the page to initially load into the list.
128
-	 * @return TPagedList A PaginatedList of beans containing the rows.
131
+	 * @return TSqlMapPagedList A PaginatedList of beans containing the rows.
129 132
 	 */
130 133
 	public function queryForPagedList($statementName, $parameter=null, $pageSize=10, $page=0)
131 134
 	{
@@ -146,7 +149,7 @@  discard block
 block discarded – undo
146 149
 	 * @param mixed The object used to set the parameters in the SQL.
147 150
 	 * @param integer The maximum number of objects to store in each page.
148 151
 	 * @param integer The number of the page to initially load into the list.
149
-	 * @return TPagedList A PaginatedList of beans containing the rows.
152
+	 * @return TSqlMapPagedList A PaginatedList of beans containing the rows.
150 153
 	 */
151 154
 	public function queryForPagedListWithRowDelegate($statementName,$delegate, $parameter=null, $pageSize=10, $page=0)
152 155
 	{
Please login to merge, or discard this patch.
framework/Data/SqlMap/Statements/IMappedStatement.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -75,6 +75,6 @@
 block discarded – undo
75 75
 	 * @param object The result object.
76 76
 	 * @return object result.
77 77
 	 */
78
-	public function executeQueryForObject($connection,$parameter, $result=null);
78
+	public function executeQueryForObject($connection, $parameter, $result=null);
79 79
 }
80 80
 
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
 	public function getID();
24 24
 
25 25
 	/**
26
-	 * @return TSqlMapStatement The SQL statment used by this TMappedStatement.
26
+	 * @return \Prado\Data\SqlMap\Configuration\TSqlMapStatement The SQL statment used by this TMappedStatement.
27 27
 	 */
28 28
 	public function getStatement();
29 29
 
Please login to merge, or discard this patch.
framework/Data/SqlMap/Statements/TSimpleDynamicSql.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -22,15 +22,15 @@
 block discarded – undo
22 22
 
23 23
 	public function __construct($mappings)
24 24
 	{
25
-		$this->_mappings = $mappings;
25
+		$this->_mappings=$mappings;
26 26
 	}
27 27
 
28 28
 	public function replaceDynamicParameter($sql, $parameter)
29 29
 	{
30 30
 		foreach($this->_mappings as $property)
31 31
 		{
32
-			$value = TPropertyAccess::get($parameter, $property);
33
-			$sql = preg_replace('/'.TSimpleDynamicParser::DYNAMIC_TOKEN.'/', str_replace('$', '\$', $value), $sql, 1);
32
+			$value=TPropertyAccess::get($parameter, $property);
33
+			$sql=preg_replace('/'.TSimpleDynamicParser::DYNAMIC_TOKEN.'/', str_replace('$', '\$', $value), $sql, 1);
34 34
 		}
35 35
 		return $sql;
36 36
 	}
Please login to merge, or discard this patch.
framework/Data/SqlMap/Statements/TPreparedStatementFactory.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -20,18 +20,18 @@
 block discarded – undo
20 20
 {
21 21
 	private $_statement;
22 22
 	private $_preparedStatement;
23
-	private $_parameterPrefix = 'param';
23
+	private $_parameterPrefix='param';
24 24
 	private $_commandText;
25 25
 
26 26
 	public function __construct($statement, $sqlString)
27 27
 	{
28
-		$this->_statement = $statement;
29
-		$this->_commandText = $sqlString;
28
+		$this->_statement=$statement;
29
+		$this->_commandText=$sqlString;
30 30
 	}
31 31
 
32 32
 	public function prepare()
33 33
 	{
34
-		$this->_preparedStatement = new TPreparedStatement();
34
+		$this->_preparedStatement=new TPreparedStatement();
35 35
 		$this->_preparedStatement->setPreparedSql($this->_commandText);
36 36
 		if($this->_statement->parameterMap()!==null)
37 37
 			$this->createParametersForTextCommand();
Please login to merge, or discard this patch.
framework/Data/SqlMap/Statements/TPreparedStatement.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -22,33 +22,33 @@
 block discarded – undo
22 22
 	private $_parameterNames;
23 23
 	private $_parameterValues;
24 24
 
25
-	public function getPreparedSql(){ return $this->_sqlString; }
26
-	public function setPreparedSql($value){ $this->_sqlString = $value; }
25
+	public function getPreparedSql() { return $this->_sqlString; }
26
+	public function setPreparedSql($value) { $this->_sqlString=$value; }
27 27
 
28
-	public function getParameterNames($needed = true)
28
+	public function getParameterNames($needed=true)
29 29
 	{
30
-		if (!$this->_parameterNames and $needed)
31
-			$this->_parameterNames = new TList;
30
+		if(!$this->_parameterNames and $needed)
31
+			$this->_parameterNames=new TList;
32 32
 		return $this->_parameterNames;
33 33
 	}
34 34
 
35
-	public function setParameterNames($value){ $this->_parameterNames = $value; }
35
+	public function setParameterNames($value) { $this->_parameterNames=$value; }
36 36
 
37
-	public function getParameterValues($needed = true)
37
+	public function getParameterValues($needed=true)
38 38
 	{
39
-		if (!$this->_parameterValues and $needed)
39
+		if(!$this->_parameterValues and $needed)
40 40
 			$this->_parameterValues=new TMap;
41 41
 		return $this->_parameterValues;
42 42
 	}
43 43
 
44
-	public function setParameterValues($value){ $this->_parameterValues = $value; }
44
+	public function setParameterValues($value) { $this->_parameterValues=$value; }
45 45
 
46 46
 	public function __sleep()
47 47
 	{
48
-		$exprops = array(); $cn = __CLASS__;
49
-		if (!$this->_parameterNames or !$this->_parameterNames->getCount()) $exprops[] = "\0$cn\0_parameterNames";
50
-		if (!$this->_parameterValues or !$this->_parameterValues->getCount()) $exprops[] = "\0$cn\0_parameterValues";
51
-		return array_diff(parent::__sleep(),$exprops);
48
+		$exprops=array(); $cn=__CLASS__;
49
+		if(!$this->_parameterNames or !$this->_parameterNames->getCount()) $exprops[]="\0$cn\0_parameterNames";
50
+		if(!$this->_parameterValues or !$this->_parameterValues->getCount()) $exprops[]="\0$cn\0_parameterValues";
51
+		return array_diff(parent::__sleep(), $exprops);
52 52
 	}
53 53
 }
54 54
 
Please login to merge, or discard this patch.
framework/Data/SqlMap/Statements/TPreparedCommand.php 2 patches
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -21,45 +21,45 @@
 block discarded – undo
21 21
  */
22 22
 class TPreparedCommand
23 23
 {
24
-	public function create(TSqlMapManager $manager, $connection, $statement, $parameterObject,$skip=null,$max=null)
24
+	public function create(TSqlMapManager $manager, $connection, $statement, $parameterObject, $skip=null, $max=null)
25 25
 	{
26
-		$sqlText = $statement->getSQLText();
26
+		$sqlText=$statement->getSQLText();
27 27
 
28
-		$prepared = $sqlText->getPreparedStatement($parameterObject);
28
+		$prepared=$sqlText->getPreparedStatement($parameterObject);
29 29
 		$connection->setActive(true);
30
-		$sql = $prepared->getPreparedSql();
30
+		$sql=$prepared->getPreparedSql();
31 31
 
32 32
 		if($sqlText instanceof TSimpleDynamicSql)
33
-			$sql = $sqlText->replaceDynamicParameter($sql, $parameterObject);
33
+			$sql=$sqlText->replaceDynamicParameter($sql, $parameterObject);
34 34
 
35 35
 		if($max!==null || $skip!==null)
36 36
 		{
37
-			$builder = TDbMetaData::getInstance($connection)->createCommandBuilder();
38
-			$sql = $builder->applyLimitOffset($sql,$max,$skip);
37
+			$builder=TDbMetaData::getInstance($connection)->createCommandBuilder();
38
+			$sql=$builder->applyLimitOffset($sql, $max, $skip);
39 39
 		}
40
-		$command = $connection->createCommand($sql);
40
+		$command=$connection->createCommand($sql);
41 41
 		$this->applyParameterMap($manager, $command, $prepared, $statement, $parameterObject);
42 42
 
43 43
 		return $command;
44 44
 	}
45 45
 
46
-	protected function applyParameterMap($manager,$command,$prepared, $statement, $parameterObject)
46
+	protected function applyParameterMap($manager, $command, $prepared, $statement, $parameterObject)
47 47
 	{
48
-		$properties = $prepared->getParameterNames(false);
48
+		$properties=$prepared->getParameterNames(false);
49 49
 		//$parameters = $prepared->getParameterValues();
50 50
 		$registry=$manager->getTypeHandlers();
51
-		if ($properties)
52
-		for($i = 0, $k=$properties->getCount(); $i<$k; $i++)
51
+		if($properties)
52
+		for($i=0, $k=$properties->getCount(); $i < $k; $i++)
53 53
 		{
54
-			$property = $statement->parameterMap()->getProperty($i);
55
-			$value = $statement->parameterMap()->getPropertyValue($registry,$property, $parameterObject);
56
-			$dbType = $property->getDbType();
54
+			$property=$statement->parameterMap()->getProperty($i);
55
+			$value=$statement->parameterMap()->getPropertyValue($registry, $property, $parameterObject);
56
+			$dbType=$property->getDbType();
57 57
 			if($dbType=='') //relies on PHP lax comparison
58
-				$command->bindValue($i+1,$value, TDbCommandBuilder::getPdoType($value));
58
+				$command->bindValue($i + 1, $value, TDbCommandBuilder::getPdoType($value));
59 59
 			else if(strpos($dbType, 'PDO::')===0)
60
-				$command->bindValue($i+1,$value, constant($property->getDbType())); //assumes PDO types, e.g. PDO::PARAM_INT
60
+				$command->bindValue($i + 1, $value, constant($property->getDbType())); //assumes PDO types, e.g. PDO::PARAM_INT
61 61
 			else
62
-				$command->bindValue($i+1,$value);
62
+				$command->bindValue($i + 1, $value);
63 63
 		}
64 64
 	}
65 65
 }
Please login to merge, or discard this patch.
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -26,6 +26,9 @@  discard block
 block discarded – undo
26 26
  */
27 27
 class TPreparedCommand
28 28
 {
29
+	/**
30
+	 * @param \Prado\Data\SqlMap\Configuration\TSqlMapStatement $statement
31
+	 */
29 32
 	public function create(TSqlMapManager $manager, $connection, $statement, $parameterObject,$skip=null,$max=null)
30 33
 	{
31 34
 		$sqlText = $statement->getSQLText();
@@ -48,6 +51,9 @@  discard block
 block discarded – undo
48 51
 		return $command;
49 52
 	}
50 53
 
54
+	/**
55
+	 * @param TSqlMapManager $manager
56
+	 */
51 57
 	protected function applyParameterMap($manager,$command,$prepared, $statement, $parameterObject)
52 58
 	{
53 59
 		$properties = $prepared->getParameterNames(false);
Please login to merge, or discard this patch.
framework/Data/SqlMap/Statements/TStaticSql.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,8 +22,8 @@
 block discarded – undo
22 22
 
23 23
 	public function buildPreparedStatement($statement, $sqlString)
24 24
 	{
25
-		$factory = new TPreparedStatementFactory($statement, $sqlString);
26
-		$this->_preparedStatement = $factory->prepare();
25
+		$factory=new TPreparedStatementFactory($statement, $sqlString);
26
+		$this->_preparedStatement=$factory->prepare();
27 27
 	}
28 28
 
29 29
 	public function getPreparedStatement($parameter=null)
Please login to merge, or discard this patch.
framework/Data/SqlMap/DataMapper/TSqlMapTypeHandlerRegistry.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 	 */
48 48
 	public function registerTypeHandler(TSqlMapTypeHandler $handler)
49 49
 	{
50
-		$this->_typeHandlers[$handler->getType()] = $handler;
50
+		$this->_typeHandlers[$handler->getType()]=$handler;
51 51
 	}
52 52
 
53 53
 	/**
@@ -90,13 +90,13 @@  discard block
 block discarded – undo
90 90
 		switch(strtolower($type))
91 91
 		{
92 92
 			case 'integer': case 'int':
93
-				$type = 'integer'; break;
93
+				$type='integer'; break;
94 94
 			case 'float': case 'double': case 'decimal':
95
-				$type = 'float'; break;
95
+				$type='float'; break;
96 96
 			case 'boolean': case 'bool':
97
-				$type = 'boolean'; break;
97
+				$type='boolean'; break;
98 98
 			case 'string' :
99
-				$type = 'string'; break;
99
+				$type='string'; break;
100 100
 			default:
101 101
 				return $value;
102 102
 		}
Please login to merge, or discard this patch.
framework/Data/SqlMap/DataMapper/TSqlMapException.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -22,14 +22,14 @@  discard block
 block discarded – undo
22 22
 		array_shift($args);
23 23
 		$n=count($args);
24 24
 		$tokens=array();
25
-		for($i=0;$i<$n;++$i)
25
+		for($i=0; $i < $n; ++$i)
26 26
 		{
27 27
 			if($args[$i] instanceof SimpleXmlElement)
28 28
 				$tokens['{'.$i.'}']=$this->implodeNode($args[$i]);
29 29
 			else
30 30
 				$tokens['{'.$i.'}']=TPropertyValue::ensureString($args[$i]);
31 31
 		}
32
-		parent::__construct(strtr($errorMessage,$tokens));
32
+		parent::__construct(strtr($errorMessage, $tokens));
33 33
 	}
34 34
 
35 35
 	/**
@@ -40,8 +40,8 @@  discard block
 block discarded – undo
40 40
 	{
41 41
 		$attributes=array();
42 42
 		foreach($node->attributes() as $k=>$v)
43
-			$attributes[]=$k.'="'.(string)$v.'"';
44
-		return '<'.$node->getName().' '.implode(' ',$attributes).'>';
43
+			$attributes[]=$k.'="'.(string) $v.'"';
44
+		return '<'.$node->getName().' '.implode(' ', $attributes).'>';
45 45
 	}
46 46
 
47 47
 	/**
Please login to merge, or discard this patch.