Completed
Push — develop ( 805531...35a4e1 )
by John
02:55
created
Alpha/Model/ActiveRecord.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1156,7 +1156,7 @@  discard block
 block discarded – undo
1156 1156
     /**
1157 1157
      * Gets the ID for the object in zero-padded format (same as getID()).
1158 1158
      *
1159
-     * @return int 11 digit zero-padded ID value.
1159
+     * @return string 11 digit zero-padded ID value.
1160 1160
      *
1161 1161
      * @since 1.0
1162 1162
      */
@@ -2153,7 +2153,7 @@  discard block
 block discarded – undo
2153 2153
     /**
2154 2154
      * Starts a new database transaction.
2155 2155
      *
2156
-     * @param $Record The ActiveRecord instance to pass to the database provider. Leave empty to have a new Person passed.
2156
+     * @param ActiveRecord $Record The ActiveRecord instance to pass to the database provider. Leave empty to have a new Person passed.
2157 2157
      *
2158 2158
      * @since 1.0
2159 2159
      *
@@ -2186,7 +2186,7 @@  discard block
 block discarded – undo
2186 2186
     /**
2187 2187
      * Commits the current database transaction.
2188 2188
      *
2189
-     * @param $Record The ActiveRecord instance to pass to the database provider. Leave empty to have a new Person passed.
2189
+     * @param ActiveRecord $Record The ActiveRecord instance to pass to the database provider. Leave empty to have a new Person passed.
2190 2190
      *
2191 2191
      * @since 1.0
2192 2192
      *
@@ -2219,7 +2219,7 @@  discard block
 block discarded – undo
2219 2219
     /**
2220 2220
      * Aborts the current database transaction.
2221 2221
      *
2222
-     * @param $Record The ActiveRecord instance to pass to the database provider. Leave empty to have a new Person passed.
2222
+     * @param ActiveRecord $Record The ActiveRecord instance to pass to the database provider. Leave empty to have a new Person passed.
2223 2223
      *
2224 2224
      * @since 1.0
2225 2225
      *
Please login to merge, or discard this patch.
Alpha/Model/ActiveRecordProviderInterface.php 1 patch
Doc Comments   +28 added lines, -7 removed lines patch added patch discarded remove patch
@@ -60,6 +60,7 @@  discard block
 block discarded – undo
60 60
      * Disconnects the current database connection if one exists (self::$connection is set).
61 61
      *
62 62
      * @since 1.1
63
+     * @return void
63 64
      */
64 65
     public static function disconnect();
65 66
 
@@ -81,6 +82,7 @@  discard block
 block discarded – undo
81 82
      * @since 1.1
82 83
      *
83 84
      * @throws \Alpha\Exception\RecordFoundException
85
+     * @return void
84 86
      */
85 87
     public function load($ID, $version = 0);
86 88
 
@@ -100,7 +102,7 @@  discard block
 block discarded – undo
100 102
     /**
101 103
      * Populates the record object from the database table by the given attribute value.
102 104
      *
103
-     * @param string $atribute        The name of the attribute to load the record by.
105
+     * @param string $attribute        The name of the attribute to load the record by.
104 106
      * @param string $value           The value of the attribute to load the record by.
105 107
      * @param bool   $ignoreClassType Default is false, set to true if you want to load from overloaded tables and ignore the class type
106 108
      * @param array  $loadAttributes  The attributes to load from the database to this object (leave blank to load all attributes)
@@ -108,6 +110,7 @@  discard block
 block discarded – undo
108 110
      * @since 1.1
109 111
      *
110 112
      * @throws \Alpha\Exception\RecordFoundException
113
+     * @return void
111 114
      */
112 115
     public function loadByAttribute($attribute, $value, $ignoreClassType = false, $loadAttributes = array());
113 116
 
@@ -131,14 +134,14 @@  discard block
 block discarded – undo
