Fixes for L6 + PHP 7.4

This commit is contained in:
David Bomba 2021-09-28 21:18:10 +10:00
parent 64269c5fc0
commit ebd87245af
4 changed files with 727 additions and 241 deletions

View File

@ -68,7 +68,7 @@
"league/fractal": "0.13.*", "league/fractal": "0.13.*",
"lokielse/omnipay-alipay": "~1.4", "lokielse/omnipay-alipay": "~1.4",
"maatwebsite/excel": "dev-carbon#8b17952", "maatwebsite/excel": "dev-carbon#8b17952",
"mashape/unirest-php": "^3.0.5", "mashape/unirest-php": "^3.0.4",
"meebio/omnipay-creditcall": "dev-master", "meebio/omnipay-creditcall": "dev-master",
"meebio/omnipay-secure-trading": "dev-master", "meebio/omnipay-secure-trading": "dev-master",
"mfauveau/omnipay-pacnet": "~2.0", "mfauveau/omnipay-pacnet": "~2.0",
@ -105,7 +105,7 @@
"symfony/dom-crawler": "~3.1", "symfony/dom-crawler": "~3.1",
"codeception/c3": "2.*", "codeception/c3": "2.*",
"codeception/codeception": "2.*", "codeception/codeception": "2.*",
"phpspec/phpspec": "~5.0", "phpspec/phpspec": "~6.1",
"phpunit/phpunit": "~5.7" "phpunit/phpunit": "~5.7"
}, },
"autoload": { "autoload": {
@ -206,10 +206,6 @@
{ {
"type": "vcs", "type": "vcs",
"url": "https://github.com/tainmar/Laravel-Excel" "url": "https://github.com/tainmar/Laravel-Excel"
},
{
"type": "vcs",
"url": "https://github.com/loverg-c/unirest-php"
} }
] ]
} }

954
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -8,7 +8,7 @@ class_name: AcceptanceTester
modules: modules:
enabled: enabled:
- WebDriver: - WebDriver:
url: 'http://www.ninja.test:8000' url: 'http://ninja-master.test:8000'
window_size: 1024x768 window_size: 1024x768
wait: 5 wait: 5
restart: true restart: true

View File

@ -9,7 +9,7 @@ modules:
enabled: enabled:
- \Helper\Functional - \Helper\Functional
- PhpBrowser: - PhpBrowser:
url: 'http://www.ninja.test:8000' url: 'http://ninja-master.test:8000'
curl: curl:
CURLOPT_RETURNTRANSFER: true CURLOPT_RETURNTRANSFER: true
- Db: - Db: