@@ -117,12 +117,12 @@ discard block |
||
117 | 117 | * first dimension keys are the type constants |
118 | 118 | * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' |
119 | 119 | */ |
120 | - protected static $fieldNames = array ( |
|
121 | - self::TYPE_PHPNAME => array('Uuid', 'InstanceName', 'Started', 'Input', 'Network', 'Mux', 'Weight', ), |
|
122 | - self::TYPE_CAMELNAME => array('uuid', 'instanceName', 'started', 'input', 'network', 'mux', 'weight', ), |
|
123 | - self::TYPE_COLNAME => array(InputTableMap::COL_UUID, InputTableMap::COL_INSTANCE_NAME, InputTableMap::COL_STARTED, InputTableMap::COL_INPUT, InputTableMap::COL_NETWORK, InputTableMap::COL_MUX, InputTableMap::COL_WEIGHT, ), |
|
124 | - self::TYPE_FIELDNAME => array('uuid', 'instance_name', 'started', 'input', 'network', 'mux', 'weight', ), |
|
125 | - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, ) |
|
120 | + protected static $fieldNames = array( |
|
121 | + self::TYPE_PHPNAME => array('Uuid', 'InstanceName', 'Started', 'Input', 'Network', 'Mux', 'Weight',), |
|
122 | + self::TYPE_CAMELNAME => array('uuid', 'instanceName', 'started', 'input', 'network', 'mux', 'weight',), |
|
123 | + self::TYPE_COLNAME => array(InputTableMap::COL_UUID, InputTableMap::COL_INSTANCE_NAME, InputTableMap::COL_STARTED, InputTableMap::COL_INPUT, InputTableMap::COL_NETWORK, InputTableMap::COL_MUX, InputTableMap::COL_WEIGHT,), |
|
124 | + self::TYPE_FIELDNAME => array('uuid', 'instance_name', 'started', 'input', 'network', 'mux', 'weight',), |
|
125 | + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6,) |
|
126 | 126 | ); |
127 | 127 | |
128 | 128 | /** |
@@ -131,12 +131,12 @@ discard block |
||
131 | 131 | * first dimension keys are the type constants |
132 | 132 | * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0 |
133 | 133 | */ |
134 | - protected static $fieldKeys = array ( |
|
135 | - self::TYPE_PHPNAME => array('Uuid' => 0, 'InstanceName' => 1, 'Started' => 2, 'Input' => 3, 'Network' => 4, 'Mux' => 5, 'Weight' => 6, ), |
|
136 | - self::TYPE_CAMELNAME => array('uuid' => 0, 'instanceName' => 1, 'started' => 2, 'input' => 3, 'network' => 4, 'mux' => 5, 'weight' => 6, ), |
|
137 | - self::TYPE_COLNAME => array(InputTableMap::COL_UUID => 0, InputTableMap::COL_INSTANCE_NAME => 1, InputTableMap::COL_STARTED => 2, InputTableMap::COL_INPUT => 3, InputTableMap::COL_NETWORK => 4, InputTableMap::COL_MUX => 5, InputTableMap::COL_WEIGHT => 6, ), |
|
138 | - self::TYPE_FIELDNAME => array('uuid' => 0, 'instance_name' => 1, 'started' => 2, 'input' => 3, 'network' => 4, 'mux' => 5, 'weight' => 6, ), |
|
139 | - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, ) |
|
134 | + protected static $fieldKeys = array( |
|
135 | + self::TYPE_PHPNAME => array('Uuid' => 0, 'InstanceName' => 1, 'Started' => 2, 'Input' => 3, 'Network' => 4, 'Mux' => 5, 'Weight' => 6,), |
|
136 | + self::TYPE_CAMELNAME => array('uuid' => 0, 'instanceName' => 1, 'started' => 2, 'input' => 3, 'network' => 4, 'mux' => 5, 'weight' => 6,), |
|
137 | + self::TYPE_COLNAME => array(InputTableMap::COL_UUID => 0, InputTableMap::COL_INSTANCE_NAME => 1, InputTableMap::COL_STARTED => 2, InputTableMap::COL_INPUT => 3, InputTableMap::COL_NETWORK => 4, InputTableMap::COL_MUX => 5, InputTableMap::COL_WEIGHT => 6,), |
|
138 | + self::TYPE_FIELDNAME => array('uuid' => 0, 'instance_name' => 1, 'started' => 2, 'input' => 3, 'network' => 4, 'mux' => 5, 'weight' => 6,), |
|
139 | + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6,) |
|
140 | 140 | ); |
141 | 141 | |
142 | 142 | /** |
@@ -170,16 +170,16 @@ discard block |
||
170 | 170 | */ |
171 | 171 | public function buildRelations() |
172 | 172 | { |
173 | - $this->addRelation('Instance', '\\Jalle19\\StatusManager\\Database\\Instance', RelationMap::MANY_TO_ONE, array ( |
|
173 | + $this->addRelation('Instance', '\\Jalle19\\StatusManager\\Database\\Instance', RelationMap::MANY_TO_ONE, array( |
|
174 | 174 | 0 => |
175 | - array ( |
|
175 | + array( |
|
176 | 176 | 0 => ':instance_name', |
177 | 177 | 1 => ':name', |
178 | 178 | ), |
179 | 179 | ), null, null, null, false); |
180 | - $this->addRelation('Subscription', '\\Jalle19\\StatusManager\\Database\\Subscription', RelationMap::ONE_TO_MANY, array ( |
|
180 | + $this->addRelation('Subscription', '\\Jalle19\\StatusManager\\Database\\Subscription', RelationMap::ONE_TO_MANY, array( |
|
181 | 181 | 0 => |
182 | - array ( |
|
182 | + array( |
|
183 | 183 | 0 => ':input_uuid', |
184 | 184 | 1 => ':uuid', |
185 | 185 | ), |
@@ -447,7 +447,7 @@ discard block |
||
447 | 447 | |
448 | 448 | // use transaction because $criteria could contain info |
449 | 449 | // for more than one table (I guess, conceivably) |
450 | - return $con->transaction(function () use ($con, $query) { |
|
450 | + return $con->transaction(function() use ($con, $query) { |
|
451 | 451 | return $query->doInsert($con); |
452 | 452 | }); |
453 | 453 | } |
@@ -87,12 +87,12 @@ discard block |
||
87 | 87 | * first dimension keys are the type constants |
88 | 88 | * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' |
89 | 89 | */ |
90 | - protected static $fieldNames = array ( |
|
91 | - self::TYPE_PHPNAME => array('Name', ), |
|
92 | - self::TYPE_CAMELNAME => array('name', ), |
|
93 | - self::TYPE_COLNAME => array(InstanceTableMap::COL_NAME, ), |
|
94 | - self::TYPE_FIELDNAME => array('name', ), |
|
95 | - self::TYPE_NUM => array(0, ) |
|
90 | + protected static $fieldNames = array( |
|
91 | + self::TYPE_PHPNAME => array('Name',), |
|
92 | + self::TYPE_CAMELNAME => array('name',), |
|
93 | + self::TYPE_COLNAME => array(InstanceTableMap::COL_NAME,), |
|
94 | + self::TYPE_FIELDNAME => array('name',), |
|
95 | + self::TYPE_NUM => array(0,) |
|
96 | 96 | ); |
97 | 97 | |
98 | 98 | /** |
@@ -101,12 +101,12 @@ discard block |
||
101 | 101 | * first dimension keys are the type constants |
102 | 102 | * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0 |
103 | 103 | */ |
104 | - protected static $fieldKeys = array ( |
|
105 | - self::TYPE_PHPNAME => array('Name' => 0, ), |
|
106 | - self::TYPE_CAMELNAME => array('name' => 0, ), |
|
107 | - self::TYPE_COLNAME => array(InstanceTableMap::COL_NAME => 0, ), |
|
108 | - self::TYPE_FIELDNAME => array('name' => 0, ), |
|
109 | - self::TYPE_NUM => array(0, ) |
|
104 | + protected static $fieldKeys = array( |
|
105 | + self::TYPE_PHPNAME => array('Name' => 0,), |
|
106 | + self::TYPE_CAMELNAME => array('name' => 0,), |
|
107 | + self::TYPE_COLNAME => array(InstanceTableMap::COL_NAME => 0,), |
|
108 | + self::TYPE_FIELDNAME => array('name' => 0,), |
|
109 | + self::TYPE_NUM => array(0,) |
|
110 | 110 | ); |
111 | 111 | |
112 | 112 | /** |
@@ -134,37 +134,37 @@ discard block |
||
134 | 134 | */ |
135 | 135 | public function buildRelations() |
136 | 136 | { |
137 | - $this->addRelation('User', '\\Jalle19\\StatusManager\\Database\\User', RelationMap::ONE_TO_MANY, array ( |
|
137 | + $this->addRelation('User', '\\Jalle19\\StatusManager\\Database\\User', RelationMap::ONE_TO_MANY, array( |
|
138 | 138 | 0 => |
139 | - array ( |
|
139 | + array( |
|
140 | 140 | 0 => ':instance_name', |
141 | 141 | 1 => ':name', |
142 | 142 | ), |
143 | 143 | ), null, null, 'Users', false); |
144 | - $this->addRelation('Connection', '\\Jalle19\\StatusManager\\Database\\Connection', RelationMap::ONE_TO_MANY, array ( |
|
144 | + $this->addRelation('Connection', '\\Jalle19\\StatusManager\\Database\\Connection', RelationMap::ONE_TO_MANY, array( |
|
145 | 145 | 0 => |
146 | - array ( |
|
146 | + array( |
|
147 | 147 | 0 => ':instance_name', |
148 | 148 | 1 => ':name', |
149 | 149 | ), |
150 | 150 | ), null, null, 'Connections', false); |
151 | - $this->addRelation('Input', '\\Jalle19\\StatusManager\\Database\\Input', RelationMap::ONE_TO_MANY, array ( |
|
151 | + $this->addRelation('Input', '\\Jalle19\\StatusManager\\Database\\Input', RelationMap::ONE_TO_MANY, array( |
|
152 | 152 | 0 => |
153 | - array ( |
|
153 | + array( |
|
154 | 154 | 0 => ':instance_name', |
155 | 155 | 1 => ':name', |
156 | 156 | ), |
157 | 157 | ), null, null, 'Inputs', false); |
158 | - $this->addRelation('Channel', '\\Jalle19\\StatusManager\\Database\\Channel', RelationMap::ONE_TO_MANY, array ( |
|
158 | + $this->addRelation('Channel', '\\Jalle19\\StatusManager\\Database\\Channel', RelationMap::ONE_TO_MANY, array( |
|
159 | 159 | 0 => |
160 | - array ( |
|
160 | + array( |
|
161 | 161 | 0 => ':instance_name', |
162 | 162 | 1 => ':name', |
163 | 163 | ), |
164 | 164 | ), null, null, 'Channels', false); |
165 | - $this->addRelation('Subscription', '\\Jalle19\\StatusManager\\Database\\Subscription', RelationMap::ONE_TO_MANY, array ( |
|
165 | + $this->addRelation('Subscription', '\\Jalle19\\StatusManager\\Database\\Subscription', RelationMap::ONE_TO_MANY, array( |
|
166 | 166 | 0 => |
167 | - array ( |
|
167 | + array( |
|
168 | 168 | 0 => ':instance_name', |
169 | 169 | 1 => ':name', |
170 | 170 | ), |
@@ -420,7 +420,7 @@ discard block |
||
420 | 420 | |
421 | 421 | // use transaction because $criteria could contain info |
422 | 422 | // for more than one table (I guess, conceivably) |
423 | - return $con->transaction(function () use ($con, $query) { |
|
423 | + return $con->transaction(function() use ($con, $query) { |
|
424 | 424 | return $query->doInsert($con); |
425 | 425 | }); |
426 | 426 | } |
@@ -132,12 +132,12 @@ discard block |
||
132 | 132 | * first dimension keys are the type constants |
133 | 133 | * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' |
134 | 134 | */ |
135 | - protected static $fieldNames = array ( |
|
136 | - self::TYPE_PHPNAME => array('Id', 'InstanceName', 'InputUuid', 'UserId', 'ChannelId', 'SubscriptionId', 'Started', 'Stopped', 'Title', 'Service', ), |
|
137 | - self::TYPE_CAMELNAME => array('id', 'instanceName', 'inputUuid', 'userId', 'channelId', 'subscriptionId', 'started', 'stopped', 'title', 'service', ), |
|
138 | - self::TYPE_COLNAME => array(SubscriptionTableMap::COL_ID, SubscriptionTableMap::COL_INSTANCE_NAME, SubscriptionTableMap::COL_INPUT_UUID, SubscriptionTableMap::COL_USER_ID, SubscriptionTableMap::COL_CHANNEL_ID, SubscriptionTableMap::COL_SUBSCRIPTION_ID, SubscriptionTableMap::COL_STARTED, SubscriptionTableMap::COL_STOPPED, SubscriptionTableMap::COL_TITLE, SubscriptionTableMap::COL_SERVICE, ), |
|
139 | - self::TYPE_FIELDNAME => array('id', 'instance_name', 'input_uuid', 'user_id', 'channel_id', 'subscription_id', 'started', 'stopped', 'title', 'service', ), |
|
140 | - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, ) |
|
135 | + protected static $fieldNames = array( |
|
136 | + self::TYPE_PHPNAME => array('Id', 'InstanceName', 'InputUuid', 'UserId', 'ChannelId', 'SubscriptionId', 'Started', 'Stopped', 'Title', 'Service',), |
|
137 | + self::TYPE_CAMELNAME => array('id', 'instanceName', 'inputUuid', 'userId', 'channelId', 'subscriptionId', 'started', 'stopped', 'title', 'service',), |
|
138 | + self::TYPE_COLNAME => array(SubscriptionTableMap::COL_ID, SubscriptionTableMap::COL_INSTANCE_NAME, SubscriptionTableMap::COL_INPUT_UUID, SubscriptionTableMap::COL_USER_ID, SubscriptionTableMap::COL_CHANNEL_ID, SubscriptionTableMap::COL_SUBSCRIPTION_ID, SubscriptionTableMap::COL_STARTED, SubscriptionTableMap::COL_STOPPED, SubscriptionTableMap::COL_TITLE, SubscriptionTableMap::COL_SERVICE,), |
|
139 | + self::TYPE_FIELDNAME => array('id', 'instance_name', 'input_uuid', 'user_id', 'channel_id', 'subscription_id', 'started', 'stopped', 'title', 'service',), |
|
140 | + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9,) |
|
141 | 141 | ); |
142 | 142 | |
143 | 143 | /** |
@@ -146,12 +146,12 @@ discard block |
||
146 | 146 | * first dimension keys are the type constants |
147 | 147 | * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0 |
148 | 148 | */ |
149 | - protected static $fieldKeys = array ( |
|
150 | - self::TYPE_PHPNAME => array('Id' => 0, 'InstanceName' => 1, 'InputUuid' => 2, 'UserId' => 3, 'ChannelId' => 4, 'SubscriptionId' => 5, 'Started' => 6, 'Stopped' => 7, 'Title' => 8, 'Service' => 9, ), |
|
151 | - self::TYPE_CAMELNAME => array('id' => 0, 'instanceName' => 1, 'inputUuid' => 2, 'userId' => 3, 'channelId' => 4, 'subscriptionId' => 5, 'started' => 6, 'stopped' => 7, 'title' => 8, 'service' => 9, ), |
|
152 | - self::TYPE_COLNAME => array(SubscriptionTableMap::COL_ID => 0, SubscriptionTableMap::COL_INSTANCE_NAME => 1, SubscriptionTableMap::COL_INPUT_UUID => 2, SubscriptionTableMap::COL_USER_ID => 3, SubscriptionTableMap::COL_CHANNEL_ID => 4, SubscriptionTableMap::COL_SUBSCRIPTION_ID => 5, SubscriptionTableMap::COL_STARTED => 6, SubscriptionTableMap::COL_STOPPED => 7, SubscriptionTableMap::COL_TITLE => 8, SubscriptionTableMap::COL_SERVICE => 9, ), |
|
153 | - self::TYPE_FIELDNAME => array('id' => 0, 'instance_name' => 1, 'input_uuid' => 2, 'user_id' => 3, 'channel_id' => 4, 'subscription_id' => 5, 'started' => 6, 'stopped' => 7, 'title' => 8, 'service' => 9, ), |
|
154 | - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, ) |
|
149 | + protected static $fieldKeys = array( |
|
150 | + self::TYPE_PHPNAME => array('Id' => 0, 'InstanceName' => 1, 'InputUuid' => 2, 'UserId' => 3, 'ChannelId' => 4, 'SubscriptionId' => 5, 'Started' => 6, 'Stopped' => 7, 'Title' => 8, 'Service' => 9,), |
|
151 | + self::TYPE_CAMELNAME => array('id' => 0, 'instanceName' => 1, 'inputUuid' => 2, 'userId' => 3, 'channelId' => 4, 'subscriptionId' => 5, 'started' => 6, 'stopped' => 7, 'title' => 8, 'service' => 9,), |
|
152 | + self::TYPE_COLNAME => array(SubscriptionTableMap::COL_ID => 0, SubscriptionTableMap::COL_INSTANCE_NAME => 1, SubscriptionTableMap::COL_INPUT_UUID => 2, SubscriptionTableMap::COL_USER_ID => 3, SubscriptionTableMap::COL_CHANNEL_ID => 4, SubscriptionTableMap::COL_SUBSCRIPTION_ID => 5, SubscriptionTableMap::COL_STARTED => 6, SubscriptionTableMap::COL_STOPPED => 7, SubscriptionTableMap::COL_TITLE => 8, SubscriptionTableMap::COL_SERVICE => 9,), |
|
153 | + self::TYPE_FIELDNAME => array('id' => 0, 'instance_name' => 1, 'input_uuid' => 2, 'user_id' => 3, 'channel_id' => 4, 'subscription_id' => 5, 'started' => 6, 'stopped' => 7, 'title' => 8, 'service' => 9,), |
|
154 | + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9,) |
|
155 | 155 | ); |
156 | 156 | |
157 | 157 | /** |
@@ -188,30 +188,30 @@ discard block |
||
188 | 188 | */ |
189 | 189 | public function buildRelations() |
190 | 190 | { |
191 | - $this->addRelation('Instance', '\\Jalle19\\StatusManager\\Database\\Instance', RelationMap::MANY_TO_ONE, array ( |
|
191 | + $this->addRelation('Instance', '\\Jalle19\\StatusManager\\Database\\Instance', RelationMap::MANY_TO_ONE, array( |
|
192 | 192 | 0 => |
193 | - array ( |
|
193 | + array( |
|
194 | 194 | 0 => ':instance_name', |
195 | 195 | 1 => ':name', |
196 | 196 | ), |
197 | 197 | ), null, null, null, false); |
198 | - $this->addRelation('Input', '\\Jalle19\\StatusManager\\Database\\Input', RelationMap::MANY_TO_ONE, array ( |
|
198 | + $this->addRelation('Input', '\\Jalle19\\StatusManager\\Database\\Input', RelationMap::MANY_TO_ONE, array( |
|
199 | 199 | 0 => |
200 | - array ( |
|
200 | + array( |
|
201 | 201 | 0 => ':input_uuid', |
202 | 202 | 1 => ':uuid', |
203 | 203 | ), |
204 | 204 | ), null, null, null, false); |
205 | - $this->addRelation('User', '\\Jalle19\\StatusManager\\Database\\User', RelationMap::MANY_TO_ONE, array ( |
|
205 | + $this->addRelation('User', '\\Jalle19\\StatusManager\\Database\\User', RelationMap::MANY_TO_ONE, array( |
|
206 | 206 | 0 => |
207 | - array ( |
|
207 | + array( |
|
208 | 208 | 0 => ':user_id', |
209 | 209 | 1 => ':id', |
210 | 210 | ), |
211 | 211 | ), null, null, null, false); |
212 | - $this->addRelation('Channel', '\\Jalle19\\StatusManager\\Database\\Channel', RelationMap::MANY_TO_ONE, array ( |
|
212 | + $this->addRelation('Channel', '\\Jalle19\\StatusManager\\Database\\Channel', RelationMap::MANY_TO_ONE, array( |
|
213 | 213 | 0 => |
214 | - array ( |
|
214 | + array( |
|
215 | 215 | 0 => ':channel_id', |
216 | 216 | 1 => ':id', |
217 | 217 | ), |
@@ -479,8 +479,8 @@ discard block |
||
479 | 479 | $criteria = $criteria->buildCriteria(); // build Criteria from Subscription object |
480 | 480 | } |
481 | 481 | |
482 | - if ($criteria->containsKey(SubscriptionTableMap::COL_ID) && $criteria->keyContainsValue(SubscriptionTableMap::COL_ID) ) { |
|
483 | - throw new PropelException('Cannot insert a value for auto-increment primary key ('.SubscriptionTableMap::COL_ID.')'); |
|
482 | + if ($criteria->containsKey(SubscriptionTableMap::COL_ID) && $criteria->keyContainsValue(SubscriptionTableMap::COL_ID)) { |
|
483 | + throw new PropelException('Cannot insert a value for auto-increment primary key (' . SubscriptionTableMap::COL_ID . ')'); |
|
484 | 484 | } |
485 | 485 | |
486 | 486 | |
@@ -489,7 +489,7 @@ discard block |
||
489 | 489 | |
490 | 490 | // use transaction because $criteria could contain info |
491 | 491 | // for more than one table (I guess, conceivably) |
492 | - return $con->transaction(function () use ($con, $query) { |
|
492 | + return $con->transaction(function() use ($con, $query) { |
|
493 | 493 | return $query->doInsert($con); |
494 | 494 | }); |
495 | 495 | } |
@@ -151,7 +151,7 @@ |
||
151 | 151 | $this->_persistenceManager->onConnectionSeen($instanceName, $connection); |
152 | 152 | |
153 | 153 | // Persist inputs |
154 | - foreach($instanceStatus->getInputs() as $input) |
|
154 | + foreach ($instanceStatus->getInputs() as $input) |
|
155 | 155 | $this->_persistenceManager->onInputSeen($instanceName, $input); |
156 | 156 | |
157 | 157 | // Persist running subscriptions |