Skip to content

Commit aa65d91

Browse files
author
Dave Redfern
committed
Update dependencies and fix create-project-cmd
1 parent 96c17e3 commit aa65d91

File tree

4 files changed

+42
-25
lines changed

4 files changed

+42
-25
lines changed

cache_build.sh

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ echo "Building caches"
44
rm storage/cache/hydrators/*
55
rm storage/cache/proxies/*
66
composer dumpautoload
7-
./artisan optimize
87
./artisan doctrine:generate:proxies
98
./artisan doctrine:generate:hydrators
109
./artisan config:cache

composer.json

+15-19
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,31 @@
66
"type": "project",
77
"require": {
88
"php": ">=7",
9-
"beberlei/assert": "~2.5",
9+
"beberlei/assert": "~2.7",
1010
"eloquent/enumeration": "~5.1",
1111
"laravel/framework": "~5.4",
12-
"laravelcollective/html": "~5.3",
13-
"laravel-doctrine/orm": "~1.2",
12+
"laravelcollective/html": "~5.4",
13+
"laravel-doctrine/orm": "~1.3",
1414
"laravel-doctrine/migrations": "~1.1",
1515
"laravel-doctrine/acl": "~1.0",
16-
"predis/predis": "~1.0",
16+
"predis/predis": "~1.1",
1717
"rcrowe/twigbridge": "0.9.*",
1818
"twig/twig": "^1.30.0",
1919
"twig/extensions": "^1.3.0",
2020
"somnambulist/laravel-doctrine-behaviours": "~0.5",
21-
"somnambulist/laravel-doctrine-domain-events": "~0.5",
21+
"somnambulist/laravel-doctrine-domain-events": "~0.7",
2222
"somnambulist/laravel-doctrine-entity-audit": "~0.5",
2323
"somnambulist/laravel-doctrine-entity-validation": "~0.1",
2424
"somnambulist/laravel-domain-input-mapper": "~0.5",
2525
"somnambulist/laravel-environment-loader": "~0.1"
2626
},
2727
"require-dev": {
28-
"codeception/codeception": "^2.2",
29-
"fzaninotto/faker": "~1.4",
28+
"codeception/codeception": "~2.3",
29+
"fzaninotto/faker": "~1.6",
3030
"mockery/mockery": "0.9.*",
31-
"phpspec/phpspec": "~2.1",
3231
"barryvdh/laravel-debugbar": "~2.3",
33-
"barryvdh/laravel-ide-helper": "~2.2",
34-
"laravel/homestead": "^3.0"
32+
"barryvdh/laravel-ide-helper": "~2.3",
33+
"laravel/homestead": "^5.4"
3534
},
3635
"autoload": {
3736
"classmap": [
@@ -51,17 +50,12 @@
5150
},
5251
"scripts": {
5352
"post-install-cmd": [
54-
"php artisan clear-compiled",
55-
"php artisan optimize"
56-
],
57-
"pre-update-cmd": [
58-
"php artisan clear-compiled"
53+
"Illuminate\\Foundation\\ComposerScripts::postInstall"
5954
],
6055
"post-update-cmd": [
61-
"php artisan clear-compiled",
56+
"Illuminate\\Foundation\\ComposerScripts::postUpdate",
6257
"php artisan ide-helper:generate",
63-
"php artisan ide-helper:meta",
64-
"php artisan optimize"
58+
"php artisan ide-helper:meta"
6559
],
6660
"post-root-package-install": [
6761
"php -r \"copy('.env.example', '.env');\"",
@@ -73,6 +67,8 @@
7367
},
7468
"config": {
7569
"preferred-install": "dist",
76-
"bin-dir": "bin"
70+
"bin-dir": "bin",
71+
"sort-packages": true,
72+
"optimize-autoloader": true
7773
}
7874
}

config/ide-helper.php

+27-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php
1+
<?php
22

33
return array(
44

@@ -14,6 +14,17 @@
1414
'filename' => '_ide_helper',
1515
'format' => 'php',
1616

17+
/*
18+
|--------------------------------------------------------------------------
19+
| Fluent helpers
20+
|--------------------------------------------------------------------------
21+
|
22+
| Set to true to generate commonly used Fluent methods
23+
|
24+
*/
25+
26+
'include_fluent' => false,
27+
1728
/*
1829
|--------------------------------------------------------------------------
1930
| Helper files to include
@@ -55,7 +66,7 @@
5566
*/
5667

5768
'extra' => array(
58-
//'Eloquent' => array('Illuminate\Database\Eloquent\Builder', 'Illuminate\Database\Query\Builder'),
69+
'Eloquent' => array('Illuminate\Database\Eloquent\Builder', 'Illuminate\Database\Query\Builder'),
5970
'Session' => array('Illuminate\Session\Store'),
6071
),
6172

@@ -71,7 +82,7 @@
7182
'emergency' => 'Monolog\Logger::addEmergency',
7283
)
7384
),
74-
85+
7586
/*
7687
|--------------------------------------------------------------------------
7788
| Interface implementations
@@ -81,7 +92,7 @@
8192
| are detected by the helpers, others can be listed below.
8293
|
8394
*/
84-
95+
8596
'interfaces' => array(
8697

8798
),
@@ -142,4 +153,16 @@
142153
*/
143154
'model_camel_case_properties' => false,
144155

156+
/*
157+
|--------------------------------------------------------------------------
158+
| Property Casts
159+
|--------------------------------------------------------------------------
160+
|
161+
| Cast the given "real type" to the given "type".
162+
|
163+
*/
164+
'type_overrides' => array(
165+
'integer' => 'int',
166+
'boolean' => 'bool',
167+
),
145168
);

vagrant_refresh.sh

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ echo "Running migrations..."
2626
./artisan doctrine:migrations:migrate
2727
./artisan ide-helper:generate
2828
./artisan ide-helper:meta
29-
./artisan optimize
3029

3130
echo "Updating npm / gulp..."
3231
npm install

0 commit comments

Comments
 (0)