FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix tests, finally. i hope. cleanup before laravel 5.5 update

Browse Source
This commit is contained in:
Nabeel Shahzad
2017-09-07 15:35:17 -05:00
parent ae381d9908
commit 1502e0193f
7 changed files with 352 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/php.xml generated
View File

@@ -113,6 +113,9 @@
<path value="$PROJECT_DIR$/vendor/doctrine/common" /> <path value="$PROJECT_DIR$/vendor/doctrine/common" />
<path value="$PROJECT_DIR$/vendor/doctrine/collections" /> <path value="$PROJECT_DIR$/vendor/doctrine/collections" />
<path value="$PROJECT_DIR$/vendor/doctrine/cache" /> <path value="$PROJECT_DIR$/vendor/doctrine/cache" />
<path value="$PROJECT_DIR$/vendor/hashids/hashids" />
<path value="$PROJECT_DIR$/vendor/makinacorpus/php-bloom" />
<path value="$PROJECT_DIR$/vendor/paragonie/sodium_compat" />
</include_path> </include_path>
</component> </component>
<component name="PhpProjectServersManager"> <component name="PhpProjectServersManager">

7
app/Models/Traits/Uuids.php
View File

@@ -15,8 +15,11 @@ trait Uuids
$key = $model->getKeyName(); $key = $model->getKeyName();
if (empty($model->{$key})) { if (empty($model->{$key})) {
$hashids = new Hashids('', 8); $hashids = new Hashids('', 10);
$id = $hashids->encode((int)microtime(true));
$mt = str_replace('.', '', microtime(true));
$id = $hashids->encode($mt);
$model->{$key} = $id; $model->{$key} = $id;
} }
}); });

2
app/Services/PIREPService.php
View File

@@ -126,6 +126,8 @@ class PIREPService extends BaseService
$pirep->save(); $pirep->save();
$pirep->refresh(); $pirep->refresh();
$this->setPilotState($pirep);
return $pirep; return $pirep;
} }

3
composer.json
View File