131 134
     /**
132 135
      * Loads all of the objects of this class by the specified attribute into an array which is returned.
133 136
      *
134
-     * @param string $atribute        The attribute to load the objects by.
137
+     * @param string $attribute        The attribute to load the objects by.
135 138
      * @param string $value           The value of the attribute to load the objects by.
136 139
      * @param int    $start           The start of the SQL LIMIT clause, useful for pagination.
137 140
      * @param int    $limit           The amount (limit) of objects to load, useful for pagination.
138 141
      * @param string $orderBy         The name of the field to sort the objects by.
139 142
      * @param string $order           The order to sort the objects by.
140 143
      * @param bool   $ignoreClassType Default is false, set to true if you want to load from overloaded tables and ignore the class type.
141
-     * @param array  $constructorArgs An optional array of contructor arguements to pass to the records that will be generated and returned.  Supports a maximum of 5 arguements.
144
+     * @param string[]  $constructorArgs An optional array of contructor arguements to pass to the records that will be generated and returned.  Supports a maximum of 5 arguements.
142 145
      *
143 146
      * @return array An array containing objects of this type of business object.
144 147
      *
@@ -152,14 +155,14 @@  discard block
 block discarded – undo
152 155
     /**
153 156
      * Loads all of the record objects of this class by the specified attributes into an array which is returned.
154 157
      *
155
-     * @param array  $atributes       The attributes to load the records by.
158
+     * @param array  $attributes       The attributes to load the records by.
156 159
      * @param array  $values          The values of the attributes to load the records by.
157 160
      * @param int    $start           The start of the SQL LIMIT clause, useful for pagination.
158 161
      * @param int    $limit           The amount (limit) of records to load, useful for pagination.
159 162
      * @param string $orderBy         The name of the field to sort the records by.
160 163
      * @param string $order           The order to sort the records by.
161 164
      * @param bool   $ignoreClassType Default is false, set to true if you want to load from overloaded tables and ignore the class type
162
-     * @param array  $constructorArgs An optional array of contructor arguements to pass to the records that will be generated and returned.  Supports a maximum of 5 arguements.
165
+     * @param string[]  $constructorArgs An optional array of contructor arguements to pass to the records that will be generated and returned.  Supports a maximum of 5 arguements.
163 166
      *
164 167
      * @return array An array containing objects of this type of record object.
165 168
      *
@@ -214,6 +217,7 @@  discard block
 block discarded – undo
214 217
      * @throws \Alpha\Exception\FailedSaveException
215 218
      * @throws \Alpha\Exception\LockingException
216 219
      * @throws \Alpha\Exception\ValidationException
220
+     * @return void
217 221
      */
218 222
     public function save();
219 223
 
@@ -229,6 +233,7 @@  discard block
 block discarded – undo
229 233
      * @throws \Alpha\Exception\IllegalArguementException
230 234
      * @throws \Alpha\Exception\FailedSaveException
231 235
      * @throws \Alpha\Exception\LockingException
236
+     * @return void
232 237
      */
233 238
     public function saveAttribute($attribute, $value);
234 239
 
@@ -238,6 +243,7 @@  discard block
 block discarded – undo
238 243
      * @since 1.2
239 244
      *
240 245
      * @throws \Alpha\Exception\FailedSaveException
246
+     * @return void
241 247
      */
242 248
     public function saveHistory();
243 249
 
@@ -247,6 +253,7 @@  discard block
 block discarded – undo
247 253
      * @since 1.1
248 254
      *
249 255
      * @throws \Alpha\Exception\FailedDeleteException
256
+     * @return void
250 257
      */
251 258
     public function delete();
252 259
 
@@ -267,6 +274,7 @@  discard block
 block discarded – undo
267 274
      * @since 1.1
268 275
      *
269 276
      * @throws \Alpha\Exception\AlphaException
277
+     * @return void
270 278
      */
271 279
     public function makeTable();
272 280
 
@@ -276,6 +284,7 @@  discard block
 block discarded – undo
276 284
      * @since 1.2
277 285
      *
278 286
      * @throws \AlphaException
287
+     * @return void
279 288
      */
280 289
     public function makeHistoryTable();
281 290
 
@@ -285,6 +294,7 @@  discard block
 block discarded – undo
285 294
      * @since 1.1
286 295
      *
287 296
      * @throws \Alpha\Exception\AlphaException
297
+     * @return void
288 298
      */
289 299
     public function rebuildTable();
290 300
 
@@ -296,6 +306,7 @@  discard block
 block discarded – undo
296 306
      * @param string $tableName Optional table name, leave blank for the defined table for this class to be dropped
