@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | { |
| 36 | 36 | error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE); |
| 37 | 37 | } |
| 38 | - $whoops->pushHandler(function () { |
|
| 38 | + $whoops->pushHandler(function() { |
|
| 39 | 39 | Response::create('Uh oh, something broke internally.', Response::HTTP_INTERNAL_SERVER_ERROR)->send(); |
| 40 | 40 | }); |
| 41 | 41 | } |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | /** |
| 61 | 61 | * Routes |
| 62 | 62 | */ |
| 63 | -$dispatcher = FastRoute\simpleDispatcher(function (FastRoute\RouteCollector $r) { |
|
| 63 | +$dispatcher = FastRoute\simpleDispatcher(function(FastRoute\RouteCollector $r) { |
|
| 64 | 64 | $routes = require __DIR__ . '/routes.php'; |
| 65 | 65 | foreach ($routes as $route) { |
| 66 | 66 | $r->addRoute($route[0], $route[1], $route[2]); |
@@ -30,8 +30,7 @@ |
||
| 30 | 30 | if (version_compare(PHP_VERSION, '5.3', '>=')) |
| 31 | 31 | { |
| 32 | 32 | error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED); |
| 33 | - } |
|
| 34 | - else |
|
| 33 | + } else |
|
| 35 | 34 | { |
| 36 | 35 | error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE); |
| 37 | 36 | } |
@@ -4,20 +4,20 @@ |
||
| 4 | 4 | $serviceContainer->checkVersion('2.0.0-dev'); |
| 5 | 5 | $serviceContainer->setAdapterClass('default', 'mysql'); |
| 6 | 6 | $manager = new \Propel\Runtime\Connection\ConnectionManagerSingle(); |
| 7 | -$manager->setConfiguration(array ( |
|
| 7 | +$manager->setConfiguration(array( |
|
| 8 | 8 | 'classname' => 'Propel\\Runtime\\Connection\\ProfilerConnectionWrapper', |
| 9 | 9 | 'dsn' => getenv('DB_CONN'), |
| 10 | 10 | 'user' => getenv('DB_USER'), |
| 11 | 11 | 'password' => getenv('DB_PASS'), |
| 12 | 12 | 'attributes' => |
| 13 | - array ( |
|
| 13 | + array( |
|
| 14 | 14 | 'ATTR_EMULATE_PREPARES' => false, |
| 15 | 15 | ), |
| 16 | 16 | 'settings' => |
| 17 | - array ( |
|
| 17 | + array( |
|
| 18 | 18 | 'charset' => 'utf8', |
| 19 | 19 | 'queries' => |
| 20 | - array ( |
|
| 20 | + array( |
|
| 21 | 21 | 'utf8' => 'SET NAMES utf8 COLLATE utf8_unicode_ci, COLLATION_CONNECTION = utf8_unicode_ci, COLLATION_DATABASE = utf8_unicode_ci, COLLATION_SERVER = utf8_unicode_ci', |
| 22 | 22 | ), |
| 23 | 23 | ), |
@@ -4,22 +4,22 @@ |
||
| 4 | 4 | $serviceContainer->setAdapterClass('default', 'mysql'); |
| 5 | 5 | $manager = new \Propel\Runtime\Connection\ConnectionManagerSingle(); |
| 6 | 6 | $manager->setConfiguration(array ( |
| 7 | - 'classname' => 'Propel\\Runtime\\Connection\\ProfilerConnectionWrapper', |
|
| 8 | - 'dsn' => 'mysql:host=localhost:3336;dbname=homestead', |
|
| 9 | - 'user' => 'root', |
|
| 10 | - 'password' => '319114', |
|
| 11 | - 'attributes' => |
|
| 12 | - array ( |
|
| 7 | + 'classname' => 'Propel\\Runtime\\Connection\\ProfilerConnectionWrapper', |
|
| 8 | + 'dsn' => 'mysql:host=localhost:3336;dbname=homestead', |
|
| 9 | + 'user' => 'root', |
|
| 10 | + 'password' => '319114', |
|
| 11 | + 'attributes' => |
|
| 12 | + array ( |
|
| 13 | 13 | 'ATTR_EMULATE_PREPARES' => false, |
| 14 | - ), |
|
| 15 | - 'settings' => |
|
| 16 | - array ( |
|
| 14 | + ), |
|
| 15 | + 'settings' => |
|
| 16 | + array ( |
|
| 17 | 17 | 'charset' => 'utf8', |
| 18 | 18 | 'queries' => |
| 19 | 19 | array ( |
| 20 | - 'utf8' => 'SET NAMES utf8 COLLATE utf8_unicode_ci, COLLATION_CONNECTION = utf8_unicode_ci, COLLATION_DATABASE = utf8_unicode_ci, COLLATION_SERVER = utf8_unicode_ci', |
|
| 20 | + 'utf8' => 'SET NAMES utf8 COLLATE utf8_unicode_ci, COLLATION_CONNECTION = utf8_unicode_ci, COLLATION_DATABASE = utf8_unicode_ci, COLLATION_SERVER = utf8_unicode_ci', |
|
| 21 | + ), |
|
| 21 | 22 | ), |
| 22 | - ), |
|
| 23 | 23 | )); |
| 24 | 24 | $manager->setName('default'); |
| 25 | 25 | $serviceContainer->setConnectionManager('default', $manager); |
@@ -4,9 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Symfony\Component\HttpFoundation\Response; |
| 6 | 6 | use Twig_Environment; |
| 7 | -use Models\User\Base\UserQuery; |
|
| 8 | -use Symfony\Component\VarDumper\VarDumper; |
|
| 9 | - |
|
| 10 | 7 | use Models\User\UserRepo; |
| 11 | 8 | |
| 12 | 9 | class IndexController |
@@ -62,7 +62,7 @@ |
||
| 62 | 62 | $i++; |
| 63 | 63 | } |
| 64 | 64 | |
| 65 | - return new Response($this->twig->render('pages/index.html.twig',[ |
|
| 65 | + return new Response($this->twig->render('pages/index.html.twig', [ |
|
| 66 | 66 | "table" => $table->render() |
| 67 | 67 | ])); |
| 68 | 68 | } |
@@ -289,7 +289,7 @@ discard block |
||
| 289 | 289 | * |
| 290 | 290 | * @param string $msg |
| 291 | 291 | * @param int $priority One of the Propel::LOG_* logging levels |
| 292 | - * @return boolean |
|
| 292 | + * @return boolean|null |
|
| 293 | 293 | */ |
| 294 | 294 | protected function log($msg, $priority = Propel::LOG_INFO) |
| 295 | 295 | { |
@@ -1132,7 +1132,7 @@ discard block |
||
| 1132 | 1132 | * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. |
| 1133 | 1133 | * The default key type is the column's TableMap::TYPE_PHPNAME. |
| 1134 | 1134 | * |
| 1135 | - * @param mixed $parser A AbstractParser instance, |
|
| 1135 | + * @param string $parser A AbstractParser instance, |
|
| 1136 | 1136 | * or a format name ('XML', 'YAML', 'JSON', 'CSV') |
| 1137 | 1137 | * @param string $data The source data to import from |
| 1138 | 1138 | * @param string $keyType The type of keys the array uses. |
@@ -11,7 +11,6 @@ |
||
| 11 | 11 | use Propel\Runtime\ActiveQuery\Criteria; |
| 12 | 12 | use Propel\Runtime\ActiveQuery\ModelCriteria; |
| 13 | 13 | use Propel\Runtime\ActiveRecord\ActiveRecordInterface; |
| 14 | -use Propel\Runtime\Collection\Collection; |
|
| 15 | 14 | use Propel\Runtime\Connection\ConnectionInterface; |
| 16 | 15 | use Propel\Runtime\Exception\BadMethodCallException; |
| 17 | 16 | use Propel\Runtime\Exception\LogicException; |
@@ -824,7 +824,7 @@ discard block |
||
| 824 | 824 | throw new PropelException('Cannot insert a value for auto-increment primary key (' . UserTableMap::COL_ID . ')'); |
| 825 | 825 | } |
| 826 | 826 | |
| 827 | - // check the columns in natural order for more readable SQL queries |
|
| 827 | + // check the columns in natural order for more readable SQL queries |
|
| 828 | 828 | if ($this->isColumnModified(UserTableMap::COL_ID)) { |
| 829 | 829 | $modifiedColumns[':p' . $index++] = 'id'; |
| 830 | 830 | } |
@@ -1120,25 +1120,25 @@ discard block |
||
| 1120 | 1120 | } |
| 1121 | 1121 | } |
| 1122 | 1122 | |
| 1123 | - /** |
|
| 1124 | - * Populate the current object from a string, using a given parser format |
|
| 1125 | - * <code> |
|
| 1126 | - * $book = new Book(); |
|
| 1127 | - * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); |
|
| 1128 | - * </code> |
|
| 1129 | - * |
|
| 1130 | - * You can specify the key type of the array by additionally passing one |
|
| 1131 | - * of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME, |
|
| 1132 | - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. |
|
| 1133 | - * The default key type is the column's TableMap::TYPE_PHPNAME. |
|
| 1134 | - * |
|
| 1135 | - * @param mixed $parser A AbstractParser instance, |
|
| 1136 | - * or a format name ('XML', 'YAML', 'JSON', 'CSV') |
|
| 1137 | - * @param string $data The source data to import from |
|
| 1138 | - * @param string $keyType The type of keys the array uses. |
|
| 1139 | - * |
|
| 1140 | - * @return $this|\Models\User\User The current object, for fluid interface |
|
| 1141 | - */ |
|
| 1123 | + /** |
|
| 1124 | + * Populate the current object from a string, using a given parser format |
|
| 1125 | + * <code> |
|
| 1126 | + * $book = new Book(); |
|
| 1127 | + * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); |
|
| 1128 | + * </code> |
|
| 1129 | + * |
|
| 1130 | + * You can specify the key type of the array by additionally passing one |
|
| 1131 | + * of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME, |
|
| 1132 | + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. |
|
| 1133 | + * The default key type is the column's TableMap::TYPE_PHPNAME. |
|
| 1134 | + * |
|
| 1135 | + * @param mixed $parser A AbstractParser instance, |
|
| 1136 | + * or a format name ('XML', 'YAML', 'JSON', 'CSV') |
|
| 1137 | + * @param string $data The source data to import from |
|
| 1138 | + * @param string $keyType The type of keys the array uses. |
|
| 1139 | + * |
|
| 1140 | + * @return $this|\Models\User\User The current object, for fluid interface |
|
| 1141 | + */ |
|
| 1142 | 1142 | public function importFrom($parser, $data, $keyType = TableMap::TYPE_PHPNAME) |
| 1143 | 1143 | { |
| 1144 | 1144 | if (!$parser instanceof AbstractParser) { |
@@ -711,7 +711,7 @@ discard block |
||
| 711 | 711 | $con = Propel::getServiceContainer()->getWriteConnection(UserTableMap::DATABASE_NAME); |
| 712 | 712 | } |
| 713 | 713 | |
| 714 | - $con->transaction(function () use ($con) { |
|
| 714 | + $con->transaction(function() use ($con) { |
|
| 715 | 715 | $deleteQuery = ChildUserQuery::create() |
| 716 | 716 | ->filterByPrimaryKey($this->getPrimaryKey()); |
| 717 | 717 | $ret = $this->preDelete($con); |
@@ -746,7 +746,7 @@ discard block |
||
| 746 | 746 | $con = Propel::getServiceContainer()->getWriteConnection(UserTableMap::DATABASE_NAME); |
| 747 | 747 | } |
| 748 | 748 | |
| 749 | - return $con->transaction(function () use ($con) { |
|
| 749 | + return $con->transaction(function() use ($con) { |
|
| 750 | 750 | $isInsert = $this->isNew(); |
| 751 | 751 | $ret = $this->preSave($con); |
| 752 | 752 | if ($isInsert) { |
@@ -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', 'CreatedAt', 'UpdatedAt', ), |
|
| 102 | - self::TYPE_CAMELNAME => array('id', 'createdAt', 'updatedAt', ), |
|
| 103 | - self::TYPE_COLNAME => array(TaskTableMap::COL_ID, TaskTableMap::COL_CREATED_AT, TaskTableMap::COL_UPDATED_AT, ), |
|
| 104 | - self::TYPE_FIELDNAME => array('id', 'created_at', 'updated_at', ), |
|
| 105 | - self::TYPE_NUM => array(0, 1, 2, ) |
|
| 100 | + protected static $fieldNames = array( |
|
| 101 | + self::TYPE_PHPNAME => array('Id', 'CreatedAt', 'UpdatedAt',), |
|
| 102 | + self::TYPE_CAMELNAME => array('id', 'createdAt', 'updatedAt',), |
|
| 103 | + self::TYPE_COLNAME => array(TaskTableMap::COL_ID, TaskTableMap::COL_CREATED_AT, TaskTableMap::COL_UPDATED_AT,), |
|
| 104 | + self::TYPE_FIELDNAME => array('id', 'created_at', 'updated_at',), |
|
| 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, 'CreatedAt' => 1, 'UpdatedAt' => 2, ), |
|
| 116 | - self::TYPE_CAMELNAME => array('id' => 0, 'createdAt' => 1, 'updatedAt' => 2, ), |
|
| 117 | - self::TYPE_COLNAME => array(TaskTableMap::COL_ID => 0, TaskTableMap::COL_CREATED_AT => 1, TaskTableMap::COL_UPDATED_AT => 2, ), |
|
| 118 | - self::TYPE_FIELDNAME => array('id' => 0, 'created_at' => 1, 'updated_at' => 2, ), |
|
| 119 | - self::TYPE_NUM => array(0, 1, 2, ) |
|
| 114 | + protected static $fieldKeys = array( |
|
| 115 | + self::TYPE_PHPNAME => array('Id' => 0, 'CreatedAt' => 1, 'UpdatedAt' => 2,), |
|
| 116 | + self::TYPE_CAMELNAME => array('id' => 0, 'createdAt' => 1, 'updatedAt' => 2,), |
|
| 117 | + self::TYPE_COLNAME => array(TaskTableMap::COL_ID => 0, TaskTableMap::COL_CREATED_AT => 1, TaskTableMap::COL_UPDATED_AT => 2,), |
|
| 118 | + self::TYPE_FIELDNAME => array('id' => 0, 'created_at' => 1, 'updated_at' => 2,), |
|
| 119 | + self::TYPE_NUM => array(0, 1, 2,) |
|
| 120 | 120 | ); |
| 121 | 121 | |
| 122 | 122 | /** |
@@ -395,8 +395,8 @@ discard block |
||
| 395 | 395 | $criteria = $criteria->buildCriteria(); // build Criteria from Task object |
| 396 | 396 | } |
| 397 | 397 | |
| 398 | - if ($criteria->containsKey(TaskTableMap::COL_ID) && $criteria->keyContainsValue(TaskTableMap::COL_ID) ) { |
|
| 399 | - throw new PropelException('Cannot insert a value for auto-increment primary key ('.TaskTableMap::COL_ID.')'); |
|
| 398 | + if ($criteria->containsKey(TaskTableMap::COL_ID) && $criteria->keyContainsValue(TaskTableMap::COL_ID)) { |
|
| 399 | + throw new PropelException('Cannot insert a value for auto-increment primary key (' . TaskTableMap::COL_ID . ')'); |
|
| 400 | 400 | } |
| 401 | 401 | |
| 402 | 402 | |
@@ -405,7 +405,7 @@ discard block |
||
| 405 | 405 | |
| 406 | 406 | // use transaction because $criteria could contain info |
| 407 | 407 | // for more than one table (I guess, conceivably) |
| 408 | - return $con->transaction(function () use ($con, $query) { |
|
| 408 | + return $con->transaction(function() use ($con, $query) { |
|
| 409 | 409 | return $query->doInsert($con); |
| 410 | 410 | }); |
| 411 | 411 | } |
@@ -365,8 +365,8 @@ |
||
| 365 | 365 | * @throws PropelException Any exceptions caught during processing will be |
| 366 | 366 | * rethrown wrapped into a PropelException. |
| 367 | 367 | */ |
| 368 | - public static function doDelete($values, ConnectionInterface $con = null) |
|
| 369 | - { |
|
| 368 | + public static function doDelete($values, ConnectionInterface $con = null) |
|
| 369 | + { |
|
| 370 | 370 | if (null === $con) { |
| 371 | 371 | $con = Propel::getServiceContainer()->getWriteConnection(UserTableMap::DATABASE_NAME); |
| 372 | 372 | } |
@@ -668,7 +668,7 @@ discard block |
||
| 668 | 668 | throw new PropelException('Cannot insert a value for auto-increment primary key (' . TaskTableMap::COL_ID . ')'); |
| 669 | 669 | } |
| 670 | 670 | |
| 671 | - // check the columns in natural order for more readable SQL queries |
|
| 671 | + // check the columns in natural order for more readable SQL queries |
|
| 672 | 672 | if ($this->isColumnModified(TaskTableMap::COL_ID)) { |
| 673 | 673 | $modifiedColumns[':p' . $index++] = 'id'; |
| 674 | 674 | } |
@@ -900,25 +900,25 @@ discard block |
||
| 900 | 900 | } |
| 901 | 901 | } |
| 902 | 902 | |
| 903 | - /** |
|
| 904 | - * Populate the current object from a string, using a given parser format |
|
| 905 | - * <code> |
|
| 906 | - * $book = new Book(); |
|
| 907 | - * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); |
|
| 908 | - * </code> |
|
| 909 | - * |
|
| 910 | - * You can specify the key type of the array by additionally passing one |
|
| 911 | - * of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME, |
|
| 912 | - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. |
|
| 913 | - * The default key type is the column's TableMap::TYPE_PHPNAME. |
|
| 914 | - * |
|
| 915 | - * @param mixed $parser A AbstractParser instance, |
|
| 916 | - * or a format name ('XML', 'YAML', 'JSON', 'CSV') |
|
| 917 | - * @param string $data The source data to import from |
|
| 918 | - * @param string $keyType The type of keys the array uses. |
|
| 919 | - * |
|
| 920 | - * @return $this|\Models\Task\Task The current object, for fluid interface |
|
| 921 | - */ |
|
| 903 | + /** |
|
| 904 | + * Populate the current object from a string, using a given parser format |
|
| 905 | + * <code> |
|
| 906 | + * $book = new Book(); |
|
| 907 | + * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); |
|
| 908 | + * </code> |
|
| 909 | + * |
|
| 910 | + * You can specify the key type of the array by additionally passing one |
|
| 911 | + * of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME, |
|
| 912 | + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. |
|
| 913 | + * The default key type is the column's TableMap::TYPE_PHPNAME. |
|
| 914 | + * |
|
| 915 | + * @param mixed $parser A AbstractParser instance, |
|
| 916 | + * or a format name ('XML', 'YAML', 'JSON', 'CSV') |
|
| 917 | + * @param string $data The source data to import from |
|
| 918 | + * @param string $keyType The type of keys the array uses. |
|
| 919 | + * |
|
| 920 | + * @return $this|\Models\Task\Task The current object, for fluid interface |
|
| 921 | + */ |
|
| 922 | 922 | public function importFrom($parser, $data, $keyType = TableMap::TYPE_PHPNAME) |
| 923 | 923 | { |
| 924 | 924 | if (!$parser instanceof AbstractParser) { |
@@ -289,7 +289,7 @@ discard block |
||
| 289 | 289 | * |
| 290 | 290 | * @param string $msg |
| 291 | 291 | * @param int $priority One of the Propel::LOG_* logging levels |
| 292 | - * @return boolean |
|
| 292 | + * @return boolean|null |
|
| 293 | 293 | */ |
| 294 | 294 | protected function log($msg, $priority = Propel::LOG_INFO) |
| 295 | 295 | { |
@@ -1132,7 +1132,7 @@ discard block |
||
| 1132 | 1132 | * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. |
| 1133 | 1133 | * The default key type is the column's TableMap::TYPE_PHPNAME. |
| 1134 | 1134 | * |
| 1135 | - * @param mixed $parser A AbstractParser instance, |
|
| 1135 | + * @param string $parser A AbstractParser instance, |
|
| 1136 | 1136 | * or a format name ('XML', 'YAML', 'JSON', 'CSV') |
| 1137 | 1137 | * @param string $data The source data to import from |
| 1138 | 1138 | * @param string $keyType The type of keys the array uses. |
@@ -11,7 +11,6 @@ |
||
| 11 | 11 | use Propel\Runtime\ActiveQuery\Criteria; |
| 12 | 12 | use Propel\Runtime\ActiveQuery\ModelCriteria; |
| 13 | 13 | use Propel\Runtime\ActiveRecord\ActiveRecordInterface; |
| 14 | -use Propel\Runtime\Collection\Collection; |
|
| 15 | 14 | use Propel\Runtime\Connection\ConnectionInterface; |
| 16 | 15 | use Propel\Runtime\Exception\BadMethodCallException; |
| 17 | 16 | use Propel\Runtime\Exception\LogicException; |
@@ -711,7 +711,7 @@ discard block |
||
| 711 | 711 | $con = Propel::getServiceContainer()->getWriteConnection(UserTableMap::DATABASE_NAME); |
| 712 | 712 | } |
| 713 | 713 | |
| 714 | - $con->transaction(function () use ($con) { |
|
| 714 | + $con->transaction(function() use ($con) { |
|
| 715 | 715 | $deleteQuery = ChildUserQuery::create() |
| 716 | 716 | ->filterByPrimaryKey($this->getPrimaryKey()); |
| 717 | 717 | $ret = $this->preDelete($con); |
@@ -746,7 +746,7 @@ discard block |
||
| 746 | 746 | $con = Propel::getServiceContainer()->getWriteConnection(UserTableMap::DATABASE_NAME); |
| 747 | 747 | } |
| 748 | 748 | |
| 749 | - return $con->transaction(function () use ($con) { |
|
| 749 | + return $con->transaction(function() use ($con) { |
|
| 750 | 750 | $isInsert = $this->isNew(); |
| 751 | 751 | $ret = $this->preSave($con); |
| 752 | 752 | if ($isInsert) { |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | public function findById($id) |
| 30 | 30 | { |
| 31 | 31 | if (!$User = UserQuery::create()->findPk($id)) { |
| 32 | - throw new \InvalidArgumentException(sprintf('User with ID %d does not exist',$id)); |
|
| 32 | + throw new \InvalidArgumentException(sprintf('User with ID %d does not exist', $id)); |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | return $User; |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | public function save(ActiveRecordInterface $Model) |
| 55 | 55 | { |
| 56 | 56 | if (!$Model->save()) { |
| 57 | - throw new \DomainException(sprintf('User not save',$id)); |
|
| 57 | + throw new \DomainException(sprintf('User not save', $id)); |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | return true; |
@@ -365,8 +365,8 @@ |
||
| 365 | 365 | * @throws PropelException Any exceptions caught during processing will be |
| 366 | 366 | * rethrown wrapped into a PropelException. |
| 367 | 367 | */ |
| 368 | - public static function doDelete($values, ConnectionInterface $con = null) |
|
| 369 | - { |
|
| 368 | + public static function doDelete($values, ConnectionInterface $con = null) |
|
| 369 | + { |
|
| 370 | 370 | if (null === $con) { |
| 371 | 371 | $con = Propel::getServiceContainer()->getWriteConnection(UserTableMap::DATABASE_NAME); |
| 372 | 372 | } |
@@ -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('Id', 'Name', 'Email', 'Password', 'RememberToken', 'CreatedAt', 'UpdatedAt', ), |
|
| 122 | - self::TYPE_CAMELNAME => array('id', 'name', 'email', 'password', 'rememberToken', 'createdAt', 'updatedAt', ), |
|
| 123 | - self::TYPE_COLNAME => array(UserTableMap::COL_ID, UserTableMap::COL_NAME, UserTableMap::COL_EMAIL, UserTableMap::COL_PASSWORD, UserTableMap::COL_REMEMBER_TOKEN, UserTableMap::COL_CREATED_AT, UserTableMap::COL_UPDATED_AT, ), |
|
| 124 | - self::TYPE_FIELDNAME => array('id', 'name', 'email', 'password', 'remember_token', 'created_at', 'updated_at', ), |
|
| 125 | - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, ) |
|
| 120 | + protected static $fieldNames = array( |
|
| 121 | + self::TYPE_PHPNAME => array('Id', 'Name', 'Email', 'Password', 'RememberToken', 'CreatedAt', 'UpdatedAt',), |
|
| 122 | + self::TYPE_CAMELNAME => array('id', 'name', 'email', 'password', 'rememberToken', 'createdAt', 'updatedAt',), |
|
| 123 | + self::TYPE_COLNAME => array(UserTableMap::COL_ID, UserTableMap::COL_NAME, UserTableMap::COL_EMAIL, UserTableMap::COL_PASSWORD, UserTableMap::COL_REMEMBER_TOKEN, UserTableMap::COL_CREATED_AT, UserTableMap::COL_UPDATED_AT,), |
|
| 124 | + self::TYPE_FIELDNAME => array('id', 'name', 'email', 'password', 'remember_token', 'created_at', 'updated_at',), |
|
| 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('Id' => 0, 'Name' => 1, 'Email' => 2, 'Password' => 3, 'RememberToken' => 4, 'CreatedAt' => 5, 'UpdatedAt' => 6, ), |
|
| 136 | - self::TYPE_CAMELNAME => array('id' => 0, 'name' => 1, 'email' => 2, 'password' => 3, 'rememberToken' => 4, 'createdAt' => 5, 'updatedAt' => 6, ), |
|
| 137 | - self::TYPE_COLNAME => array(UserTableMap::COL_ID => 0, UserTableMap::COL_NAME => 1, UserTableMap::COL_EMAIL => 2, UserTableMap::COL_PASSWORD => 3, UserTableMap::COL_REMEMBER_TOKEN => 4, UserTableMap::COL_CREATED_AT => 5, UserTableMap::COL_UPDATED_AT => 6, ), |
|
| 138 | - self::TYPE_FIELDNAME => array('id' => 0, 'name' => 1, 'email' => 2, 'password' => 3, 'remember_token' => 4, 'created_at' => 5, 'updated_at' => 6, ), |
|
| 139 | - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, ) |
|
| 134 | + protected static $fieldKeys = array( |
|
| 135 | + self::TYPE_PHPNAME => array('Id' => 0, 'Name' => 1, 'Email' => 2, 'Password' => 3, 'RememberToken' => 4, 'CreatedAt' => 5, 'UpdatedAt' => 6,), |
|
| 136 | + self::TYPE_CAMELNAME => array('id' => 0, 'name' => 1, 'email' => 2, 'password' => 3, 'rememberToken' => 4, 'createdAt' => 5, 'updatedAt' => 6,), |
|
| 137 | + self::TYPE_COLNAME => array(UserTableMap::COL_ID => 0, UserTableMap::COL_NAME => 1, UserTableMap::COL_EMAIL => 2, UserTableMap::COL_PASSWORD => 3, UserTableMap::COL_REMEMBER_TOKEN => 4, UserTableMap::COL_CREATED_AT => 5, UserTableMap::COL_UPDATED_AT => 6,), |
|
| 138 | + self::TYPE_FIELDNAME => array('id' => 0, 'name' => 1, 'email' => 2, 'password' => 3, 'remember_token' => 4, 'created_at' => 5, 'updated_at' => 6,), |
|
| 139 | + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6,) |
|
| 140 | 140 | ); |
| 141 | 141 | |
| 142 | 142 | /** |
@@ -427,8 +427,8 @@ discard block |
||
| 427 | 427 | $criteria = $criteria->buildCriteria(); // build Criteria from User object |
| 428 | 428 | } |
| 429 | 429 | |
| 430 | - if ($criteria->containsKey(UserTableMap::COL_ID) && $criteria->keyContainsValue(UserTableMap::COL_ID) ) { |
|
| 431 | - throw new PropelException('Cannot insert a value for auto-increment primary key ('.UserTableMap::COL_ID.')'); |
|
| 430 | + if ($criteria->containsKey(UserTableMap::COL_ID) && $criteria->keyContainsValue(UserTableMap::COL_ID)) { |
|
| 431 | + throw new PropelException('Cannot insert a value for auto-increment primary key (' . UserTableMap::COL_ID . ')'); |
|
| 432 | 432 | } |
| 433 | 433 | |
| 434 | 434 | |
@@ -437,7 +437,7 @@ discard block |
||
| 437 | 437 | |
| 438 | 438 | // use transaction because $criteria could contain info |
| 439 | 439 | // for more than one table (I guess, conceivably) |
| 440 | - return $con->transaction(function () use ($con, $query) { |
|
| 440 | + return $con->transaction(function() use ($con, $query) { |
|
| 441 | 441 | return $query->doInsert($con); |
| 442 | 442 | }); |
| 443 | 443 | } |
@@ -49,7 +49,6 @@ |
||
| 49 | 49 | * @method ChildUser findOneByRememberToken(string $remember_token) Return the first ChildUser filtered by the remember_token column |
| 50 | 50 | * @method ChildUser findOneByCreatedAt(string $created_at) Return the first ChildUser filtered by the created_at column |
| 51 | 51 | * @method ChildUser findOneByUpdatedAt(string $updated_at) Return the first ChildUser filtered by the updated_at column * |
| 52 | - |
|
| 53 | 52 | * @method ChildUser requirePk($key, ConnectionInterface $con = null) Return the ChildUser by primary key and throws \Propel\Runtime\Exception\EntityNotFoundException when not found |
| 54 | 53 | * @method ChildUser requireOne(ConnectionInterface $con = null) Return the first ChildUser matching the query and throws \Propel\Runtime\Exception\EntityNotFoundException when not found |
| 55 | 54 | * |
@@ -524,7 +524,7 @@ discard block |
||
| 524 | 524 | |
| 525 | 525 | // use transaction because $criteria could contain info |
| 526 | 526 | // for more than one table or we could emulating ON DELETE CASCADE, etc. |
| 527 | - return $con->transaction(function () use ($con) { |
|
| 527 | + return $con->transaction(function() use ($con) { |
|
| 528 | 528 | $affectedRows = 0; // initialize var to track total num of affected rows |
| 529 | 529 | $affectedRows += parent::doDeleteAll($con); |
| 530 | 530 | // Because this db requires some delete cascade/set null emulation, we have to |
@@ -559,7 +559,7 @@ discard block |
||
| 559 | 559 | |
| 560 | 560 | // use transaction because $criteria could contain info |
| 561 | 561 | // for more than one table or we could emulating ON DELETE CASCADE, etc. |
| 562 | - return $con->transaction(function () use ($con, $criteria) { |
|
| 562 | + return $con->transaction(function() use ($con, $criteria) { |
|
| 563 | 563 | $affectedRows = 0; // initialize var to track total num of affected rows |
| 564 | 564 | |
| 565 | 565 | UserTableMap::removeInstanceFromPool($criteria); |