@@ -133,14 +133,14 @@ |
||
133 | 133 | $work_table = explode("'", $work_str); |
134 | 134 | |
135 | 135 | if (count($work_table) == 0) |
136 | - return ''; |
|
136 | + return ''; |
|
137 | 137 | |
138 | 138 | // if we start with a ', let's remove the first text |
139 | 139 | if (strstr($work_str,"'") === 0) |
140 | - array_shift($work_table); |
|
140 | + array_shift($work_table); |
|
141 | 141 | |
142 | 142 | if (count($work_table) == 0) |
143 | - return ''; |
|
143 | + return ''; |
|
144 | 144 | |
145 | 145 | // Now, let's take only the stuff outside the quotes. |
146 | 146 | $work_str2 = ''; |
@@ -9,14 +9,14 @@ |
||
9 | 9 | */ |
10 | 10 | class FilterUtils |
11 | 11 | { |
12 | - /** |
|
13 | - * @param string|null|DateTimeInterface $value |
|
14 | - */ |
|
15 | - public static function valueToSql($value, Connection $dbConnection) { |
|
16 | - if ($value instanceof DateTimeInterface) { |
|
17 | - return "'".$value->format('Y-m-d H:i:s')."'"; |
|
18 | - } else { |
|
19 | - return $dbConnection->quote($value); |
|
20 | - } |
|
21 | - } |
|
12 | + /** |
|
13 | + * @param string|null|DateTimeInterface $value |
|
14 | + */ |
|
15 | + public static function valueToSql($value, Connection $dbConnection) { |
|
16 | + if ($value instanceof DateTimeInterface) { |
|
17 | + return "'".$value->format('Y-m-d H:i:s')."'"; |
|
18 | + } else { |
|
19 | + return $dbConnection->quote($value); |
|
20 | + } |
|
21 | + } |
|
22 | 22 | } |
@@ -98,8 +98,8 @@ discard block |
||
98 | 98 | * |
99 | 99 | * @param string $tableName |
100 | 100 | * @param string $columnName |
101 | - * @param string $value1 |
|
102 | - * @param string $value2 |
|
101 | + * @param string $value1 |
|
102 | + * @param string $value2 |
|
103 | 103 | */ |
104 | 104 | public function __construct($tableName=null, $columnName=null, $value1=null, $value2=null) { |
105 | 105 | $this->tableName = $tableName; |
@@ -113,9 +113,9 @@ discard block |
||
113 | 113 | * |
114 | 114 | * @param Connection $dbConnection |
115 | 115 | * @return string |
116 | - * @throws \Mouf\Database\TDBM\TDBMException |
|
116 | + * @throws \Mouf\Database\TDBM\TDBMException |
|
117 | 117 | */ |
118 | - public function toSql(Connection $dbConnection) { |
|
118 | + public function toSql(Connection $dbConnection) { |
|
119 | 119 | if ($this->enableCondition != null && !$this->enableCondition->isOk()) { |
120 | 120 | return ""; |
121 | 121 | } |
@@ -68,9 +68,9 @@ discard block |
||
68 | 68 | * |
69 | 69 | * @param Connection $dbConnection |
70 | 70 | * @return string |
71 | - * @throws TDBMException |
|
71 | + * @throws TDBMException |
|
72 | 72 | */ |
73 | - public function toSql(Connection $dbConnection) { |
|
73 | + public function toSql(Connection $dbConnection) { |
|
74 | 74 | if ($this->enableCondition != null && !$this->enableCondition->isOk()) { |
75 | 75 | return ""; |
76 | 76 | } |
@@ -102,22 +102,22 @@ discard block |
||
102 | 102 | * |
103 | 103 | * @return array<string> |
104 | 104 | */ |
105 | - public function getUsedTables() { |
|
106 | - if ($this->enableCondition != null && !$this->enableCondition->isOk()) { |
|
107 | - return array(); |
|
108 | - } |
|
109 | - |
|
110 | - $tables = array(); |
|
111 | - foreach ($this->filters as $filter) { |
|
112 | - |
|
113 | - if (!$filter instanceof FilterInterface) { |
|
114 | - throw new TDBMException("Error in OrFilter: One of the parameters is not a filter."); |
|
115 | - } |
|
116 | - |
|
117 | - $tables = array_merge($tables,$filter->getUsedTables()); |
|
118 | - } |
|
119 | - // Remove tables in double. |
|
120 | - $tables = array_flip(array_flip($tables)); |
|
121 | - return $tables; |
|
122 | - } |
|
105 | + public function getUsedTables() { |
|
106 | + if ($this->enableCondition != null && !$this->enableCondition->isOk()) { |
|
107 | + return array(); |
|
108 | + } |
|
109 | + |
|
110 | + $tables = array(); |
|
111 | + foreach ($this->filters as $filter) { |
|
112 | + |
|
113 | + if (!$filter instanceof FilterInterface) { |
|
114 | + throw new TDBMException("Error in OrFilter: One of the parameters is not a filter."); |
|
115 | + } |
|
116 | + |
|
117 | + $tables = array_merge($tables,$filter->getUsedTables()); |
|
118 | + } |
|
119 | + // Remove tables in double. |
|
120 | + $tables = array_flip(array_flip($tables)); |
|
121 | + return $tables; |
|
122 | + } |
|
123 | 123 | } |
@@ -35,117 +35,117 @@ |
||
35 | 35 | class TDBMObject extends AbstractTDBMObject implements \ArrayAccess, \Iterator |
36 | 36 | { |
37 | 37 | |
38 | - public function __get($var) |
|
39 | - { |
|
40 | - return $this->get($var); |
|
41 | - } |
|
42 | - |
|
43 | - /** |
|
44 | - * Returns true if a column is set, false otherwise. |
|
45 | - * |
|
46 | - * @param string $var |
|
47 | - * @return boolean |
|
48 | - */ |
|
49 | - public function __isset($var) |
|
50 | - { |
|
51 | - return $this->has($var); |
|
52 | - } |
|
53 | - |
|
54 | - public function __set($var, $value) |
|
55 | - { |
|
56 | - $this->set($var, $value); |
|
57 | - } |
|
58 | - |
|
59 | - /** |
|
60 | - * Implements array behaviour for our object. |
|
61 | - * |
|
62 | - * @param string $offset |
|
63 | - * @param string $value |
|
64 | - */ |
|
65 | - public function offsetSet($offset, $value) |
|
66 | - { |
|
67 | - $this->__set($offset, $value); |
|
68 | - } |
|
69 | - |
|
70 | - /** |
|
71 | - * Implements array behaviour for our object. |
|
72 | - * |
|
73 | - * @param string $offset |
|
74 | - * @return bool |
|
75 | - */ |
|
76 | - public function offsetExists($offset) |
|
77 | - { |
|
78 | - $this->_dbLoadIfNotLoaded(); |
|
79 | - return isset($this->dbRow[$offset]); |
|
80 | - } |
|
81 | - |
|
82 | - /** |
|
83 | - * Implements array behaviour for our object. |
|
84 | - * |
|
85 | - * @param string $offset |
|
86 | - */ |
|
87 | - public function offsetUnset($offset) |
|
88 | - { |
|
89 | - $this->__set($offset, null); |
|
90 | - } |
|
91 | - |
|
92 | - /** |
|
93 | - * Implements array behaviour for our object. |
|
94 | - * |
|
95 | - * @param string $offset |
|
96 | - * @return mixed|null |
|
97 | - */ |
|
98 | - public function offsetGet($offset) |
|
99 | - { |
|
100 | - return $this->__get($offset); |
|
101 | - } |
|
102 | - |
|
103 | - private $_validIterator = false; |
|
104 | - |
|
105 | - /** |
|
106 | - * Implements iterator behaviour for our object (so we can each column). |
|
107 | - */ |
|
108 | - public function rewind() |
|
109 | - { |
|
110 | - $this->_dbLoadIfNotLoaded(); |
|
111 | - if (count($this->dbRow) > 0) { |
|
112 | - $this->_validIterator = true; |
|
113 | - } else { |
|
114 | - $this->_validIterator = false; |
|
115 | - } |
|
116 | - reset($this->dbRow); |
|
117 | - } |
|
118 | - |
|
119 | - /** |
|
120 | - * Implements iterator behaviour for our object (so we can each column). |
|
121 | - */ |
|
122 | - public function next() |
|
123 | - { |
|
124 | - $val = next($this->dbRow); |
|
125 | - $this->_validIterator = !($val === false); |
|
126 | - } |
|
127 | - |
|
128 | - /** |
|
129 | - * Implements iterator behaviour for our object (so we can each column). |
|
130 | - */ |
|
131 | - public function key() |
|
132 | - { |
|
133 | - return key($this->dbRow); |
|
134 | - } |
|
135 | - |
|
136 | - /** |
|
137 | - * Implements iterator behaviour for our object (so we can each column). |
|
138 | - */ |
|
139 | - public function current() |
|
140 | - { |
|
141 | - return current($this->dbRow); |
|
142 | - } |
|
143 | - |
|
144 | - /** |
|
145 | - * Implements iterator behaviour for our object (so we can each column). |
|
146 | - */ |
|
147 | - public function valid() |
|
148 | - { |
|
149 | - return $this->_validIterator; |
|
150 | - } |
|
38 | + public function __get($var) |
|
39 | + { |
|
40 | + return $this->get($var); |
|
41 | + } |
|
42 | + |
|
43 | + /** |
|
44 | + * Returns true if a column is set, false otherwise. |
|
45 | + * |
|
46 | + * @param string $var |
|
47 | + * @return boolean |
|
48 | + */ |
|
49 | + public function __isset($var) |
|
50 | + { |
|
51 | + return $this->has($var); |
|
52 | + } |
|
53 | + |
|
54 | + public function __set($var, $value) |
|
55 | + { |
|
56 | + $this->set($var, $value); |
|
57 | + } |
|
58 | + |
|
59 | + /** |
|
60 | + * Implements array behaviour for our object. |
|
61 | + * |
|
62 | + * @param string $offset |
|
63 | + * @param string $value |
|
64 | + */ |
|
65 | + public function offsetSet($offset, $value) |
|
66 | + { |
|
67 | + $this->__set($offset, $value); |
|
68 | + } |
|
69 | + |
|
70 | + /** |
|
71 | + * Implements array behaviour for our object. |
|
72 | + * |
|
73 | + * @param string $offset |
|
74 | + * @return bool |
|
75 | + */ |
|
76 | + public function offsetExists($offset) |
|
77 | + { |
|
78 | + $this->_dbLoadIfNotLoaded(); |
|
79 | + return isset($this->dbRow[$offset]); |
|
80 | + } |
|
81 | + |
|
82 | + /** |
|
83 | + * Implements array behaviour for our object. |
|
84 | + * |
|
85 | + * @param string $offset |
|
86 | + */ |
|
87 | + public function offsetUnset($offset) |
|
88 | + { |
|
89 | + $this->__set($offset, null); |
|
90 | + } |
|
91 | + |
|
92 | + /** |
|
93 | + * Implements array behaviour for our object. |
|
94 | + * |
|
95 | + * @param string $offset |
|
96 | + * @return mixed|null |
|
97 | + */ |
|
98 | + public function offsetGet($offset) |
|
99 | + { |
|
100 | + return $this->__get($offset); |
|
101 | + } |
|
102 | + |
|
103 | + private $_validIterator = false; |
|
104 | + |
|
105 | + /** |
|
106 | + * Implements iterator behaviour for our object (so we can each column). |
|
107 | + */ |
|
108 | + public function rewind() |
|
109 | + { |
|
110 | + $this->_dbLoadIfNotLoaded(); |
|
111 | + if (count($this->dbRow) > 0) { |
|
112 | + $this->_validIterator = true; |
|
113 | + } else { |
|
114 | + $this->_validIterator = false; |
|
115 | + } |
|
116 | + reset($this->dbRow); |
|
117 | + } |
|
118 | + |
|
119 | + /** |
|
120 | + * Implements iterator behaviour for our object (so we can each column). |
|
121 | + */ |
|
122 | + public function next() |
|
123 | + { |
|
124 | + $val = next($this->dbRow); |
|
125 | + $this->_validIterator = !($val === false); |
|
126 | + } |
|
127 | + |
|
128 | + /** |
|
129 | + * Implements iterator behaviour for our object (so we can each column). |
|
130 | + */ |
|
131 | + public function key() |
|
132 | + { |
|
133 | + return key($this->dbRow); |
|
134 | + } |
|
135 | + |
|
136 | + /** |
|
137 | + * Implements iterator behaviour for our object (so we can each column). |
|
138 | + */ |
|
139 | + public function current() |
|
140 | + { |
|
141 | + return current($this->dbRow); |
|
142 | + } |
|
143 | + |
|
144 | + /** |
|
145 | + * Implements iterator behaviour for our object (so we can each column). |
|
146 | + */ |
|
147 | + public function valid() |
|
148 | + { |
|
149 | + return $this->_validIterator; |
|
150 | + } |
|
151 | 151 | } |
152 | 152 | \ No newline at end of file |
@@ -59,10 +59,10 @@ discard block |
||
59 | 59 | } |
60 | 60 | |
61 | 61 | if ($this->daoNamespace == null && $this->beanNamespace == null) { |
62 | - $classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json'); |
|
62 | + $classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json'); |
|
63 | 63 | |
64 | 64 | $autoloadNamespaces = $classNameMapper->getManagedNamespaces(); |
65 | - if ($autoloadNamespaces) { |
|
65 | + if ($autoloadNamespaces) { |
|
66 | 66 | $this->autoloadDetected = true; |
67 | 67 | $rootNamespace = $autoloadNamespaces[0]; |
68 | 68 | $this->daoNamespace = $rootNamespace."Dao"; |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | |
139 | 139 | $tdbmService = new InstanceProxy($name); |
140 | 140 | /* @var $tdbmService TDBMService */ |
141 | - $tables = $tdbmService->generateAllDaosAndBeans($daofactoryclassname, $daonamespace, $beannamespace, $storeInUtc); |
|
141 | + $tables = $tdbmService->generateAllDaosAndBeans($daofactoryclassname, $daonamespace, $beannamespace, $storeInUtc); |
|
142 | 142 | |
143 | 143 | |
144 | 144 | $moufManager->declareComponent($daofactoryinstancename, $daonamespace."\\".$daofactoryclassname, false, MoufManager::DECLARE_ON_EXIST_KEEP_INCOMING_LINKS); |
@@ -109,12 +109,12 @@ discard block |
||
109 | 109 | $this->beanNamespace = $this->moufManager->getVariable("tdbmDefaultBeanNamespace_tdbmService"); |
110 | 110 | |
111 | 111 | if ($this->daoNamespace == null && $this->beanNamespace == null) { |
112 | - $classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json'); |
|
112 | + $classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json'); |
|
113 | 113 | |
114 | - $autoloadNamespaces = $classNameMapper->getManagedNamespaces(); |
|
114 | + $autoloadNamespaces = $classNameMapper->getManagedNamespaces(); |
|
115 | 115 | if ($autoloadNamespaces) { |
116 | 116 | $this->autoloadDetected = true; |
117 | - $rootNamespace = $autoloadNamespaces[0]; |
|
117 | + $rootNamespace = $autoloadNamespaces[0]; |
|
118 | 118 | $this->daoNamespace = $rootNamespace."Dao"; |
119 | 119 | $this->beanNamespace = $rootNamespace."Dao\\Bean"; |
120 | 120 | } else { |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | * @param string $selfedit |
145 | 145 | * @throws \Mouf\MoufException |
146 | 146 | */ |
147 | - public function generate($daonamespace, $beannamespace, $storeInUtc = 0, $selfedit="false") { |
|
147 | + public function generate($daonamespace, $beannamespace, $storeInUtc = 0, $selfedit="false") { |
|
148 | 148 | $this->selfedit = $selfedit; |
149 | 149 | |
150 | 150 | if ($selfedit == "true") { |
@@ -45,7 +45,7 @@ |
||
45 | 45 | } |
46 | 46 | |
47 | 47 | private function getAllPossiblePaths() { |
48 | - return AmbiguityException::getAllPossiblePathsRec($this->paths); |
|
48 | + return AmbiguityException::getAllPossiblePathsRec($this->paths); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | private static function getAllPossiblePathsRec($sub_table_paths) |
@@ -25,10 +25,10 @@ |
||
25 | 25 | * @author David Negrier |
26 | 26 | */ |
27 | 27 | final class TDBMObjectStateEnum extends AbstractTDBMObject { |
28 | - const STATE_DETACHED = "detached"; |
|
29 | - const STATE_NEW = "new"; |
|
30 | - const STATE_NOT_LOADED = "not loaded"; |
|
31 | - const STATE_LOADED = "loaded"; |
|
32 | - const STATE_DIRTY = "dirty"; |
|
33 | - const STATE_DELETED = "deleted"; |
|
28 | + const STATE_DETACHED = "detached"; |
|
29 | + const STATE_NEW = "new"; |
|
30 | + const STATE_NOT_LOADED = "not loaded"; |
|
31 | + const STATE_LOADED = "loaded"; |
|
32 | + const STATE_DIRTY = "dirty"; |
|
33 | + const STATE_DELETED = "deleted"; |
|
34 | 34 | } |