297 307
      *
298 308
      * @throws \Alpha\Exception\AlphaException
309
+     * @return void
299 310
      */
300 311
     public function dropTable($tableName = null);
301 312
 
@@ -308,6 +319,7 @@  discard block
 block discarded – undo
308 319
      * @since 1.1
309 320
      *
310 321
      * @throws \Alpha\Exception\AlphaException
322
+     * @return void
311 323
      */
312 324
     public function addProperty($propName);
313 325
 
@@ -325,7 +337,7 @@  discard block
 block discarded – undo
325 337
     /**
326 338
      * Gets the count from the database for the amount of objects of this class.
327 339
      *
328
-     * @param array $atributes The attributes to count the objects by (optional).
340
+     * @param array $attributes The attributes to count the objects by (optional).
329 341
      * @param array $values    The values of the attributes to count the objects by (optional).
330 342
      *
331 343
      * @return int
@@ -354,6 +366,7 @@  discard block
 block discarded – undo
354 366
      * @since 1.1
355 367
      *
356 368
      * @throws \Alpha\Exception\AlphaException
369
+     * @return void
357 370
      */
358 371
     public function setEnumOptions();
359 372
 
@@ -427,12 +440,12 @@  discard block
 block discarded – undo
427 440
      * @param string $attributeName         The name of the attribute to apply the index on.
428 441
      * @param string $relatedClass          The fully-qualified name of the related class.
429 442
      * @param string $relatedClassAttribute The name of the field to relate to on the related class.
430
-     * @param bool   $allowNullValues       For foreign key indexes that don't allow null values, set this to false (default is true).
431 443
      * @param string $indexName             The optional name for the index, will calculate if not provided.
432 444
      *
433 445
      * @since 1.1
434 446
      *
435 447
      * @throws \Alpha\Exception\FailedIndexCreateException
448
+     * @return void
436 449
      */
437 450
     public function createForeignIndex($attributeName, $relatedClass, $relatedClassAttribute, $indexName = null);
438 451
 
@@ -446,6 +459,7 @@  discard block
 block discarded – undo
446 459
      * @since 1.1
447 460
      *
448 461
      * @throws \Alpha\Exception\FailedIndexCreateException
462
+     * @return void
449 463
      */
450 464
     public function createUniqueIndex($attribute1Name, $attribute2Name = '', $attribute3Name = '');
451 465
 
@@ -455,6 +469,7 @@  discard block
 block discarded – undo
455 469
      * @since 1.1
456 470
      *
457 471
      * @throws \Alpha\Exception\AlphaException
472
+     * @return void
458 473
      */
459 474
     public function reload();
460 475
 
@@ -490,6 +505,7 @@  discard block
 block discarded – undo
490 505
      * @since 1.1
491 506
      *
492 507
      * @throws \Alpha\Exception\AlphaException
508
+     * @return void
493 509
      */
494 510
     public static function begin();
495 511
 
@@ -499,6 +515,7 @@  discard block
 block discarded – undo
499 515
      * @since 1.1
500 516
      *
501 517
      * @throws \Alpha\Exception\FailedSaveException
518
+     * @return void
502 519
      */
503 520
     public static function commit();
504 521
 
@@ -508,6 +525,7 @@  discard block
 block discarded – undo
508 525
      * @since 1.1
509 526
      *
510 527
      * @throws \Alpha\Exception\AlphaException
528
+     * @return void
511 529
      */
512 530
     public static function rollback();
513 531
 
@@ -517,6 +535,7 @@  discard block
 block discarded – undo
517 535
      * @param \Alpha\Model\ActiveRecord $Record
518 536
      *
519 537
      * @since 1.1
538
+     * @return void
520 539
      */
521 540
     public function setRecord($Record);
522 541
 
@@ -549,6 +568,7 @@  discard block
 block discarded – undo
549 568
      * @throws \Alpha\Exception\AlphaException
550 569
      *
551 570
      * @since 2.0
571
+     * @return void
552 572
      */
553 573
     public static function createDatabase();
554 574
 
@@ -558,6 +578,7 @@  discard block
 block discarded – undo
558 578
      * @throws \Alpha\Exception\AlphaException
559 579
      *
560 580
      * @since 2.0
