Completed
Pull Request — 3.4 (#46)
by David
07:34 queued 01:29
created
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/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/NotFilter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@
 block discarded – undo
59 59
 	 * 
60 60
 	 * @param FilterInterface $filter
61 61
 	 */
62
-	public function __construct($filter=null) {
62
+	public function __construct($filter = null) {
63 63
 		$this->filter = $filter;
64 64
 	}
65 65
 
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/Filters/SqlStringFilter.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 	 * 
63 63
 	 * @param string $sqlString
64 64
 	 */
65
-	public function __construct($sqlString=null) {
65
+	public function __construct($sqlString = null) {
66 66
 		$this->sqlString = $sqlString;
67 67
 	}
68 68
 
@@ -95,32 +95,32 @@  discard block
 block discarded – undo
95 95
 		// First, let's remove all the stuff in quotes:
96 96
 
97 97
 		// Let's remove all the \' found
98
-		$work_str = str_replace("\\'",'',$this->sqlString);
98
+		$work_str = str_replace("\\'", '', $this->sqlString);
99 99
 		// Now, let's split the string using '
100 100
 		$work_table = explode("'", $work_str);
101 101
 
102
-		if (count($work_table)==0)
102
+		if (count($work_table) == 0)
103 103
 		return '';
104 104
 
105 105
 		// if we start with a ', let's remove the first text
106
-		if (strstr($work_str,"'")===0)
106
+		if (strstr($work_str, "'") === 0)
107 107
 		array_shift($work_table);
108 108
 			
109
-		if (count($work_table)==0)
109
+		if (count($work_table) == 0)
110 110
 		return '';
111 111
 
112 112
 		// Now, let's take only the stuff outside the quotes.
113 113
 		$work_str2 = '';
114 114
 
115
-		$i=0;
115
+		$i = 0;
116 116
 		foreach ($work_table as $str_fragment) {
117
-			if (($i % 2) == 0)
117
+			if (($i%2) == 0)
118 118
 			$work_str2 .= $str_fragment.' ';
119 119
 			$i++;
120 120
 		}
121 121
 
122 122
 		// Now, let's run a regexp to find all the strings matching the pattern xxx.yyy
123
-		preg_match_all('/([a-zA-Z_](?:[a-zA-Z0-9_]*))\.(?:[a-zA-Z_](?:[a-zA-Z0-9_]*))/', $work_str2,$capture_result);
123
+		preg_match_all('/([a-zA-Z_](?:[a-zA-Z0-9_]*))\.(?:[a-zA-Z_](?:[a-zA-Z0-9_]*))/', $work_str2, $capture_result);
124 124
 
125 125
 		$tables_used = $capture_result[1];
126 126
 		// remove doubles:
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/Filters/AndFilter.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 	 * 
50 50
 	 * @param array<FilterInterface> $filters
51 51
 	 */
52
-	public function __construct(array $filters=array()) {
52
+	public function __construct(array $filters = array()) {
53 53
 		$this->filters = $filters;
54 54
 	}
55 55
 
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 		}
92 92
 
93 93
 		if (count($filters_sql)>0) {
94
-			return '('.implode(' AND ',$filters_sql).')';
94
+			return '('.implode(' AND ', $filters_sql).')';
95 95
 		} else {
96 96
 			return '';
97 97
 		}
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 				throw new TDBMException("Error in AndFilter: One of the parameters is not a filter.");
115 115
 			}
116 116
 			
117
-			$tables = array_merge($tables,$filter->getUsedTables());
117
+			$tables = array_merge($tables, $filter->getUsedTables());
118 118
 		}
119 119
 		// Remove tables in double.
120 120
 		$tables = array_flip(array_flip($tables));
Please login to merge, or discard this patch.
src/Mouf/Database/TDBM/Filters/BetweenFilter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -101,7 +101,7 @@
 block discarded – undo
101 101
      * @param string $value1
102 102
      * @param string $value2
103 103
 	 */
104
-	public function __construct($tableName=null, $columnName=null, $value1=null, $value2=null) {
104
+	public function __construct($tableName = null, $columnName = null, $value1 = null, $value2 = null) {
105 105
 		$this->tableName = $tableName;
106 106
 		$this->columnName = $columnName;
107 107
 		$this->value1 = $value1;
Please login to merge, or discard this patch.