Skip to content

Commit 5eb5ec9

Browse files
Merge branch 'master' into 6.0
2 parents 2fadc1c + 9a08ea9 commit 5eb5ec9

File tree

3 files changed

+347
-388
lines changed

3 files changed

+347
-388
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
/build/logs
1313
/build/phar
1414
/build/phar-scoped
15-
/composer.lock
1615
/phpbu.xml
1716
/phpbu.json
1817
/vendor/

composer.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"phpmailer/phpmailer": "^6.0"
4848
},
4949
"require-dev": {
50-
"sebastianfeldmann/git": "^2.2",
50+
"sebastianfeldmann/git": "^3.2",
5151
"sebastianfeldmann/ftp": "^0.9",
5252
"guzzlehttp/guzzle": "^5.3.3|^6.2.1",
5353
"aws/aws-sdk-php": "^3.10",
@@ -60,7 +60,7 @@
6060
"php-opencloud/openstack": "^3.0",
6161
"arhitector/yandex": "^2.0",
6262
"microsoft/azure-storage-blob": "^1.4",
63-
"captainhook/plugin-composer": "^4.0"
63+
"captainhook/captainhook": "^5.0"
6464
},
6565
"suggest": {
6666
"sebastianfeldmann/ftp": "Require ^0.9 to sync to an FTP server",
@@ -82,5 +82,8 @@
8282
"branch-alias": {
8383
"dev-master": "6.0.x-dev"
8484
}
85+
},
86+
"scripts": {
87+
"post-autoload-dump": "vendor/bin/captainhook install -f -s"
8588
}
8689
}

0 commit comments

Comments
 (0)