581
+     * @return void
561 582
      */
562 583
     public static function dropDatabase();
563 584
 }
Please login to merge, or discard this patch.
Alpha/Model/Type/RelationLookup.php 1 patch
Doc Comments   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -222,6 +222,7 @@  discard block
 block discarded – undo
222 222
      * (non-PHPdoc)
223 223
      *
224 224
      * @see Alpha\Model\ActiveRecord::loadAllByAttribute()
225
+     * @param string $attribute
225 226
      */
226 227
     public function loadAllByAttribute($attribute, $value, $start = 0, $limit = 0, $orderBy = 'ID', $order = 'ASC', $ignoreClassType = false, $constructorArgs = array())
227 228
     {
@@ -312,7 +313,7 @@  discard block
 block discarded – undo
312 313
     /**
313 314
      * Returns an array of the IDs of the related objects.
314 315
      *
315
-     * @return array
316
+     * @return integer[]
316 317
      *
317 318
      * @since 1.0
318 319
      */
@@ -325,7 +326,7 @@  discard block
 block discarded – undo
325 326
      * Used to set the IDs of the related objects.  Pass a two-item array of IDs, the first
326 327
      * one being the left object ID, the second being the right.
327 328
      *
328
-     * @param array $IDs
329
+     * @param string[] $IDs
329 330
      *
330 331
      * @since 1.0
331 332
      *
Please login to merge, or discard this patch.
Alpha/Model/ActiveRecordProviderSQLite.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -969,8 +969,8 @@  discard block
 block discarded – undo
969 969
                 $stmt->bindValue(':ID', $this->record->getID(), SQLITE3_INTEGER);
970 970
 
971 971
                 $temp = $this->record->getVersionNumber()->getValue();
972
-                $this->record->set('version_num', $temp + 1);
973
-                $stmt->bindValue(':version_num', $temp + 1, SQLITE3_INTEGER);
972
+                $this->record->set('version_num', $temp+1);
973
+                $stmt->bindValue(':version_num', $temp+1, SQLITE3_INTEGER);
974 974
 
975 975
                 $stmt->execute();
976 976
             } else {
@@ -1049,7 +1049,7 @@  discard block
 block discarded – undo
1049 1049
         } else {
1050 1050
             // there has been an error, so decrement the version number back
1051 1051
             $temp = $this->record->getVersionNumber()->getValue();
1052
-            $this->record->set('version_num', $temp - 1);
1052
+            $this->record->set('version_num', $temp-1);
1053 1053
 
1054 1054
             throw new FailedSaveException('Failed to save object, SQLite error is ['.self::getLastDatabaseError().'], query ['.$this->record->getLastQuery().']');
1055 1055
         }
@@ -1093,7 +1093,7 @@  discard block
 block discarded – undo
1093 1093
         $this->record->setLastQuery($sqlQuery);
1094 1094
         $stmt = self::getConnection()->prepare($sqlQuery);
1095 1095
 
1096
-        $newVersionNumber = $this->record->getVersionNumber()->getValue() + 1;
1096
+        $newVersionNumber = $this->record->getVersionNumber()->getValue()+1;
1097 1097
 
