@@ -305,7 +305,7 @@ discard block |
||
| 305 | 305 | * |
| 306 | 306 | * @param string $msg |
| 307 | 307 | * @param int $priority One of the Propel::LOG_* logging levels |
| 308 | - * @return boolean |
|
| 308 | + * @return boolean|null |
|
| 309 | 309 | */ |
| 310 | 310 | protected function log($msg, $priority = Propel::LOG_INFO) |
| 311 | 311 | { |
@@ -1028,7 +1028,7 @@ discard block |
||
| 1028 | 1028 | * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. |
| 1029 | 1029 | * The default key type is the column's TableMap::TYPE_PHPNAME. |
| 1030 | 1030 | * |
| 1031 | - * @param mixed $parser A AbstractParser instance, |
|
| 1031 | + * @param string $parser A AbstractParser instance, |
|
| 1032 | 1032 | * or a format name ('XML', 'YAML', 'JSON', 'CSV') |
| 1033 | 1033 | * @param string $data The source data to import from |
| 1034 | 1034 | * @param string $keyType The type of keys the array uses. |
@@ -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 | |
@@ -138,7 +138,7 @@ |
||
| 138 | 138 | * $obj = $c->findPk(12, $con); |
| 139 | 139 | * </code> |
| 140 | 140 | * |
| 141 | - * @param mixed $key Primary key to use for the query |
|
| 141 | + * @param integer $key Primary key to use for the query |
|
| 142 | 142 | * @param ConnectionInterface $con an optional connection object |
| 143 | 143 | * |
| 144 | 144 | * @return ChildUser|array|mixed the result, formatted by the current formatter |
@@ -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); |
@@ -305,7 +305,7 @@ discard block |
||
| 305 | 305 | * |
| 306 | 306 | * @param string $msg |
| 307 | 307 | * @param int $priority One of the Propel::LOG_* logging levels |
| 308 | - * @return boolean |
|
| 308 | + * @return boolean|null |
|
| 309 | 309 | */ |
| 310 | 310 | protected function log($msg, $priority = Propel::LOG_INFO) |
| 311 | 311 | { |
@@ -1028,7 +1028,7 @@ discard block |
||
| 1028 | 1028 | * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. |
| 1029 | 1029 | * The default key type is the column's TableMap::TYPE_PHPNAME. |
| 1030 | 1030 | * |
| 1031 | - * @param mixed $parser A AbstractParser instance, |
|
| 1031 | + * @param string $parser A AbstractParser instance, |
|
| 1032 | 1032 | * or a format name ('XML', 'YAML', 'JSON', 'CSV') |
| 1033 | 1033 | * @param string $data The source data to import from |
| 1034 | 1034 | * @param string $keyType The type of keys the array uses. |
@@ -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 | |
@@ -425,7 +425,7 @@ discard block |
||
| 425 | 425 | * $query->filterByStarted(array('max' => 'yesterday')); // WHERE started > '2011-03-13' |
| 426 | 426 | * </code> |
| 427 | 427 | * |
| 428 | - * @param mixed $started The value to use as filter. |
|
| 428 | + * @param integer $started The value to use as filter. |
|
| 429 | 429 | * Values can be integers (unix timestamps), DateTime objects, or strings. |
| 430 | 430 | * Empty strings are treated as NULL. |
| 431 | 431 | * Use scalar values for equality. |
@@ -490,7 +490,7 @@ discard block |
||
| 490 | 490 | /** |
| 491 | 491 | * Filter the query by a related \Jalle19\StatusManager\Database\Instance object |
| 492 | 492 | * |
| 493 | - * @param \Jalle19\StatusManager\Database\Instance|ObjectCollection $instance The related object(s) to use as filter |
|
| 493 | + * @param Instance $instance The related object(s) to use as filter |
|
| 494 | 494 | * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL |
| 495 | 495 | * |
| 496 | 496 | * @throws \Propel\Runtime\Exception\PropelException |
@@ -567,7 +567,7 @@ discard block |
||
| 567 | 567 | /** |
| 568 | 568 | * Filter the query by a related \Jalle19\StatusManager\Database\User object |
| 569 | 569 | * |
| 570 | - * @param \Jalle19\StatusManager\Database\User|ObjectCollection $user The related object(s) to use as filter |
|
| 570 | + * @param User $user The related object(s) to use as filter |
|
| 571 | 571 | * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL |
| 572 | 572 | * |
| 573 | 573 | * @throws \Propel\Runtime\Exception\PropelException |
@@ -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); |
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | * |
| 315 | 315 | * @param string $msg |
| 316 | 316 | * @param int $priority One of the Propel::LOG_* logging levels |
| 317 | - * @return boolean |
|
| 317 | + * @return boolean|null |
|
| 318 | 318 | */ |
| 319 | 319 | protected function log($msg, $priority = Propel::LOG_INFO) |
| 320 | 320 | { |
@@ -758,7 +758,7 @@ discard block |
||
| 758 | 758 | * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME |
| 759 | 759 | * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. |
| 760 | 760 | * Defaults to TableMap::TYPE_PHPNAME. |
| 761 | - * @return mixed Value of field. |
|
| 761 | + * @return string|null Value of field. |
|
| 762 | 762 | */ |
| 763 | 763 | public function getByName($name, $type = TableMap::TYPE_PHPNAME) |
| 764 | 764 | { |
@@ -773,7 +773,7 @@ discard block |
||
| 773 | 773 | * Zero-based. |
| 774 | 774 | * |
| 775 | 775 | * @param int $pos position in xml schema |
| 776 | - * @return mixed Value of field at $pos |
|
| 776 | + * @return string|null Value of field at $pos |
|
| 777 | 777 | */ |
| 778 | 778 | public function getByPosition($pos) |
| 779 | 779 | { |
@@ -959,7 +959,7 @@ discard block |
||
| 959 | 959 | * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. |
| 960 | 960 | * The default key type is the column's TableMap::TYPE_PHPNAME. |
| 961 | 961 | * |
| 962 | - * @param mixed $parser A AbstractParser instance, |
|
| 962 | + * @param string $parser A AbstractParser instance, |
|
| 963 | 963 | * or a format name ('XML', 'YAML', 'JSON', 'CSV') |
| 964 | 964 | * @param string $data The source data to import from |
| 965 | 965 | * @param string $keyType The type of keys the array uses. |
@@ -369,7 +369,7 @@ discard block |
||
| 369 | 369 | $propertyNames = []; |
| 370 | 370 | $serializableProperties = array_diff($cls->getProperties(), $cls->getProperties(\ReflectionProperty::IS_STATIC)); |
| 371 | 371 | |
| 372 | - foreach($serializableProperties as $property) { |
|
| 372 | + foreach ($serializableProperties as $property) { |
|
| 373 | 373 | $propertyNames[] = $property->getName(); |
| 374 | 374 | } |
| 375 | 375 | |
@@ -545,7 +545,7 @@ discard block |
||
| 545 | 545 | $con = Propel::getServiceContainer()->getWriteConnection(InstanceTableMap::DATABASE_NAME); |
| 546 | 546 | } |
| 547 | 547 | |
| 548 | - $con->transaction(function () use ($con) { |
|
| 548 | + $con->transaction(function() use ($con) { |
|
| 549 | 549 | $deleteQuery = ChildInstanceQuery::create() |
| 550 | 550 | ->filterByPrimaryKey($this->getPrimaryKey()); |
| 551 | 551 | $ret = $this->preDelete($con); |
@@ -580,7 +580,7 @@ discard block |
||
| 580 | 580 | $con = Propel::getServiceContainer()->getWriteConnection(InstanceTableMap::DATABASE_NAME); |
| 581 | 581 | } |
| 582 | 582 | |
| 583 | - return $con->transaction(function () use ($con) { |
|
| 583 | + return $con->transaction(function() use ($con) { |
|
| 584 | 584 | $isInsert = $this->isNew(); |
| 585 | 585 | $ret = $this->preSave($con); |
| 586 | 586 | if ($isInsert) { |
@@ -741,7 +741,7 @@ discard block |
||
| 741 | 741 | |
| 742 | 742 | // check the columns in natural order for more readable SQL queries |
| 743 | 743 | if ($this->isColumnModified(InstanceTableMap::COL_NAME)) { |
| 744 | - $modifiedColumns[':p' . $index++] = 'name'; |
|
| 744 | + $modifiedColumns[':p' . $index++] = 'name'; |
|
| 745 | 745 | } |
| 746 | 746 | |
| 747 | 747 | $sql = sprintf( |
@@ -1281,7 +1281,7 @@ discard block |
||
| 1281 | 1281 | public function getUsers(Criteria $criteria = null, ConnectionInterface $con = null) |
| 1282 | 1282 | { |
| 1283 | 1283 | $partial = $this->collUsersPartial && !$this->isNew(); |
| 1284 | - if (null === $this->collUsers || null !== $criteria || $partial) { |
|
| 1284 | + if (null === $this->collUsers || null !== $criteria || $partial) { |
|
| 1285 | 1285 | if ($this->isNew() && null === $this->collUsers) { |
| 1286 | 1286 | // return empty collection |
| 1287 | 1287 | $this->initUsers(); |
@@ -1419,7 +1419,7 @@ discard block |
||
| 1419 | 1419 | */ |
| 1420 | 1420 | protected function doAddUser(ChildUser $user) |
| 1421 | 1421 | { |
| 1422 | - $this->collUsers[]= $user; |
|
| 1422 | + $this->collUsers[] = $user; |
|
| 1423 | 1423 | $user->setInstance($this); |
| 1424 | 1424 | } |
| 1425 | 1425 | |
@@ -1436,7 +1436,7 @@ discard block |
||
| 1436 | 1436 | $this->usersScheduledForDeletion = clone $this->collUsers; |
| 1437 | 1437 | $this->usersScheduledForDeletion->clear(); |
| 1438 | 1438 | } |
| 1439 | - $this->usersScheduledForDeletion[]= clone $user; |
|
| 1439 | + $this->usersScheduledForDeletion[] = clone $user; |
|
| 1440 | 1440 | $user->setInstance(null); |
| 1441 | 1441 | } |
| 1442 | 1442 | |
@@ -1506,7 +1506,7 @@ discard block |
||
| 1506 | 1506 | public function getConnections(Criteria $criteria = null, ConnectionInterface $con = null) |
| 1507 | 1507 | { |
| 1508 | 1508 | $partial = $this->collConnectionsPartial && !$this->isNew(); |
| 1509 | - if (null === $this->collConnections || null !== $criteria || $partial) { |
|
| 1509 | + if (null === $this->collConnections || null !== $criteria || $partial) { |
|
| 1510 | 1510 | if ($this->isNew() && null === $this->collConnections) { |
| 1511 | 1511 | // return empty collection |
| 1512 | 1512 | $this->initConnections(); |
@@ -1644,7 +1644,7 @@ discard block |
||
| 1644 | 1644 | */ |
| 1645 | 1645 | protected function doAddConnection(ChildConnection $connection) |
| 1646 | 1646 | { |
| 1647 | - $this->collConnections[]= $connection; |
|
| 1647 | + $this->collConnections[] = $connection; |
|
| 1648 | 1648 | $connection->setInstance($this); |
| 1649 | 1649 | } |
| 1650 | 1650 | |
@@ -1661,7 +1661,7 @@ discard block |
||
| 1661 | 1661 | $this->connectionsScheduledForDeletion = clone $this->collConnections; |
| 1662 | 1662 | $this->connectionsScheduledForDeletion->clear(); |
| 1663 | 1663 | } |
| 1664 | - $this->connectionsScheduledForDeletion[]= clone $connection; |
|
| 1664 | + $this->connectionsScheduledForDeletion[] = clone $connection; |
|
| 1665 | 1665 | $connection->setInstance(null); |
| 1666 | 1666 | } |
| 1667 | 1667 | |
@@ -1756,7 +1756,7 @@ discard block |
||
| 1756 | 1756 | public function getInputs(Criteria $criteria = null, ConnectionInterface $con = null) |
| 1757 | 1757 | { |
| 1758 | 1758 | $partial = $this->collInputsPartial && !$this->isNew(); |
| 1759 | - if (null === $this->collInputs || null !== $criteria || $partial) { |
|
| 1759 | + if (null === $this->collInputs || null !== $criteria || $partial) { |
|
| 1760 | 1760 | if ($this->isNew() && null === $this->collInputs) { |
| 1761 | 1761 | // return empty collection |
| 1762 | 1762 | $this->initInputs(); |
@@ -1894,7 +1894,7 @@ discard block |
||
| 1894 | 1894 | */ |
| 1895 | 1895 | protected function doAddInput(ChildInput $input) |
| 1896 | 1896 | { |
| 1897 | - $this->collInputs[]= $input; |
|
| 1897 | + $this->collInputs[] = $input; |
|
| 1898 | 1898 | $input->setInstance($this); |
| 1899 | 1899 | } |
| 1900 | 1900 | |
@@ -1911,7 +1911,7 @@ discard block |
||
| 1911 | 1911 | $this->inputsScheduledForDeletion = clone $this->collInputs; |
| 1912 | 1912 | $this->inputsScheduledForDeletion->clear(); |
| 1913 | 1913 | } |
| 1914 | - $this->inputsScheduledForDeletion[]= clone $input; |
|
| 1914 | + $this->inputsScheduledForDeletion[] = clone $input; |
|
| 1915 | 1915 | $input->setInstance(null); |
| 1916 | 1916 | } |
| 1917 | 1917 | |
@@ -1981,7 +1981,7 @@ discard block |
||
| 1981 | 1981 | public function getChannels(Criteria $criteria = null, ConnectionInterface $con = null) |
| 1982 | 1982 | { |
| 1983 | 1983 | $partial = $this->collChannelsPartial && !$this->isNew(); |
| 1984 | - if (null === $this->collChannels || null !== $criteria || $partial) { |
|
| 1984 | + if (null === $this->collChannels || null !== $criteria || $partial) { |
|
| 1985 | 1985 | if ($this->isNew() && null === $this->collChannels) { |
| 1986 | 1986 | // return empty collection |
| 1987 | 1987 | $this->initChannels(); |
@@ -2119,7 +2119,7 @@ discard block |
||
| 2119 | 2119 | */ |
| 2120 | 2120 | protected function doAddChannel(ChildChannel $channel) |
| 2121 | 2121 | { |
| 2122 | - $this->collChannels[]= $channel; |
|
| 2122 | + $this->collChannels[] = $channel; |
|
| 2123 | 2123 | $channel->setInstance($this); |
| 2124 | 2124 | } |
| 2125 | 2125 | |
@@ -2136,7 +2136,7 @@ discard block |
||
| 2136 | 2136 | $this->channelsScheduledForDeletion = clone $this->collChannels; |
| 2137 | 2137 | $this->channelsScheduledForDeletion->clear(); |
| 2138 | 2138 | } |
| 2139 | - $this->channelsScheduledForDeletion[]= clone $channel; |
|
| 2139 | + $this->channelsScheduledForDeletion[] = clone $channel; |
|
| 2140 | 2140 | $channel->setInstance(null); |
| 2141 | 2141 | } |
| 2142 | 2142 | |
@@ -2206,7 +2206,7 @@ discard block |
||
| 2206 | 2206 | public function getSubscriptions(Criteria $criteria = null, ConnectionInterface $con = null) |
| 2207 | 2207 | { |
| 2208 | 2208 | $partial = $this->collSubscriptionsPartial && !$this->isNew(); |
| 2209 | - if (null === $this->collSubscriptions || null !== $criteria || $partial) { |
|
| 2209 | + if (null === $this->collSubscriptions || null !== $criteria || $partial) { |
|
| 2210 | 2210 | if ($this->isNew() && null === $this->collSubscriptions) { |
| 2211 | 2211 | // return empty collection |
| 2212 | 2212 | $this->initSubscriptions(); |
@@ -2344,7 +2344,7 @@ discard block |
||
| 2344 | 2344 | */ |
| 2345 | 2345 | protected function doAddSubscription(ChildSubscription $subscription) |
| 2346 | 2346 | { |
| 2347 | - $this->collSubscriptions[]= $subscription; |
|
| 2347 | + $this->collSubscriptions[] = $subscription; |
|
| 2348 | 2348 | $subscription->setInstance($this); |
| 2349 | 2349 | } |
| 2350 | 2350 | |
@@ -2361,7 +2361,7 @@ discard block |
||
| 2361 | 2361 | $this->subscriptionsScheduledForDeletion = clone $this->collSubscriptions; |
| 2362 | 2362 | $this->subscriptionsScheduledForDeletion->clear(); |
| 2363 | 2363 | } |
| 2364 | - $this->subscriptionsScheduledForDeletion[]= clone $subscription; |
|
| 2364 | + $this->subscriptionsScheduledForDeletion[] = clone $subscription; |
|
| 2365 | 2365 | $subscription->setInstance(null); |
| 2366 | 2366 | } |
| 2367 | 2367 | |
@@ -138,7 +138,7 @@ |
||
| 138 | 138 | * $obj = $c->findPk(12, $con); |
| 139 | 139 | * </code> |
| 140 | 140 | * |
| 141 | - * @param mixed $key Primary key to use for the query |
|
| 141 | + * @param string $key Primary key to use for the query |
|
| 142 | 142 | * @param ConnectionInterface $con an optional connection object |
| 143 | 143 | * |
| 144 | 144 | * @return ChildInstance|array|mixed the result, formatted by the current formatter |
@@ -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); |
@@ -305,7 +305,7 @@ discard block |
||
| 305 | 305 | * |
| 306 | 306 | * @param string $msg |
| 307 | 307 | * @param int $priority One of the Propel::LOG_* logging levels |
| 308 | - * @return boolean |
|
| 308 | + * @return boolean|null |
|
| 309 | 309 | */ |
| 310 | 310 | protected function log($msg, $priority = Propel::LOG_INFO) |
| 311 | 311 | { |
@@ -1028,7 +1028,7 @@ discard block |
||
| 1028 | 1028 | * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. |
| 1029 | 1029 | * The default key type is the column's TableMap::TYPE_PHPNAME. |
| 1030 | 1030 | * |
| 1031 | - * @param mixed $parser A AbstractParser instance, |
|
| 1031 | + * @param string $parser A AbstractParser instance, |
|
| 1032 | 1032 | * or a format name ('XML', 'YAML', 'JSON', 'CSV') |
| 1033 | 1033 | * @param string $data The source data to import from |
| 1034 | 1034 | * @param string $keyType The type of keys the array uses. |
@@ -385,7 +385,7 @@ discard block |
||
| 385 | 385 | $propertyNames = []; |
| 386 | 386 | $serializableProperties = array_diff($cls->getProperties(), $cls->getProperties(\ReflectionProperty::IS_STATIC)); |
| 387 | 387 | |
| 388 | - foreach($serializableProperties as $property) { |
|
| 388 | + foreach ($serializableProperties as $property) { |
|
| 389 | 389 | $propertyNames[] = $property->getName(); |
| 390 | 390 | } |
| 391 | 391 | |
@@ -900,7 +900,7 @@ discard block |
||
| 900 | 900 | $con = Propel::getServiceContainer()->getWriteConnection(SubscriptionTableMap::DATABASE_NAME); |
| 901 | 901 | } |
| 902 | 902 | |
| 903 | - $con->transaction(function () use ($con) { |
|
| 903 | + $con->transaction(function() use ($con) { |
|
| 904 | 904 | $deleteQuery = ChildSubscriptionQuery::create() |
| 905 | 905 | ->filterByPrimaryKey($this->getPrimaryKey()); |
| 906 | 906 | $ret = $this->preDelete($con); |
@@ -935,7 +935,7 @@ discard block |
||
| 935 | 935 | $con = Propel::getServiceContainer()->getWriteConnection(SubscriptionTableMap::DATABASE_NAME); |
| 936 | 936 | } |
| 937 | 937 | |
| 938 | - return $con->transaction(function () use ($con) { |
|
| 938 | + return $con->transaction(function() use ($con) { |
|
| 939 | 939 | $isInsert = $this->isNew(); |
| 940 | 940 | $ret = $this->preSave($con); |
| 941 | 941 | if ($isInsert) { |
@@ -1278,7 +1278,7 @@ discard block |
||
| 1278 | 1278 | $key = 'Instance'; |
| 1279 | 1279 | } |
| 1280 | 1280 | |
| 1281 | - $result[$key] = $this->aInstance->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); |
|
| 1281 | + $result[$key] = $this->aInstance->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); |
|
| 1282 | 1282 | } |
| 1283 | 1283 | if (null !== $this->aInput) { |
| 1284 | 1284 | |
@@ -1293,7 +1293,7 @@ discard block |
||
| 1293 | 1293 | $key = 'Input'; |
| 1294 | 1294 | } |
| 1295 | 1295 | |
| 1296 | - $result[$key] = $this->aInput->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); |
|
| 1296 | + $result[$key] = $this->aInput->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); |
|
| 1297 | 1297 | } |
| 1298 | 1298 | if (null !== $this->aUser) { |
| 1299 | 1299 | |
@@ -1308,7 +1308,7 @@ discard block |
||
| 1308 | 1308 | $key = 'User'; |
| 1309 | 1309 | } |
| 1310 | 1310 | |
| 1311 | - $result[$key] = $this->aUser->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); |
|
| 1311 | + $result[$key] = $this->aUser->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); |
|
| 1312 | 1312 | } |
| 1313 | 1313 | if (null !== $this->aChannel) { |
| 1314 | 1314 | |
@@ -1323,7 +1323,7 @@ discard block |
||
| 1323 | 1323 | $key = 'Channel'; |
| 1324 | 1324 | } |
| 1325 | 1325 | |
| 1326 | - $result[$key] = $this->aChannel->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); |
|
| 1326 | + $result[$key] = $this->aChannel->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); |
|
| 1327 | 1327 | } |
| 1328 | 1328 | } |
| 1329 | 1329 | |
@@ -305,7 +305,7 @@ discard block |
||
| 305 | 305 | * |
| 306 | 306 | * @param string $msg |
| 307 | 307 | * @param int $priority One of the Propel::LOG_* logging levels |
| 308 | - * @return boolean |
|
| 308 | + * @return boolean|null |
|
| 309 | 309 | */ |
| 310 | 310 | protected function log($msg, $priority = Propel::LOG_INFO) |
| 311 | 311 | { |
@@ -1028,7 +1028,7 @@ discard block |
||
| 1028 | 1028 | * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. |
| 1029 | 1029 | * The default key type is the column's TableMap::TYPE_PHPNAME. |
| 1030 | 1030 | * |
| 1031 | - * @param mixed $parser A AbstractParser instance, |
|
| 1031 | + * @param string $parser A AbstractParser instance, |
|
| 1032 | 1032 | * or a format name ('XML', 'YAML', 'JSON', 'CSV') |
| 1033 | 1033 | * @param string $data The source data to import from |
| 1034 | 1034 | * @param string $keyType The type of keys the array uses. |
@@ -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 | |
@@ -138,7 +138,7 @@ |
||
| 138 | 138 | * $obj = $c->findPk(12, $con); |
| 139 | 139 | * </code> |
| 140 | 140 | * |
| 141 | - * @param mixed $key Primary key to use for the query |
|
| 141 | + * @param integer $key Primary key to use for the query |
|
| 142 | 142 | * @param ConnectionInterface $con an optional connection object |
| 143 | 143 | * |
| 144 | 144 | * @return ChildUser|array|mixed the result, formatted by the current formatter |
@@ -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); |