@@ -36,7 +36,8 @@
"composer/semver": "^1.4", "composer/semver": "^1.4",
"dg/rss-php": "^1.2", "dg/rss-php": "^1.2",
"makinacorpus/php-bloom": "dev-master", "makinacorpus/php-bloom": "dev-master",
"hashids/hashids": "2.0.*" "hashids/hashids": "2.0.*",
"paragonie/sodium_compat": "^1.2"
}, },
"require-dev": { "require-dev": {
"fzaninotto/faker": "~1.4", "fzaninotto/faker": "~1.4",

580
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

9
phpvms.iml
View File

@@ -13,10 +13,13 @@
<excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/dbal" /> <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/dbal" />
<excludeFolder url="file://$MODULE_DIR$/vendor/dompdf/dompdf" /> <excludeFolder url="file://$MODULE_DIR$/vendor/dompdf/dompdf" />
<excludeFolder url="file://$MODULE_DIR$/vendor/ellipsesynergie/api-response" /> <excludeFolder url="file://$MODULE_DIR$/vendor/ellipsesynergie/api-response" />
<excludeFolder url="file://$MODULE_DIR$/vendor/hashids/hashids" />
<excludeFolder url="file://$MODULE_DIR$/vendor/jeremeamia/SuperClosure" /> <excludeFolder url="file://$MODULE_DIR$/vendor/jeremeamia/SuperClosure" />
<excludeFolder url="file://$MODULE_DIR$/vendor/league/fractal" /> <excludeFolder url="file://$MODULE_DIR$/vendor/league/fractal" />
<excludeFolder url="file://$MODULE_DIR$/vendor/maatwebsite/excel" /> <excludeFolder url="file://$MODULE_DIR$/vendor/maatwebsite/excel" />
<excludeFolder url="file://$MODULE_DIR$/vendor/makinacorpus/php-bloom" />
<excludeFolder url="file://$MODULE_DIR$/vendor/nikic/php-parser" /> <excludeFolder url="file://$MODULE_DIR$/vendor/nikic/php-parser" />
<excludeFolder url="file://$MODULE_DIR$/vendor/paragonie/sodium_compat" />
<excludeFolder url="file://$MODULE_DIR$/vendor/phenx/php-font-lib" /> <excludeFolder url="file://$MODULE_DIR$/vendor/phenx/php-font-lib" />
<excludeFolder url="file://$MODULE_DIR$/vendor/phenx/php-svg-lib" /> <excludeFolder url="file://$MODULE_DIR$/vendor/phenx/php-svg-lib" />
<excludeFolder url="file://$MODULE_DIR$/vendor/phpoffice/phpexcel" /> <excludeFolder url="file://$MODULE_DIR$/vendor/phpoffice/phpexcel" />
@@ -52,10 +55,13 @@
<root url="file://$MODULE_DIR$/vendor/doctrine/dbal" /> <root url="file://$MODULE_DIR$/vendor/doctrine/dbal" />
<root url="file://$MODULE_DIR$/vendor/dompdf/dompdf" /> <root url="file://$MODULE_DIR$/vendor/dompdf/dompdf" />
<root url="file://$MODULE_DIR$/vendor/ellipsesynergie/api-response" /> <root url="file://$MODULE_DIR$/vendor/ellipsesynergie/api-response" />
<root url="file://$MODULE_DIR$/vendor/hashids/hashids" />
<root url="file://$MODULE_DIR$/vendor/jeremeamia/SuperClosure" /> <root url="file://$MODULE_DIR$/vendor/jeremeamia/SuperClosure" />
<root url="file://$MODULE_DIR$/vendor/league/fractal" /> <root url="file://$MODULE_DIR$/vendor/league/fractal" />
<root url="file://$MODULE_DIR$/vendor/maatwebsite/excel" /> <root url="file://$MODULE_DIR$/vendor/maatwebsite/excel" />
<root url="file://$MODULE_DIR$/vendor/makinacorpus/php-bloom" />
<root url="file://$MODULE_DIR$/vendor/nikic/php-parser" /> <root url="file://$MODULE_DIR$/vendor/nikic/php-parser" />
<root url="file://$MODULE_DIR$/vendor/paragonie/sodium_compat" />
<root url="file://$MODULE_DIR$/vendor/phenx/php-font-lib" /> <root url="file://$MODULE_DIR$/vendor/phenx/php-font-lib" />
<root url="file://$MODULE_DIR$/vendor/phenx/php-svg-lib" /> <root url="file://$MODULE_DIR$/vendor/phenx/php-svg-lib" />
<root url="file://$MODULE_DIR$/vendor/phpoffice/phpexcel" /> <root url="file://$MODULE_DIR$/vendor/phpoffice/phpexcel" />
@@ -78,10 +84,13 @@
<root url="file://$MODULE_DIR$/vendor/doctrine/dbal" /> <root url="file://$MODULE_DIR$/vendor/doctrine/dbal" />
<root url="file://$MODULE_DIR$/vendor/dompdf/dompdf" /> <root url="file://$MODULE_DIR$/vendor/dompdf/dompdf" />
<root url="file://$MODULE_DIR$/vendor/ellipsesynergie/api-response" /> <root url="file://$MODULE_DIR$/vendor/ellipsesynergie/api-response" />
<root url="file://$MODULE_DIR$/vendor/hashids/hashids" />
<root url="file://$MODULE_DIR$/vendor/jeremeamia/SuperClosure" /> <root url="file://$MODULE_DIR$/vendor/jeremeamia/SuperClosure" />
<root url="file://$MODULE_DIR$/vendor/league/fractal" /> <root url="file://$MODULE_DIR$/vendor/league/fractal" />
<root url="file://$MODULE_DIR$/vendor/maatwebsite/excel" /> <root url="file://$MODULE_DIR$/vendor/maatwebsite/excel" />
<root url="file://$MODULE_DIR$/vendor/makinacorpus/php-bloom" />
<root url="file://$MODULE_DIR$/vendor/nikic/php-parser" /> <root url="file://$MODULE_DIR$/vendor/nikic/php-parser" />
<root url="file://$MODULE_DIR$/vendor/paragonie/sodium_compat" />
<root url="file://$MODULE_DIR$/vendor/phenx/php-font-lib" /> <root url="file://$MODULE_DIR$/vendor/phenx/php-font-lib" />
<root url="file://$MODULE_DIR$/vendor/phenx/php-svg-lib" /> <root url="file://$MODULE_DIR$/vendor/phenx/php-svg-lib" />
<root url="file://$MODULE_DIR$/vendor/phpoffice/phpexcel" /> <root url="file://$MODULE_DIR$/vendor/phpoffice/phpexcel" />

1
tests/PIREPTest.php
View File

@@ -21,7 +21,6 @@ class PIREPTest extends TestCase
'dpt_airport_id' => 1, 'dpt_airport_id' => 1,
'arr_airport_id' => 2, 'arr_airport_id' => 2,
'flight_time' => 21600, # 6 hours 'flight_time' => 21600, # 6 hours
'level' => 320,
'source' => 0, # manual 'source' => 0, # manual
'fuel_used' => 100, 'fuel_used' => 100,
'notes' => 'just a pilot report', 'notes' => 'just a pilot report',