1098 1098
         if ($stmt instanceof SQLite3Stmt) {
1099 1099
             if ($this->record->getPropObject($attribute) instanceof Integer) {
Please login to merge, or discard this patch.
Alpha/Controller/Front/FrontController.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -175,145 +175,145 @@  discard block
 block discarded – undo
175 175
             throw new BadRequestException('Request character encoding does not match expected UTF-8');
176 176
         }
177 177
 
178
-        $this->addRoute('/', function ($request) {
178
+        $this->addRoute('/', function($request) {
179 179
             $controller = new IndexController();
180 180
 
181 181
             return $controller->process($request);
182 182
         });
183 183
 
184
-        $this->addRoute('/a/{title}/{view}', function ($request) {
184
+        $this->addRoute('/a/{title}/{view}', function($request) {
185 185
             $controller = new ArticleController();
186 186
 
187 187
             return $controller->process($request);
188 188
         })->value('title', null)->value('view', 'detailed');
189 189
 
190
-        $this->addRoute('/articles/{start}/{limit}', function ($request) {
190
+        $this->addRoute('/articles/{start}/{limit}', function($request) {
191 191
             $controller = new ArticleController();
192 192
 
193 193
             return $controller->process($request);
194 194
         })->value('start', 0)->value('limit', $config->get('app.list.page.amount'));
195 195
 
196
-        $this->addRoute('/attach/{articleID}/{filename}', function ($request) {
196
+        $this->addRoute('/attach/{articleID}/{filename}', function($request) {
197 197
             $controller = new AttachmentController();
198 198
 
199 199
             return $controller->process($request);
200 200
         });
201 201
 
202
-        $this->addRoute('/cache', function ($request) {
202
+        $this->addRoute('/cache', function($request) {
203 203
             $controller = new CacheController();
204 204
 
205 205
             return $controller->process($request);
206 206
         });
207 207
 
208
-        $this->addRoute('/denum/{denumID}', function ($request) {
208
+        $this->addRoute('/denum/{denumID}', function($request) {
209 209
             $controller = new DEnumController();
210 210
 
211 211
             return $controller->process($request);
212 212
         })->value('denumID', null);
213 213
 
214
-        $this->addRoute('/excel/{ActiveRecordType}/{ActiveRecordID}', function ($request) {
214
+        $this->addRoute('/excel/{ActiveRecordType}/{ActiveRecordID}', function($request) {
215 215
             $controller = new ExcelController();
216 216
 
217 217
             return $controller->process($request);
218 218
         })->value('ActiveRecordID', null);
219 219
 
220
-        $this->addRoute('/feed/{ActiveRecordType}/{type}', function ($request) {
220
+        $this->addRoute('/feed/{ActiveRecordType}/{type}', function($request) {
221 221
             $controller = new FeedController();
222 222
 
223 223
             return $controller->process($request);
224 224
         })->value('type', 'Atom');
225 225
 
226
-        $this->addRoute('/gensecure', function ($request) {
226
+        $this->addRoute('/gensecure', function($request) {
227 227
             $controller = new GenSecureQueryStringController();
228 228
 
229 229
             return $controller->process($request);
230 230
         });
231 231
 
232
-        $this->addRoute('/image/{source}/{width}/{height}/{type}/{quality}/{scale}/{secure}/{var1}/{var2}', function ($request) {
232
+        $this->addRoute('/image/{source}/{width}/{height}/{type}/{quality}/{scale}/{secure}/{var1}/{var2}', function($request) {
233 233
             $controller = new ImageController();
234 234
 
235 235
             return $controller->process($request);
236 236
         })->value('var1', null)->value('var2', null);
237 237
 
238
-        $this->addRoute('/listactiverecords', function ($request) {
238
+        $this->addRoute('/listactiverecords', function($request) {
239 239
             $controller = new ListActiveRecordsController();
240 240
 
241 241
             return $controller->process($request);
242 242
         });
243 243
 
244
-        $this->addRoute('/log/{logPath}', function ($request) {
244
+        $this->addRoute('/log/{logPath}', function($request) {
245 245
             $controller = new LogController();
246 246
 
247 247
             return $controller->process($request);
248 248
         });
249 249
 
250
-        $this->addRoute('/login', function ($request) {
250
+        $this->addRoute('/login', function($request) {
251 251
             $controller = new LoginController();
252 252
 
253 253
             return $controller->process($request);
254 254
         });
255 255
 
256
-        $this->addRoute('/logout', function ($request) {
256
+        $this->addRoute('/logout', function($request) {
257 257
             $controller = new LogoutController();
258 258
 
259 259
             return $controller->process($request);
260 260
         });
261 261
 
262
-        $this->addRoute('/metric', function ($request) {
262
+        $this->addRoute('/metric', function($request) {
263 263
             $controller = new MetricController();
264 264
 
265 265
             return $controller->process($request);
266 266
         });
267 267
 
268
-        $this->addRoute('/recordselector/12m/{ActiveRecordID}/{field}/{relatedClass}/{relatedClassField}/{relatedClassDisplayField}/{relationType}', function ($request) {
268
+        $this->addRoute('/recordselector/12m/{ActiveRecordID}/{field}/{relatedClass}/{relatedClassField}/{relatedClassDisplayField}/{relationType}', function($request) {
269 269
             $controller = new RecordSelectorController();
270 270
 
271 271
             return $controller->process($request);
272 272
         })->value('relationType', 'ONE-TO-MANY');
273 273
 
274
-        $this->addRoute('/recordselector/m2m/{ActiveRecordID}/{field}/{relatedClassLeft}/{relatedClassLeftDisplayField}/{relatedClassRight}/{relatedClassRightDisplayField}/{accessingClassName}/{lookupIDs}/{relationType}', function ($request) {
274
+        $this->addRoute('/recordselector/m2m/{ActiveRecordID}/{field}/{relatedClassLeft}/{relatedClassLeftDisplayField}/{relatedClassRight}/{relatedClassRightDisplayField}/{accessingClassName}/{lookupIDs}/{relationType}', function($request) {
275 275
             $controller = new RecordSelectorController();
276 276
 
277 277
             return $controller->process($request);
278 278
         })->value('relationType', 'MANY-TO-MANY');
279 279
 
280
-        $this->addRoute('/search/{query}/{start}/{limit}', function ($request) {
280
+        $this->addRoute('/search/{query}/{start}/{limit}', function($request) {
281 281
             $controller = new SearchController();
282 282
 
283 283
             return $controller->process($request);
284 284
         })->value('start', 0)->value('limit', $config->get('app.list.page.amount'));
285 285
 
286
-        $this->addRoute('/sequence/{start}/{limit}', function ($request) {
286
+        $this->addRoute('/sequence/{start}/{limit}', function($request) {
287 287
             $controller = new SequenceController();
288 288
 
289 289
             return $controller->process($request);
290 290
         })->value('start', 0)->value('limit', $config->get('app.list.page.amount'));
291 291
 
292
-        $this->addRoute('/tag/{ActiveRecordType}/{ActiveRecordID}', function ($request) {
292
+        $this->addRoute('/tag/{ActiveRecordType}/{ActiveRecordID}', function($request) {
293 293
             $controller = new TagController();
294 294
 
295 295
             return $controller->process($request);
296 296
         });
297 297
 
298
-        $this->addRoute('/install', function ($request) {
298
+        $this->addRoute('/install', function($request) {
299 299
             $controller = new InstallController();
300 300
 
301 301
             return $controller->process($request);
302 302
         });
303 303
 
304
-        $this->addRoute('/record/{ActiveRecordType}/{ActiveRecordID}/{view}', function ($request) {
304
+        $this->addRoute('/record/{ActiveRecordType}/{ActiveRecordID}/{view}', function($request) {
305 305
             $controller = new ActiveRecordController();
306 306
 
307 307
             return $controller->process($request);
308 308
         })->value('ActiveRecordID', null)->value('view', 'detailed');
309 309
 
310
-        $this->addRoute('/records/{ActiveRecordType}/{start}/{limit}', function ($request) {
310
+        $this->addRoute('/records/{ActiveRecordType}/{start}/{limit}', function($request) {
311 311
             $controller = new ActiveRecordController();
312 312
 
313 313
             return $controller->process($request);
314 314
         })->value('start', 0)->value('limit', $config->get('app.list.page.amount'));
315 315
 
316
-        $this->addRoute('/tk/{token}', function ($request) {
316
+        $this->addRoute('/tk/{token}', function($request) {
317 317
             $params = self::getDecodeQueryParams($request->getParam('token'));
318 318
 
319 319
             if (isset($params['act'])) {
@@ -340,14 +340,14 @@  discard block
 block discarded – undo
340 340
             return new Response(404, 'Resource not found');
341 341
         });
342 342
 
343
-        $this->addRoute('/alpha/service', function ($request) {
343
+        $this->addRoute('/alpha/service', function($request) {
344 344
             $controller = new LoginController();
345 345
             $controller->setUnitOfWork(array('Alpha\Controller\LoginController', 'Alpha\Controller\ListActiveRecordsController'));
346 346
 
347 347
             return $controller->process($request);
348 348
         });
349 349
 
350
-        $this->addRoute('/phpinfo', function ($request) {
350
+        $this->addRoute('/phpinfo', function($request) {
351 351
             $controller = new PhpinfoController();
352 352
 
353 353
             return $controller->process($request);
Please login to merge, or discard this patch.