@@ -17,7 +17,6 @@ |
||
| 17 | 17 | use Propel\Runtime\ActiveQuery\Criteria; |
| 18 | 18 | use Propel\Runtime\ActiveQuery\ModelCriteria; |
| 19 | 19 | use Propel\Runtime\ActiveRecord\ActiveRecordInterface; |
| 20 | -use Propel\Runtime\Collection\Collection; |
|
| 21 | 20 | use Propel\Runtime\Connection\ConnectionInterface; |
| 22 | 21 | use Propel\Runtime\Exception\BadMethodCallException; |
| 23 | 22 | use Propel\Runtime\Exception\LogicException; |
@@ -371,7 +371,7 @@ discard block |
||
| 371 | 371 | $propertyNames = []; |
| 372 | 372 | $serializableProperties = array_diff($cls->getProperties(), $cls->getProperties(\ReflectionProperty::IS_STATIC)); |
| 373 | 373 | |
| 374 | - foreach($serializableProperties as $property) { |
|
| 374 | + foreach ($serializableProperties as $property) { |
|
| 375 | 375 | $propertyNames[] = $property->getName(); |
| 376 | 376 | } |
| 377 | 377 | |
@@ -845,7 +845,7 @@ discard block |
||
| 845 | 845 | $con = Propel::getServiceContainer()->getWriteConnection(SubscriptionTableMap::DATABASE_NAME); |
| 846 | 846 | } |
| 847 | 847 | |
| 848 | - $con->transaction(function () use ($con) { |
|
| 848 | + $con->transaction(function() use ($con) { |
|
| 849 | 849 | $deleteQuery = ChildSubscriptionQuery::create() |
| 850 | 850 | ->filterByPrimaryKey($this->getPrimaryKey()); |
| 851 | 851 | $ret = $this->preDelete($con); |
@@ -880,7 +880,7 @@ discard block |
||
| 880 | 880 | $con = Propel::getServiceContainer()->getWriteConnection(SubscriptionTableMap::DATABASE_NAME); |
| 881 | 881 | } |
| 882 | 882 | |
| 883 | - return $con->transaction(function () use ($con) { |
|
| 883 | + return $con->transaction(function() use ($con) { |
|
| 884 | 884 | $isInsert = $this->isNew(); |
| 885 | 885 | $ret = $this->preSave($con); |
| 886 | 886 | if ($isInsert) { |
@@ -1206,7 +1206,7 @@ discard block |
||
| 1206 | 1206 | $key = 'Instance'; |
| 1207 | 1207 | } |
| 1208 | 1208 | |
| 1209 | - $result[$key] = $this->aInstance->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); |
|
| 1209 | + $result[$key] = $this->aInstance->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); |
|
| 1210 | 1210 | } |
| 1211 | 1211 | if (null !== $this->aUser) { |
| 1212 | 1212 | |
@@ -1221,7 +1221,7 @@ discard block |
||
| 1221 | 1221 | $key = 'User'; |
| 1222 | 1222 | } |
| 1223 | 1223 | |
| 1224 | - $result[$key] = $this->aUser->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); |
|
| 1224 | + $result[$key] = $this->aUser->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); |
|
| 1225 | 1225 | } |
| 1226 | 1226 | if (null !== $this->aChannel) { |
| 1227 | 1227 | |
@@ -1236,7 +1236,7 @@ discard block |
||
| 1236 | 1236 | $key = 'Channel'; |
| 1237 | 1237 | } |
| 1238 | 1238 | |
| 1239 | - $result[$key] = $this->aChannel->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); |
|
| 1239 | + $result[$key] = $this->aChannel->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); |
|
| 1240 | 1240 | } |
| 1241 | 1241 | } |
| 1242 | 1242 | |
@@ -142,7 +142,7 @@ |
||
| 142 | 142 | if ($configuration === false) |
| 143 | 143 | throw new InvalidConfigurationException('Failed to parse the specified configuration file'); |
| 144 | 144 | |
| 145 | - $instances = []; |
|
| 145 | + $instances = []; |
|
| 146 | 146 | |
| 147 | 147 | // Parse sections |
| 148 | 148 | foreach ($configuration as $section => $values) |
@@ -330,7 +330,7 @@ discard block |
||
| 330 | 330 | $propertyNames = []; |
| 331 | 331 | $serializableProperties = array_diff($cls->getProperties(), $cls->getProperties(\ReflectionProperty::IS_STATIC)); |
| 332 | 332 | |
| 333 | - foreach($serializableProperties as $property) { |
|
| 333 | + foreach ($serializableProperties as $property) { |
|
| 334 | 334 | $propertyNames[] = $property->getName(); |
| 335 | 335 | } |
| 336 | 336 | |
@@ -572,7 +572,7 @@ discard block |
||
| 572 | 572 | $con = Propel::getServiceContainer()->getWriteConnection(ChannelTableMap::DATABASE_NAME); |
| 573 | 573 | } |
| 574 | 574 | |
| 575 | - $con->transaction(function () use ($con) { |
|
| 575 | + $con->transaction(function() use ($con) { |
|
| 576 | 576 | $deleteQuery = ChildChannelQuery::create() |
| 577 | 577 | ->filterByPrimaryKey($this->getPrimaryKey()); |
| 578 | 578 | $ret = $this->preDelete($con); |
@@ -607,7 +607,7 @@ discard block |
||
| 607 | 607 | $con = Propel::getServiceContainer()->getWriteConnection(ChannelTableMap::DATABASE_NAME); |
| 608 | 608 | } |
| 609 | 609 | |
| 610 | - return $con->transaction(function () use ($con) { |
|
| 610 | + return $con->transaction(function() use ($con) { |
|
| 611 | 611 | $isInsert = $this->isNew(); |
| 612 | 612 | $ret = $this->preSave($con); |
| 613 | 613 | if ($isInsert) { |
@@ -868,7 +868,7 @@ discard block |
||
| 868 | 868 | $key = 'Instance'; |
| 869 | 869 | } |
| 870 | 870 | |
| 871 | - $result[$key] = $this->aInstance->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); |
|
| 871 | + $result[$key] = $this->aInstance->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); |
|
| 872 | 872 | } |
| 873 | 873 | if (null !== $this->collSubscriptions) { |
| 874 | 874 | |
@@ -1273,7 +1273,7 @@ discard block |
||
| 1273 | 1273 | public function getSubscriptions(Criteria $criteria = null, ConnectionInterface $con = null) |
| 1274 | 1274 | { |
| 1275 | 1275 | $partial = $this->collSubscriptionsPartial && !$this->isNew(); |
| 1276 | - if (null === $this->collSubscriptions || null !== $criteria || $partial) { |
|
| 1276 | + if (null === $this->collSubscriptions || null !== $criteria || $partial) { |
|
| 1277 | 1277 | if ($this->isNew() && null === $this->collSubscriptions) { |
| 1278 | 1278 | // return empty collection |
| 1279 | 1279 | $this->initSubscriptions(); |
@@ -1411,7 +1411,7 @@ discard block |
||
| 1411 | 1411 | */ |
| 1412 | 1412 | protected function doAddSubscription(ChildSubscription $subscription) |
| 1413 | 1413 | { |
| 1414 | - $this->collSubscriptions[]= $subscription; |
|
| 1414 | + $this->collSubscriptions[] = $subscription; |
|
| 1415 | 1415 | $subscription->setChannel($this); |
| 1416 | 1416 | } |
| 1417 | 1417 | |
@@ -1428,7 +1428,7 @@ discard block |
||
| 1428 | 1428 | $this->subscriptionsScheduledForDeletion = clone $this->collSubscriptions; |
| 1429 | 1429 | $this->subscriptionsScheduledForDeletion->clear(); |
| 1430 | 1430 | } |
| 1431 | - $this->subscriptionsScheduledForDeletion[]= clone $subscription; |
|
| 1431 | + $this->subscriptionsScheduledForDeletion[] = clone $subscription; |
|
| 1432 | 1432 | $subscription->setChannel(null); |
| 1433 | 1433 | } |
| 1434 | 1434 | |
@@ -343,7 +343,7 @@ discard block |
||
| 343 | 343 | $propertyNames = []; |
| 344 | 344 | $serializableProperties = array_diff($cls->getProperties(), $cls->getProperties(\ReflectionProperty::IS_STATIC)); |
| 345 | 345 | |
| 346 | - foreach($serializableProperties as $property) { |
|
| 346 | + foreach ($serializableProperties as $property) { |
|
| 347 | 347 | $propertyNames[] = $property->getName(); |
| 348 | 348 | } |
| 349 | 349 | |
@@ -700,7 +700,7 @@ discard block |
||
| 700 | 700 | $con = Propel::getServiceContainer()->getWriteConnection(ConnectionTableMap::DATABASE_NAME); |
| 701 | 701 | } |
| 702 | 702 | |
| 703 | - $con->transaction(function () use ($con) { |
|
| 703 | + $con->transaction(function() use ($con) { |
|
| 704 | 704 | $deleteQuery = ChildConnectionQuery::create() |
| 705 | 705 | ->filterByPrimaryKey($this->getPrimaryKey()); |
| 706 | 706 | $ret = $this->preDelete($con); |
@@ -735,7 +735,7 @@ discard block |
||
| 735 | 735 | $con = Propel::getServiceContainer()->getWriteConnection(ConnectionTableMap::DATABASE_NAME); |
| 736 | 736 | } |
| 737 | 737 | |
| 738 | - return $con->transaction(function () use ($con) { |
|
| 738 | + return $con->transaction(function() use ($con) { |
|
| 739 | 739 | $isInsert = $this->isNew(); |
| 740 | 740 | $ret = $this->preSave($con); |
| 741 | 741 | if ($isInsert) { |
@@ -1020,7 +1020,7 @@ discard block |
||
| 1020 | 1020 | $key = 'Instance'; |
| 1021 | 1021 | } |
| 1022 | 1022 | |
| 1023 | - $result[$key] = $this->aInstance->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); |
|
| 1023 | + $result[$key] = $this->aInstance->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); |
|
| 1024 | 1024 | } |
| 1025 | 1025 | if (null !== $this->aUser) { |
| 1026 | 1026 | |
@@ -1035,7 +1035,7 @@ discard block |
||
| 1035 | 1035 | $key = 'User'; |
| 1036 | 1036 | } |
| 1037 | 1037 | |
| 1038 | - $result[$key] = $this->aUser->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); |
|
| 1038 | + $result[$key] = $this->aUser->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); |
|
| 1039 | 1039 | } |
| 1040 | 1040 | } |
| 1041 | 1041 | |
@@ -17,7 +17,6 @@ |
||
| 17 | 17 | use Propel\Runtime\ActiveQuery\Criteria; |
| 18 | 18 | use Propel\Runtime\ActiveQuery\ModelCriteria; |
| 19 | 19 | use Propel\Runtime\ActiveRecord\ActiveRecordInterface; |
| 20 | -use Propel\Runtime\Collection\Collection; |
|
| 21 | 20 | use Propel\Runtime\Connection\ConnectionInterface; |
| 22 | 21 | use Propel\Runtime\Exception\BadMethodCallException; |
| 23 | 22 | use Propel\Runtime\Exception\LogicException; |
@@ -354,7 +354,7 @@ discard block |
||
| 354 | 354 | $propertyNames = []; |
| 355 | 355 | $serializableProperties = array_diff($cls->getProperties(), $cls->getProperties(\ReflectionProperty::IS_STATIC)); |
| 356 | 356 | |
| 357 | - foreach($serializableProperties as $property) { |
|
| 357 | + foreach ($serializableProperties as $property) { |
|
| 358 | 358 | $propertyNames[] = $property->getName(); |
| 359 | 359 | } |
| 360 | 360 | |
@@ -528,7 +528,7 @@ discard block |
||
| 528 | 528 | $con = Propel::getServiceContainer()->getWriteConnection(InstanceTableMap::DATABASE_NAME); |
| 529 | 529 | } |
| 530 | 530 | |
| 531 | - $con->transaction(function () use ($con) { |
|
| 531 | + $con->transaction(function() use ($con) { |
|
| 532 | 532 | $deleteQuery = ChildInstanceQuery::create() |
| 533 | 533 | ->filterByPrimaryKey($this->getPrimaryKey()); |
| 534 | 534 | $ret = $this->preDelete($con); |
@@ -563,7 +563,7 @@ discard block |
||
| 563 | 563 | $con = Propel::getServiceContainer()->getWriteConnection(InstanceTableMap::DATABASE_NAME); |
| 564 | 564 | } |
| 565 | 565 | |
| 566 | - return $con->transaction(function () use ($con) { |
|
| 566 | + return $con->transaction(function() use ($con) { |
|
| 567 | 567 | $isInsert = $this->isNew(); |
| 568 | 568 | $ret = $this->preSave($con); |
| 569 | 569 | if ($isInsert) { |
@@ -707,7 +707,7 @@ discard block |
||
| 707 | 707 | |
| 708 | 708 | // check the columns in natural order for more readable SQL queries |
| 709 | 709 | if ($this->isColumnModified(InstanceTableMap::COL_NAME)) { |
| 710 | - $modifiedColumns[':p' . $index++] = 'name'; |
|
| 710 | + $modifiedColumns[':p' . $index++] = 'name'; |
|
| 711 | 711 | } |
| 712 | 712 | |
| 713 | 713 | $sql = sprintf( |
@@ -1223,7 +1223,7 @@ discard block |
||
| 1223 | 1223 | public function getUsers(Criteria $criteria = null, ConnectionInterface $con = null) |
| 1224 | 1224 | { |
| 1225 | 1225 | $partial = $this->collUsersPartial && !$this->isNew(); |
| 1226 | - if (null === $this->collUsers || null !== $criteria || $partial) { |
|
| 1226 | + if (null === $this->collUsers || null !== $criteria || $partial) { |
|
| 1227 | 1227 | if ($this->isNew() && null === $this->collUsers) { |
| 1228 | 1228 | // return empty collection |
| 1229 | 1229 | $this->initUsers(); |
@@ -1361,7 +1361,7 @@ discard block |
||
| 1361 | 1361 | */ |
| 1362 | 1362 | protected function doAddUser(ChildUser $user) |
| 1363 | 1363 | { |
| 1364 | - $this->collUsers[]= $user; |
|
| 1364 | + $this->collUsers[] = $user; |
|
| 1365 | 1365 | $user->setInstance($this); |
| 1366 | 1366 | } |
| 1367 | 1367 | |
@@ -1378,7 +1378,7 @@ discard block |
||
| 1378 | 1378 | $this->usersScheduledForDeletion = clone $this->collUsers; |
| 1379 | 1379 | $this->usersScheduledForDeletion->clear(); |
| 1380 | 1380 | } |
| 1381 | - $this->usersScheduledForDeletion[]= clone $user; |
|
| 1381 | + $this->usersScheduledForDeletion[] = clone $user; |
|
| 1382 | 1382 | $user->setInstance(null); |
| 1383 | 1383 | } |
| 1384 | 1384 | |
@@ -1448,7 +1448,7 @@ discard block |
||
| 1448 | 1448 | public function getConnections(Criteria $criteria = null, ConnectionInterface $con = null) |
| 1449 | 1449 | { |
| 1450 | 1450 | $partial = $this->collConnectionsPartial && !$this->isNew(); |
| 1451 | - if (null === $this->collConnections || null !== $criteria || $partial) { |
|
| 1451 | + if (null === $this->collConnections || null !== $criteria || $partial) { |
|
| 1452 | 1452 | if ($this->isNew() && null === $this->collConnections) { |
| 1453 | 1453 | // return empty collection |
| 1454 | 1454 | $this->initConnections(); |
@@ -1586,7 +1586,7 @@ discard block |
||
| 1586 | 1586 | */ |
| 1587 | 1587 | protected function doAddConnection(ChildConnection $connection) |
| 1588 | 1588 | { |
| 1589 | - $this->collConnections[]= $connection; |
|
| 1589 | + $this->collConnections[] = $connection; |
|
| 1590 | 1590 | $connection->setInstance($this); |
| 1591 | 1591 | } |
| 1592 | 1592 | |
@@ -1603,7 +1603,7 @@ discard block |
||
| 1603 | 1603 | $this->connectionsScheduledForDeletion = clone $this->collConnections; |
| 1604 | 1604 | $this->connectionsScheduledForDeletion->clear(); |
| 1605 | 1605 | } |
| 1606 | - $this->connectionsScheduledForDeletion[]= clone $connection; |
|
| 1606 | + $this->connectionsScheduledForDeletion[] = clone $connection; |
|
| 1607 | 1607 | $connection->setInstance(null); |
| 1608 | 1608 | } |
| 1609 | 1609 | |
@@ -1698,7 +1698,7 @@ discard block |
||
| 1698 | 1698 | public function getChannels(Criteria $criteria = null, ConnectionInterface $con = null) |
| 1699 | 1699 | { |
| 1700 | 1700 | $partial = $this->collChannelsPartial && !$this->isNew(); |
| 1701 | - if (null === $this->collChannels || null !== $criteria || $partial) { |
|
| 1701 | + if (null === $this->collChannels || null !== $criteria || $partial) { |
|
| 1702 | 1702 | if ($this->isNew() && null === $this->collChannels) { |
| 1703 | 1703 | // return empty collection |
| 1704 | 1704 | $this->initChannels(); |
@@ -1836,7 +1836,7 @@ discard block |
||
| 1836 | 1836 | */ |
| 1837 | 1837 | protected function doAddChannel(ChildChannel $channel) |
| 1838 | 1838 | { |
| 1839 | - $this->collChannels[]= $channel; |
|
| 1839 | + $this->collChannels[] = $channel; |
|
| 1840 | 1840 | $channel->setInstance($this); |
| 1841 | 1841 | } |
| 1842 | 1842 | |
@@ -1853,7 +1853,7 @@ discard block |
||
| 1853 | 1853 | $this->channelsScheduledForDeletion = clone $this->collChannels; |
| 1854 | 1854 | $this->channelsScheduledForDeletion->clear(); |
| 1855 | 1855 | } |
| 1856 | - $this->channelsScheduledForDeletion[]= clone $channel; |
|
| 1856 | + $this->channelsScheduledForDeletion[] = clone $channel; |
|
| 1857 | 1857 | $channel->setInstance(null); |
| 1858 | 1858 | } |
| 1859 | 1859 | |
@@ -1923,7 +1923,7 @@ discard block |
||
| 1923 | 1923 | public function getSubscriptions(Criteria $criteria = null, ConnectionInterface $con = null) |
| 1924 | 1924 | { |
| 1925 | 1925 | $partial = $this->collSubscriptionsPartial && !$this->isNew(); |
| 1926 | - if (null === $this->collSubscriptions || null !== $criteria || $partial) { |
|
| 1926 | + if (null === $this->collSubscriptions || null !== $criteria || $partial) { |
|
| 1927 | 1927 | if ($this->isNew() && null === $this->collSubscriptions) { |
| 1928 | 1928 | // return empty collection |
| 1929 | 1929 | $this->initSubscriptions(); |
@@ -2061,7 +2061,7 @@ discard block |
||
| 2061 | 2061 | */ |
| 2062 | 2062 | protected function doAddSubscription(ChildSubscription $subscription) |
| 2063 | 2063 | { |
| 2064 | - $this->collSubscriptions[]= $subscription; |
|
| 2064 | + $this->collSubscriptions[] = $subscription; |
|
| 2065 | 2065 | $subscription->setInstance($this); |
| 2066 | 2066 | } |
| 2067 | 2067 | |
@@ -2078,7 +2078,7 @@ discard block |
||
| 2078 | 2078 | $this->subscriptionsScheduledForDeletion = clone $this->collSubscriptions; |
| 2079 | 2079 | $this->subscriptionsScheduledForDeletion->clear(); |
| 2080 | 2080 | } |
| 2081 | - $this->subscriptionsScheduledForDeletion[]= clone $subscription; |
|
| 2081 | + $this->subscriptionsScheduledForDeletion[] = clone $subscription; |
|
| 2082 | 2082 | $subscription->setInstance(null); |
| 2083 | 2083 | } |
| 2084 | 2084 | |
@@ -345,7 +345,7 @@ discard block |
||
| 345 | 345 | $propertyNames = []; |
| 346 | 346 | $serializableProperties = array_diff($cls->getProperties(), $cls->getProperties(\ReflectionProperty::IS_STATIC)); |
| 347 | 347 | |
| 348 | - foreach($serializableProperties as $property) { |
|
| 348 | + foreach ($serializableProperties as $property) { |
|
| 349 | 349 | $propertyNames[] = $property->getName(); |
| 350 | 350 | } |
| 351 | 351 | |
@@ -589,7 +589,7 @@ discard block |
||
| 589 | 589 | $con = Propel::getServiceContainer()->getWriteConnection(UserTableMap::DATABASE_NAME); |
| 590 | 590 | } |
| 591 | 591 | |
| 592 | - $con->transaction(function () use ($con) { |
|
| 592 | + $con->transaction(function() use ($con) { |
|
| 593 | 593 | $deleteQuery = ChildUserQuery::create() |
| 594 | 594 | ->filterByPrimaryKey($this->getPrimaryKey()); |
| 595 | 595 | $ret = $this->preDelete($con); |
@@ -624,7 +624,7 @@ discard block |
||
| 624 | 624 | $con = Propel::getServiceContainer()->getWriteConnection(UserTableMap::DATABASE_NAME); |
| 625 | 625 | } |
| 626 | 626 | |
| 627 | - return $con->transaction(function () use ($con) { |
|
| 627 | + return $con->transaction(function() use ($con) { |
|
| 628 | 628 | $isInsert = $this->isNew(); |
| 629 | 629 | $ret = $this->preSave($con); |
| 630 | 630 | if ($isInsert) { |
@@ -904,7 +904,7 @@ discard block |
||
| 904 | 904 | $key = 'Instance'; |
| 905 | 905 | } |
| 906 | 906 | |
| 907 | - $result[$key] = $this->aInstance->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); |
|
| 907 | + $result[$key] = $this->aInstance->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); |
|
| 908 | 908 | } |
| 909 | 909 | if (null !== $this->collConnections) { |
| 910 | 910 | |
@@ -1333,7 +1333,7 @@ discard block |
||
| 1333 | 1333 | public function getConnections(Criteria $criteria = null, ConnectionInterface $con = null) |
| 1334 | 1334 | { |
| 1335 | 1335 | $partial = $this->collConnectionsPartial && !$this->isNew(); |
| 1336 | - if (null === $this->collConnections || null !== $criteria || $partial) { |
|
| 1336 | + if (null === $this->collConnections || null !== $criteria || $partial) { |
|
| 1337 | 1337 | if ($this->isNew() && null === $this->collConnections) { |
| 1338 | 1338 | // return empty collection |
| 1339 | 1339 | $this->initConnections(); |
@@ -1471,7 +1471,7 @@ discard block |
||
| 1471 | 1471 | */ |
| 1472 | 1472 | protected function doAddConnection(ChildConnection $connection) |
| 1473 | 1473 | { |
| 1474 | - $this->collConnections[]= $connection; |
|
| 1474 | + $this->collConnections[] = $connection; |
|
| 1475 | 1475 | $connection->setUser($this); |
| 1476 | 1476 | } |
| 1477 | 1477 | |
@@ -1488,7 +1488,7 @@ discard block |
||
| 1488 | 1488 | $this->connectionsScheduledForDeletion = clone $this->collConnections; |
| 1489 | 1489 | $this->connectionsScheduledForDeletion->clear(); |
| 1490 | 1490 | } |
| 1491 | - $this->connectionsScheduledForDeletion[]= $connection; |
|
| 1491 | + $this->connectionsScheduledForDeletion[] = $connection; |
|
| 1492 | 1492 | $connection->setUser(null); |
| 1493 | 1493 | } |
| 1494 | 1494 | |
@@ -1583,7 +1583,7 @@ discard block |
||
| 1583 | 1583 | public function getSubscriptions(Criteria $criteria = null, ConnectionInterface $con = null) |
| 1584 | 1584 | { |
| 1585 | 1585 | $partial = $this->collSubscriptionsPartial && !$this->isNew(); |
| 1586 | - if (null === $this->collSubscriptions || null !== $criteria || $partial) { |
|
| 1586 | + if (null === $this->collSubscriptions || null !== $criteria || $partial) { |
|
| 1587 | 1587 | if ($this->isNew() && null === $this->collSubscriptions) { |
| 1588 | 1588 | // return empty collection |
| 1589 | 1589 | $this->initSubscriptions(); |
@@ -1721,7 +1721,7 @@ discard block |
||
| 1721 | 1721 | */ |
| 1722 | 1722 | protected function doAddSubscription(ChildSubscription $subscription) |
| 1723 | 1723 | { |
| 1724 | - $this->collSubscriptions[]= $subscription; |
|
| 1724 | + $this->collSubscriptions[] = $subscription; |
|
| 1725 | 1725 | $subscription->setUser($this); |
| 1726 | 1726 | } |
| 1727 | 1727 | |
@@ -1738,7 +1738,7 @@ discard block |
||
| 1738 | 1738 | $this->subscriptionsScheduledForDeletion = clone $this->collSubscriptions; |
| 1739 | 1739 | $this->subscriptionsScheduledForDeletion->clear(); |
| 1740 | 1740 | } |
| 1741 | - $this->subscriptionsScheduledForDeletion[]= $subscription; |
|
| 1741 | + $this->subscriptionsScheduledForDeletion[] = $subscription; |
|
| 1742 | 1742 | $subscription->setUser(null); |
| 1743 | 1743 | } |
| 1744 | 1744 | |
@@ -620,7 +620,7 @@ discard block |
||
| 620 | 620 | |
| 621 | 621 | // use transaction because $criteria could contain info |
| 622 | 622 | // for more than one table or we could emulating ON DELETE CASCADE, etc. |
| 623 | - return $con->transaction(function () use ($con) { |
|
| 623 | + return $con->transaction(function() use ($con) { |
|
| 624 | 624 | $affectedRows = 0; // initialize var to track total num of affected rows |
| 625 | 625 | $affectedRows += parent::doDeleteAll($con); |
| 626 | 626 | // Because this db requires some delete cascade/set null emulation, we have to |
@@ -655,7 +655,7 @@ discard block |
||
| 655 | 655 | |
| 656 | 656 | // use transaction because $criteria could contain info |
| 657 | 657 | // for more than one table or we could emulating ON DELETE CASCADE, etc. |
| 658 | - return $con->transaction(function () use ($con, $criteria) { |
|
| 658 | + return $con->transaction(function() use ($con, $criteria) { |
|
| 659 | 659 | $affectedRows = 0; // initialize var to track total num of affected rows |
| 660 | 660 | |
| 661 | 661 | UserTableMap::removeInstanceFromPool($criteria); |
@@ -97,12 +97,12 @@ discard block |
||
| 97 | 97 | * first dimension keys are the type constants |
| 98 | 98 | * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' |
| 99 | 99 | */ |
| 100 | - protected static $fieldNames = array ( |
|
| 101 | - self::TYPE_PHPNAME => array('Id', 'InstanceName', 'Name', ), |
|
| 102 | - self::TYPE_CAMELNAME => array('id', 'instanceName', 'name', ), |
|
| 103 | - self::TYPE_COLNAME => array(ChannelTableMap::COL_ID, ChannelTableMap::COL_INSTANCE_NAME, ChannelTableMap::COL_NAME, ), |
|
| 104 | - self::TYPE_FIELDNAME => array('id', 'instance_name', 'name', ), |
|
| 105 | - self::TYPE_NUM => array(0, 1, 2, ) |
|
| 100 | + protected static $fieldNames = array( |
|
| 101 | + self::TYPE_PHPNAME => array('Id', 'InstanceName', 'Name',), |
|
| 102 | + self::TYPE_CAMELNAME => array('id', 'instanceName', 'name',), |
|
| 103 | + self::TYPE_COLNAME => array(ChannelTableMap::COL_ID, ChannelTableMap::COL_INSTANCE_NAME, ChannelTableMap::COL_NAME,), |
|
| 104 | + self::TYPE_FIELDNAME => array('id', 'instance_name', 'name',), |
|
| 105 | + self::TYPE_NUM => array(0, 1, 2,) |
|
| 106 | 106 | ); |
| 107 | 107 | |
| 108 | 108 | /** |
@@ -111,12 +111,12 @@ discard block |
||
| 111 | 111 | * first dimension keys are the type constants |
| 112 | 112 | * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0 |
| 113 | 113 | */ |
| 114 | - protected static $fieldKeys = array ( |
|
| 115 | - self::TYPE_PHPNAME => array('Id' => 0, 'InstanceName' => 1, 'Name' => 2, ), |
|
| 116 | - self::TYPE_CAMELNAME => array('id' => 0, 'instanceName' => 1, 'name' => 2, ), |
|
| 117 | - self::TYPE_COLNAME => array(ChannelTableMap::COL_ID => 0, ChannelTableMap::COL_INSTANCE_NAME => 1, ChannelTableMap::COL_NAME => 2, ), |
|
| 118 | - self::TYPE_FIELDNAME => array('id' => 0, 'instance_name' => 1, 'name' => 2, ), |
|
| 119 | - self::TYPE_NUM => array(0, 1, 2, ) |
|
| 114 | + protected static $fieldKeys = array( |
|
| 115 | + self::TYPE_PHPNAME => array('Id' => 0, 'InstanceName' => 1, 'Name' => 2,), |
|
| 116 | + self::TYPE_CAMELNAME => array('id' => 0, 'instanceName' => 1, 'name' => 2,), |
|
| 117 | + self::TYPE_COLNAME => array(ChannelTableMap::COL_ID => 0, ChannelTableMap::COL_INSTANCE_NAME => 1, ChannelTableMap::COL_NAME => 2,), |
|
| 118 | + self::TYPE_FIELDNAME => array('id' => 0, 'instance_name' => 1, 'name' => 2,), |
|
| 119 | + self::TYPE_NUM => array(0, 1, 2,) |
|
| 120 | 120 | ); |
| 121 | 121 | |
| 122 | 122 | /** |
@@ -146,16 +146,16 @@ discard block |
||
| 146 | 146 | */ |
| 147 | 147 | public function buildRelations() |
| 148 | 148 | { |
| 149 | - $this->addRelation('Instance', '\\Jalle19\\StatusManager\\Database\\Instance', RelationMap::MANY_TO_ONE, array ( |
|
| 149 | + $this->addRelation('Instance', '\\Jalle19\\StatusManager\\Database\\Instance', RelationMap::MANY_TO_ONE, array( |
|
| 150 | 150 | 0 => |
| 151 | - array ( |
|
| 151 | + array( |
|
| 152 | 152 | 0 => ':instance_name', |
| 153 | 153 | 1 => ':name', |
| 154 | 154 | ), |
| 155 | 155 | ), null, null, null, false); |
| 156 | - $this->addRelation('Subscription', '\\Jalle19\\StatusManager\\Database\\Subscription', RelationMap::ONE_TO_MANY, array ( |
|
| 156 | + $this->addRelation('Subscription', '\\Jalle19\\StatusManager\\Database\\Subscription', RelationMap::ONE_TO_MANY, array( |
|
| 157 | 157 | 0 => |
| 158 | - array ( |
|
| 158 | + array( |
|
| 159 | 159 | 0 => ':channel_id', |
| 160 | 160 | 1 => ':id', |
| 161 | 161 | ), |
@@ -409,8 +409,8 @@ discard block |
||
| 409 | 409 | $criteria = $criteria->buildCriteria(); // build Criteria from Channel object |
| 410 | 410 | } |
| 411 | 411 | |
| 412 | - if ($criteria->containsKey(ChannelTableMap::COL_ID) && $criteria->keyContainsValue(ChannelTableMap::COL_ID) ) { |
|
| 413 | - throw new PropelException('Cannot insert a value for auto-increment primary key ('.ChannelTableMap::COL_ID.')'); |
|
| 412 | + if ($criteria->containsKey(ChannelTableMap::COL_ID) && $criteria->keyContainsValue(ChannelTableMap::COL_ID)) { |
|
| 413 | + throw new PropelException('Cannot insert a value for auto-increment primary key (' . ChannelTableMap::COL_ID . ')'); |
|
| 414 | 414 | } |
| 415 | 415 | |
| 416 | 416 | |
@@ -419,7 +419,7 @@ discard block |
||
| 419 | 419 | |
| 420 | 420 | // use transaction because $criteria could contain info |
| 421 | 421 | // for more than one table (I guess, conceivably) |
| 422 | - return $con->transaction(function () use ($con, $query) { |
|
| 422 | + return $con->transaction(function() use ($con, $query) { |
|
| 423 | 423 | return $query->doInsert($con); |
| 424 | 424 | }); |
| 425 | 425 | } |
@@ -112,12 +112,12 @@ discard block |
||
| 112 | 112 | * first dimension keys are the type constants |
| 113 | 113 | * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' |
| 114 | 114 | */ |
| 115 | - protected static $fieldNames = array ( |
|
| 116 | - self::TYPE_PHPNAME => array('Id', 'InstanceName', 'UserId', 'Peer', 'Started', 'Type', ), |
|
| 117 | - self::TYPE_CAMELNAME => array('id', 'instanceName', 'userId', 'peer', 'started', 'type', ), |
|
| 118 | - self::TYPE_COLNAME => array(ConnectionTableMap::COL_ID, ConnectionTableMap::COL_INSTANCE_NAME, ConnectionTableMap::COL_USER_ID, ConnectionTableMap::COL_PEER, ConnectionTableMap::COL_STARTED, ConnectionTableMap::COL_TYPE, ), |
|
| 119 | - self::TYPE_FIELDNAME => array('id', 'instance_name', 'user_id', 'peer', 'started', 'type', ), |
|
| 120 | - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, ) |
|
| 115 | + protected static $fieldNames = array( |
|
| 116 | + self::TYPE_PHPNAME => array('Id', 'InstanceName', 'UserId', 'Peer', 'Started', 'Type',), |
|
| 117 | + self::TYPE_CAMELNAME => array('id', 'instanceName', 'userId', 'peer', 'started', 'type',), |
|
| 118 | + self::TYPE_COLNAME => array(ConnectionTableMap::COL_ID, ConnectionTableMap::COL_INSTANCE_NAME, ConnectionTableMap::COL_USER_ID, ConnectionTableMap::COL_PEER, ConnectionTableMap::COL_STARTED, ConnectionTableMap::COL_TYPE,), |
|
| 119 | + self::TYPE_FIELDNAME => array('id', 'instance_name', 'user_id', 'peer', 'started', 'type',), |
|
| 120 | + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5,) |
|
| 121 | 121 | ); |
| 122 | 122 | |
| 123 | 123 | /** |
@@ -126,12 +126,12 @@ discard block |
||
| 126 | 126 | * first dimension keys are the type constants |
| 127 | 127 | * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0 |
| 128 | 128 | */ |
| 129 | - protected static $fieldKeys = array ( |
|
| 130 | - self::TYPE_PHPNAME => array('Id' => 0, 'InstanceName' => 1, 'UserId' => 2, 'Peer' => 3, 'Started' => 4, 'Type' => 5, ), |
|
| 131 | - self::TYPE_CAMELNAME => array('id' => 0, 'instanceName' => 1, 'userId' => 2, 'peer' => 3, 'started' => 4, 'type' => 5, ), |
|
| 132 | - self::TYPE_COLNAME => array(ConnectionTableMap::COL_ID => 0, ConnectionTableMap::COL_INSTANCE_NAME => 1, ConnectionTableMap::COL_USER_ID => 2, ConnectionTableMap::COL_PEER => 3, ConnectionTableMap::COL_STARTED => 4, ConnectionTableMap::COL_TYPE => 5, ), |
|
| 133 | - self::TYPE_FIELDNAME => array('id' => 0, 'instance_name' => 1, 'user_id' => 2, 'peer' => 3, 'started' => 4, 'type' => 5, ), |
|
| 134 | - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, ) |
|
| 129 | + protected static $fieldKeys = array( |
|
| 130 | + self::TYPE_PHPNAME => array('Id' => 0, 'InstanceName' => 1, 'UserId' => 2, 'Peer' => 3, 'Started' => 4, 'Type' => 5,), |
|
| 131 | + self::TYPE_CAMELNAME => array('id' => 0, 'instanceName' => 1, 'userId' => 2, 'peer' => 3, 'started' => 4, 'type' => 5,), |
|
| 132 | + self::TYPE_COLNAME => array(ConnectionTableMap::COL_ID => 0, ConnectionTableMap::COL_INSTANCE_NAME => 1, ConnectionTableMap::COL_USER_ID => 2, ConnectionTableMap::COL_PEER => 3, ConnectionTableMap::COL_STARTED => 4, ConnectionTableMap::COL_TYPE => 5,), |
|
| 133 | + self::TYPE_FIELDNAME => array('id' => 0, 'instance_name' => 1, 'user_id' => 2, 'peer' => 3, 'started' => 4, 'type' => 5,), |
|
| 134 | + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5,) |
|
| 135 | 135 | ); |
| 136 | 136 | |
| 137 | 137 | /** |
@@ -164,16 +164,16 @@ discard block |
||
| 164 | 164 | */ |
| 165 | 165 | public function buildRelations() |
| 166 | 166 | { |
| 167 | - $this->addRelation('Instance', '\\Jalle19\\StatusManager\\Database\\Instance', RelationMap::MANY_TO_ONE, array ( |
|
| 167 | + $this->addRelation('Instance', '\\Jalle19\\StatusManager\\Database\\Instance', RelationMap::MANY_TO_ONE, array( |
|
| 168 | 168 | 0 => |
| 169 | - array ( |
|
| 169 | + array( |
|
| 170 | 170 | 0 => ':instance_name', |
| 171 | 171 | 1 => ':name', |
| 172 | 172 | ), |
| 173 | 173 | ), null, null, null, false); |
| 174 | - $this->addRelation('User', '\\Jalle19\\StatusManager\\Database\\User', RelationMap::MANY_TO_ONE, array ( |
|
| 174 | + $this->addRelation('User', '\\Jalle19\\StatusManager\\Database\\User', RelationMap::MANY_TO_ONE, array( |
|
| 175 | 175 | 0 => |
| 176 | - array ( |
|
| 176 | + array( |
|
| 177 | 177 | 0 => ':user_id', |
| 178 | 178 | 1 => ':id', |
| 179 | 179 | ), |
@@ -433,8 +433,8 @@ discard block |
||
| 433 | 433 | $criteria = $criteria->buildCriteria(); // build Criteria from Connection object |
| 434 | 434 | } |
| 435 | 435 | |
| 436 | - if ($criteria->containsKey(ConnectionTableMap::COL_ID) && $criteria->keyContainsValue(ConnectionTableMap::COL_ID) ) { |
|
| 437 | - throw new PropelException('Cannot insert a value for auto-increment primary key ('.ConnectionTableMap::COL_ID.')'); |
|
| 436 | + if ($criteria->containsKey(ConnectionTableMap::COL_ID) && $criteria->keyContainsValue(ConnectionTableMap::COL_ID)) { |
|
| 437 | + throw new PropelException('Cannot insert a value for auto-increment primary key (' . ConnectionTableMap::COL_ID . ')'); |
|
| 438 | 438 | } |
| 439 | 439 | |
| 440 | 440 | |
@@ -443,7 +443,7 @@ discard block |
||
| 443 | 443 | |
| 444 | 444 | // use transaction because $criteria could contain info |
| 445 | 445 | // for more than one table (I guess, conceivably) |
| 446 | - return $con->transaction(function () use ($con, $query) { |
|
| 446 | + return $con->transaction(function() use ($con, $query) { |
|
| 447 | 447 | return $query->doInsert($con); |
| 448 | 448 | }); |
| 449 | 449 | } |