@@ -52,7 +52,7 @@ |
||
52 | 52 | |
53 | 53 | public function filePath($cacheId) |
54 | 54 | { |
55 | - return $this->cachePath().$cacheId.'.php'; |
|
55 | + return $this->cachePath() . $cacheId . '.php'; |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | public function cachePath() |
@@ -62,8 +62,7 @@ |
||
62 | 62 | // This is why we use urldecode and then normalize to |
63 | 63 | // RFC 3986 with rawurlencode. |
64 | 64 | $parts[] = isset($keyValuePair[1]) ? |
65 | - rawurlencode(urldecode($keyValuePair[0])) . '=' . rawurlencode(urldecode($keyValuePair[1])) : |
|
66 | - rawurlencode(urldecode($keyValuePair[0])); |
|
65 | + rawurlencode(urldecode($keyValuePair[0])) . '=' . rawurlencode(urldecode($keyValuePair[1])) : rawurlencode(urldecode($keyValuePair[0])); |
|
67 | 66 | $order[] = urldecode($keyValuePair[0]); |
68 | 67 | } |
69 | 68 | array_multisort($order, SORT_ASC, $parts); |
@@ -14,7 +14,7 @@ |
||
14 | 14 | */ |
15 | 15 | public function assemble() |
16 | 16 | { |
17 | - $query = "UPDATE ".$this->protect($this->getTable())." SET ".$this->parseUpdate(); |
|
17 | + $query = "UPDATE " . $this->protect($this->getTable()) . " SET " . $this->parseUpdate(); |
|
18 | 18 | |
19 | 19 | $query .= $this->assembleWhere(); |
20 | 20 | $query .= $this->assembleLimit(); |
@@ -5,18 +5,18 @@ |
||
5 | 5 | class AndCondition extends Condition |
6 | 6 | { |
7 | 7 | |
8 | - protected $_condition; |
|
9 | - protected $_andCondition; |
|
8 | + protected $_condition; |
|
9 | + protected $_andCondition; |
|
10 | 10 | |
11 | - public function __construct($condition, $andCondition) |
|
12 | - { |
|
13 | - $this->_condition = $condition; |
|
14 | - $this->_andCondition = $andCondition; |
|
15 | - } |
|
11 | + public function __construct($condition, $andCondition) |
|
12 | + { |
|
13 | + $this->_condition = $condition; |
|
14 | + $this->_andCondition = $andCondition; |
|
15 | + } |
|
16 | 16 | |
17 | - public function getString() |
|
18 | - { |
|
19 | - return $this->protectCondition($this->_condition->getString()) . " AND " . $this->protectCondition($this->_andCondition->getString()) . ""; |
|
20 | - } |
|
17 | + public function getString() |
|
18 | + { |
|
19 | + return $this->protectCondition($this->_condition->getString()) . " AND " . $this->protectCondition($this->_andCondition->getString()) . ""; |
|
20 | + } |
|
21 | 21 | |
22 | 22 | } |
23 | 23 | \ No newline at end of file |
@@ -10,6 +10,6 @@ |
||
10 | 10 | } |
11 | 11 | |
12 | 12 | public function getString() { |
13 | - return $this->protectCondition($this->_condition->getString()) ." OR ". $this->protectCondition($this->_orCondition->getString()) .""; |
|
13 | + return $this->protectCondition($this->_condition->getString()) . " OR " . $this->protectCondition($this->_orCondition->getString()) . ""; |
|
14 | 14 | } |
15 | 15 | } |
16 | 16 | \ No newline at end of file |
@@ -14,6 +14,6 @@ |
||
14 | 14 | */ |
15 | 15 | public function assemble() |
16 | 16 | { |
17 | - return 'TRUNCATE TABLE '.$this->getTable(); |
|
17 | + return 'TRUNCATE TABLE ' . $this->getTable(); |
|
18 | 18 | } |
19 | 19 | } |
@@ -17,12 +17,12 @@ |
||
17 | 17 | { |
18 | 18 | $order = $this->parseOrder(); |
19 | 19 | |
20 | - $query = 'DELETE FROM '.$this->getManager()->protect($this->getTable()); |
|
20 | + $query = 'DELETE FROM ' . $this->getManager()->protect($this->getTable()); |
|
21 | 21 | |
22 | 22 | $query .= $this->assembleWhere(); |
23 | 23 | |
24 | 24 | if (!empty($order)) { |
25 | - $query .= ' ORDER BY '.$order; |
|
25 | + $query .= ' ORDER BY ' . $order; |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | $query .= $this->assembleLimit(); |
@@ -14,7 +14,7 @@ |
||
14 | 14 | */ |
15 | 15 | public function assemble() |
16 | 16 | { |
17 | - $query = "REPLACE INTO ".$this->protect($this->getTable()).$this->parseCols().$this->parseValues(); |
|
17 | + $query = "REPLACE INTO " . $this->protect($this->getTable()) . $this->parseCols() . $this->parseValues(); |
|
18 | 18 | |
19 | 19 | return $query; |
20 | 20 | } |
@@ -103,7 +103,7 @@ |
||
103 | 103 | public function checkValid() |
104 | 104 | { |
105 | 105 | if (!$this->isValid()) { |
106 | - trigger_error("Invalid result for query [".$this->getQuery()->getString()."]", E_USER_WARNING); |
|
106 | + trigger_error("Invalid result for query [" . $this->getQuery()->getString() . "]", E_USER_WARNING); |
|
107 | 107 | |
108 | 108 | return false; |
109 | 109 | } |