Completed
Pull Request — 3.4 (#46)
by David
13:58
created
src/views/tdbmGenerate.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
 <div class="control-group">
46 46
 	<label class="control-label">Store dates / timestamps in UTC:</label>
47 47
 	<div class="controls">
48
-		<input type="checkbox" name="storeInUtc" value="1" <?php echo $this->storeInUtc?'checked="checked"':"" ?>></input>
48
+		<input type="checkbox" name="storeInUtc" value="1" <?php echo $this->storeInUtc ? 'checked="checked"' : "" ?>></input>
49 49
 		<span class="help-block">Select this option if you want timestamps to be stored in UTC.
50 50
 		If your application supports several time zones, you should select this option to store all dates in
51 51
 		the same time zone.</span>
Please login to merge, or discard this patch.
src/views/installStep2.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
 <div class="control-group">
30 30
 	<label class="control-label">Store dates / timestamps in UTC:</label>
31 31
 	<div class="controls">
32
-		<input type="checkbox" name="storeInUtc" value="1" <?php echo $this->storeInUtc?'checked="checked"':"" ?>></input>
32
+		<input type="checkbox" name="storeInUtc" value="1" <?php echo $this->storeInUtc ? 'checked="checked"' : "" ?>></input>
33 33
 		<span class="help-block">Select this option if you want timestamps to be stored in UTC.
34 34
 		If your application supports several time zones, you should select this option to store all dates in
35 35
 		the same time zone.</span>
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/PageIterator.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -112,7 +112,7 @@
 block discarded – undo
112 112
 	 */
113 113
 	public function getCurrentPage()
114 114
 	{
115
-		return floor($this->offset / $this->limit) + 1;
115
+		return floor($this->offset/$this->limit)+1;
116 116
 	}
117 117
 
118 118
 	/**
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/Filters/GreaterOrEqualFilter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@
 block discarded – undo
85 85
 	 * @param string $columnName
86 86
 	 * @param string $value
87 87
 	 */
88
-	public function __construct($tableName=null, $columnName=null, $value=null) {
88
+	public function __construct($tableName = null, $columnName = null, $value = null) {
89 89
 		$this->tableName = $tableName;
90 90
 		$this->columnName = $columnName;
91 91
 		$this->value = $value;
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/Filters/GreaterFilter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@
 block discarded – undo
84 84
 	 * @param string $columnName
85 85
 	 * @param string $value
86 86
 	 */
87
-	public function __construct($tableName=null, $columnName=null, $value=null) {
87
+	public function __construct($tableName = null, $columnName = null, $value = null) {
88 88
 		$this->tableName = $tableName;
89 89
 		$this->columnName = $columnName;
90 90
 		$this->value = $value;
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/Filters/InFilter.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 	 * @param string $columnName
86 86
 	 * @param array<string> $values
87 87
 	 */
88
-	public function __construct($tableName=null, $columnName=null, $values=array()) {
88
+	public function __construct($tableName = null, $columnName = null, $values = array()) {
89 89
 		$this->tableName = $tableName;
90 90
 		$this->columnName = $columnName;
91 91
 		$this->values = $values;
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
 			}
118 118
 		}
119 119
 
120
-		return $this->tableName.'.'.$this->columnName.' IN ('.implode(',',$values_sql).")";
120
+		return $this->tableName.'.'.$this->columnName.' IN ('.implode(',', $values_sql).")";
121 121
 	}
122 122
 
123 123
 	/**
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/Filters/OrderBySQLString.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 	 * 
61 61
 	 * @param string $sqlString
62 62
 	 */
63
-	public function __construct($sqlString=null) {
63
+	public function __construct($sqlString = null) {
64 64
 		$this->sqlString = $sqlString;
65 65
 	}
66 66
 	
@@ -86,8 +86,8 @@  discard block
 block discarded – undo
86 86
 			$result = -1;
87 87
 			while (true) {
88 88
 				$result = strrpos($phrase, "'", $result+1);
89
-				if ($result===false) {
90
-					if ($sentence!='')
89
+				if ($result === false) {
90
+					if ($sentence != '')
91 91
 					$sentence .= ',';
92 92
 					$sentence .= $phrase;
93 93
 
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 				else
103 103
 				{
104 104
 					$valid_result = true;
105
-					if ($result>0 && $phrase{$result-1}=='\\') {
105
+					if ($result>0 && $phrase{$result-1} == '\\') {
106 106
 						$valid_result = false;
107 107
 					}
108 108
 					if ($valid_result)
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 		// First, let's remove all the stuff in quotes:
129 129
 
130 130
 		// Let's remove all the \' found
131
-		$work_str = str_replace("\\'",'',$this->sqlString);
131
+		$work_str = str_replace("\\'", '', $this->sqlString);
132 132
 		// Now, let's split the string using '
133 133
 		$work_table = explode("'", $work_str);
134 134
 
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 		    return '';
137 137
 
138 138
 		// if we start with a ', let's remove the first text
139
-		if (strstr($work_str,"'") === 0)
139
+		if (strstr($work_str, "'") === 0)
140 140
 		    array_shift($work_table);
141 141
 			
142 142
 		if (count($work_table) == 0)
@@ -147,13 +147,13 @@  discard block
 block discarded – undo
147 147
 
148 148
 		$i = 0;
149 149
 		foreach ($work_table as $str_fragment) {
150
-			if (($i % 2) == 0)
150
+			if (($i%2) == 0)
151 151
 			$work_str2 .= $str_fragment.' ';
152 152
 			$i++;
153 153
 		}
154 154
 
155 155
 		// Now, let's run a regexp to find all the strings matching the pattern xxx.yyy
156
-		preg_match_all('/([a-zA-Z_](?:[a-zA-Z0-9_]*))\.(?:[a-zA-Z_](?:[a-zA-Z0-9_]*))/', $work_str2,$capture_result);
156
+		preg_match_all('/([a-zA-Z_](?:[a-zA-Z0-9_]*))\.(?:[a-zA-Z_](?:[a-zA-Z0-9_]*))/', $work_str2, $capture_result);
157 157
 
158 158
 		$tables_used = $capture_result[1];
159 159
 		// remove doubles:
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/Filters/OrderByColumn.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@
 block discarded – undo
86 86
 	 * @param string $columnName
87 87
 	 * @param string $order
88 88
 	 */
89
-	public function __construct($tableName=null, $columnName=null, $order=null) {
89
+	public function __construct($tableName = null, $columnName = null, $order = null) {
90 90
 		$this->tableName = $tableName;
91 91
 		$this->columnName = $columnName;
92 92
 		$this->order = $order;
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/Filters/EqualFilter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@
 block discarded – undo
84 84
 	 * @param string $columnName
85 85
 	 * @param string $value
86 86
 	 */
87
-	public function __construct($tableName=null, $columnName=null, $value=null) {
87
+	public function __construct($tableName = null, $columnName = null, $value = null) {
88 88
 		$this->tableName = $tableName;
89 89
 		$this->columnName = $columnName;
90 90
 		$this->value = $value;
Please login to merge, or discard this patch.