@@ -76,9 +76,9 @@ |
||
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | /** |
| 79 | - * @param mixed $model |
|
| 79 | + * @param \keeko\core\model\Group $model |
|
| 80 | 80 | * @param mixed $data |
| 81 | - * @return mixed The model |
|
| 81 | + * @return \keeko\core\model\Group The model |
|
| 82 | 82 | */ |
| 83 | 83 | public function hydrate($model, $data) { |
| 84 | 84 | // attributes |
@@ -85,9 +85,9 @@ |
||
| 85 | 85 | } |
| 86 | 86 | |
| 87 | 87 | /** |
| 88 | - * @param mixed $model |
|
| 88 | + * @param Localization $model |
|
| 89 | 89 | * @param mixed $data |
| 90 | - * @return mixed The model |
|
| 90 | + * @return Localization The model |
|
| 91 | 91 | */ |
| 92 | 92 | public function hydrate($model, $data) { |
| 93 | 93 | // attributes |
@@ -62,9 +62,9 @@ |
||
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | /** |
| 65 | - * @param mixed $model |
|
| 65 | + * @param \keeko\core\model\Module $model |
|
| 66 | 66 | * @param mixed $data |
| 67 | - * @return mixed The model |
|
| 67 | + * @return \keeko\core\model\Module The model |
|
| 68 | 68 | */ |
| 69 | 69 | public function hydrate($model, $data) { |
| 70 | 70 | // attributes |
@@ -55,9 +55,9 @@ |
||
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | /** |
| 58 | - * @param mixed $model |
|
| 58 | + * @param \keeko\core\model\Preference $model |
|
| 59 | 59 | * @param mixed $data |
| 60 | - * @return mixed The model |
|
| 60 | + * @return \keeko\core\model\Preference The model |
|
| 61 | 61 | */ |
| 62 | 62 | public function hydrate($model, $data) { |
| 63 | 63 | // attributes |
@@ -66,9 +66,9 @@ |
||
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | /** |
| 69 | - * @param mixed $model |
|
| 69 | + * @param \keeko\core\model\Session $model |
|
| 70 | 70 | * @param mixed $data |
| 71 | - * @return mixed The model |
|
| 71 | + * @return \keeko\core\model\Session The model |
|
| 72 | 72 | */ |
| 73 | 73 | public function hydrate($model, $data) { |
| 74 | 74 | // attributes |
@@ -78,9 +78,9 @@ |
||
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | /** |
| 81 | - * @param mixed $model |
|
| 81 | + * @param \keeko\core\model\User $model |
|
| 82 | 82 | * @param mixed $data |
| 83 | - * @return mixed The model |
|
| 83 | + * @return \keeko\core\model\User The model |
|
| 84 | 84 | */ |
| 85 | 85 | public function hydrate($model, $data) { |
| 86 | 86 | // attributes |
@@ -99,7 +99,7 @@ |
||
| 99 | 99 | $attribs = isset($data['attributes']) ? $data['attributes'] : []; |
| 100 | 100 | |
| 101 | 101 | $service = $this->getServiceContainer(); |
| 102 | - $model = HydrateUtils::hydrate($attribs, $model, ['id', 'user-name', 'password' => function ($value) use ($service) { |
|
| 102 | + $model = HydrateUtils::hydrate($attribs, $model, ['id', 'user-name', 'password' => function($value) use ($service) { |
|
| 103 | 103 | if (class_exists('keeko\core\normalizer\PasswordNormalizer')) { |
| 104 | 104 | $normalizer = new keeko\core\normalizer\PasswordNormalizer(); |
| 105 | 105 | $normalizer->setServiceContainer($service); |
@@ -3,7 +3,7 @@ |
||
| 3 | 3 | $serviceContainer->checkVersion('2.0.0-dev'); |
| 4 | 4 | $serviceContainer->setAdapterClass('keeko', 'mysql'); |
| 5 | 5 | $manager = new \Propel\Runtime\Connection\ConnectionManagerSingle(); |
| 6 | -$manager->setConfiguration(array ( |
|
| 6 | +$manager->setConfiguration(array( |
|
| 7 | 7 | 'dsn' => 'mysql:host=localhost;dbname=keeko', |
| 8 | 8 | 'user' => 'root', |
| 9 | 9 | 'password' => '', |
@@ -7,37 +7,37 @@ discard block |
||
| 7 | 7 | */ |
| 8 | 8 | class PropelMigration_1463151118 |
| 9 | 9 | { |
| 10 | - public $comment = ''; |
|
| 11 | - |
|
| 12 | - public function preUp($manager) |
|
| 13 | - { |
|
| 14 | - // add the pre-migration code here |
|
| 15 | - } |
|
| 16 | - |
|
| 17 | - public function postUp($manager) |
|
| 18 | - { |
|
| 19 | - // add the post-migration code here |
|
| 20 | - } |
|
| 21 | - |
|
| 22 | - public function preDown($manager) |
|
| 23 | - { |
|
| 24 | - // add the pre-migration code here |
|
| 25 | - } |
|
| 26 | - |
|
| 27 | - public function postDown($manager) |
|
| 28 | - { |
|
| 29 | - // add the post-migration code here |
|
| 30 | - } |
|
| 31 | - |
|
| 32 | - /** |
|
| 33 | - * Get the SQL statements for the Up migration |
|
| 34 | - * |
|
| 35 | - * @return array list of the SQL strings to execute for the Up migration |
|
| 36 | - * the keys being the datasources |
|
| 37 | - */ |
|
| 38 | - public function getUpSQL() |
|
| 39 | - { |
|
| 40 | - return array ( |
|
| 10 | + public $comment = ''; |
|
| 11 | + |
|
| 12 | + public function preUp($manager) |
|
| 13 | + { |
|
| 14 | + // add the pre-migration code here |
|
| 15 | + } |
|
| 16 | + |
|
| 17 | + public function postUp($manager) |
|
| 18 | + { |
|
| 19 | + // add the post-migration code here |
|
| 20 | + } |
|
| 21 | + |
|
| 22 | + public function preDown($manager) |
|
| 23 | + { |
|
| 24 | + // add the pre-migration code here |
|
| 25 | + } |
|
| 26 | + |
|
| 27 | + public function postDown($manager) |
|
| 28 | + { |
|
| 29 | + // add the post-migration code here |
|
| 30 | + } |
|
| 31 | + |
|
| 32 | + /** |
|
| 33 | + * Get the SQL statements for the Up migration |
|
| 34 | + * |
|
| 35 | + * @return array list of the SQL strings to execute for the Up migration |
|
| 36 | + * the keys being the datasources |
|
| 37 | + */ |
|
| 38 | + public function getUpSQL() |
|
| 39 | + { |
|
| 40 | + return array ( |
|
| 41 | 41 | 'keeko' => ' |
| 42 | 42 | # This is a fix for InnoDB in MySQL >= 4.1.x |
| 43 | 43 | # It "suspends judgement" for fkey relationships until are tables are set. |
@@ -105,17 +105,17 @@ discard block |
||
| 105 | 105 | SET FOREIGN_KEY_CHECKS = 1; |
| 106 | 106 | ', |
| 107 | 107 | ); |
| 108 | - } |
|
| 109 | - |
|
| 110 | - /** |
|
| 111 | - * Get the SQL statements for the Down migration |
|
| 112 | - * |
|
| 113 | - * @return array list of the SQL strings to execute for the Down migration |
|
| 114 | - * the keys being the datasources |
|
| 115 | - */ |
|
| 116 | - public function getDownSQL() |
|
| 117 | - { |
|
| 118 | - return array ( |
|
| 108 | + } |
|
| 109 | + |
|
| 110 | + /** |
|
| 111 | + * Get the SQL statements for the Down migration |
|
| 112 | + * |
|
| 113 | + * @return array list of the SQL strings to execute for the Down migration |
|
| 114 | + * the keys being the datasources |
|
| 115 | + */ |
|
| 116 | + public function getDownSQL() |
|
| 117 | + { |
|
| 118 | + return array ( |
|
| 119 | 119 | 'keeko' => ' |
| 120 | 120 | # This is a fix for InnoDB in MySQL >= 4.1.x |
| 121 | 121 | # It "suspends judgement" for fkey relationships until are tables are set. |
@@ -186,6 +186,6 @@ discard block |
||
| 186 | 186 | SET FOREIGN_KEY_CHECKS = 1; |
| 187 | 187 | ', |
| 188 | 188 | ); |
| 189 | - } |
|
| 189 | + } |
|
| 190 | 190 | |
| 191 | 191 | } |
| 192 | 192 | \ No newline at end of file |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | */ |
| 38 | 38 | public function getUpSQL() |
| 39 | 39 | { |
| 40 | - return array ( |
|
| 40 | + return array( |
|
| 41 | 41 | 'keeko' => ' |
| 42 | 42 | # This is a fix for InnoDB in MySQL >= 4.1.x |
| 43 | 43 | # It "suspends judgement" for fkey relationships until are tables are set. |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | */ |
| 116 | 116 | public function getDownSQL() |
| 117 | 117 | { |
| 118 | - return array ( |
|
| 118 | + return array( |
|
| 119 | 119 | 'keeko' => ' |
| 120 | 120 | # This is a fix for InnoDB in MySQL >= 4.1.x |
| 121 | 121 | # It "suspends judgement" for fkey relationships until are tables are set. |
@@ -5,27 +5,22 @@ discard block |
||
| 5 | 5 | * up to version 1463151118. |
| 6 | 6 | * Generated on 2016-05-13 16:51:58 by thomas |
| 7 | 7 | */ |
| 8 | -class PropelMigration_1463151118 |
|
| 9 | -{ |
|
| 8 | +class PropelMigration_1463151118 { |
|
| 10 | 9 | public $comment = ''; |
| 11 | 10 | |
| 12 | - public function preUp($manager) |
|
| 13 | - { |
|
| 11 | + public function preUp($manager) { |
|
| 14 | 12 | // add the pre-migration code here |
| 15 | 13 | } |
| 16 | 14 | |
| 17 | - public function postUp($manager) |
|
| 18 | - { |
|
| 15 | + public function postUp($manager) { |
|
| 19 | 16 | // add the post-migration code here |
| 20 | 17 | } |
| 21 | 18 | |
| 22 | - public function preDown($manager) |
|
| 23 | - { |
|
| 19 | + public function preDown($manager) { |
|
| 24 | 20 | // add the pre-migration code here |
| 25 | 21 | } |
| 26 | 22 | |
| 27 | - public function postDown($manager) |
|
| 28 | - { |
|
| 23 | + public function postDown($manager) { |
|
| 29 | 24 | // add the post-migration code here |
| 30 | 25 | } |
| 31 | 26 | |
@@ -35,8 +30,7 @@ discard block |
||
| 35 | 30 | * @return array list of the SQL strings to execute for the Up migration |
| 36 | 31 | * the keys being the datasources |
| 37 | 32 | */ |
| 38 | - public function getUpSQL() |
|
| 39 | - { |
|
| 33 | + public function getUpSQL() { |
|
| 40 | 34 | return array ( |
| 41 | 35 | 'keeko' => ' |
| 42 | 36 | # This is a fix for InnoDB in MySQL >= 4.1.x |
@@ -113,8 +107,7 @@ discard block |
||
| 113 | 107 | * @return array list of the SQL strings to execute for the Down migration |
| 114 | 108 | * the keys being the datasources |
| 115 | 109 | */ |
| 116 | - public function getDownSQL() |
|
| 117 | - { |
|
| 110 | + public function getDownSQL() { |
|
| 118 | 111 | return array ( |
| 119 | 112 | 'keeko' => ' |
| 120 | 113 | # This is a fix for InnoDB in MySQL >= 4.1.x |
@@ -8,6 +8,6 @@ |
||
| 8 | 8 | public $message = 'Username %username% is already been taken'; |
| 9 | 9 | |
| 10 | 10 | public function validatedBy() { |
| 11 | - return get_class($this).'Validator'; |
|
| 11 | + return get_class($this) . 'Validator'; |
|
| 12 | 12 | } |
| 13 | 13 | } |
| 14 | 14 | \ No newline at end of file |