Skip to content

Commit

Permalink
Updated to PHP 7.2 and PHP 7.3 compat
Browse files Browse the repository at this point in the history
Updates doctrine/orm to 2.6.3 and ocramius/proxy-manager to 2.2.2.
  • Loading branch information
EtienneBruines committed Jan 28, 2019
1 parent d9e7bd3 commit f8b8f37
Show file tree
Hide file tree
Showing 7 changed files with 1,856 additions and 1,433 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
language: php

php:
- 7.1
- 7.2
- 7.3

sudo: false

Expand All @@ -23,7 +23,7 @@ notifications:
jobs:
include:
- stage: lint
php: 7.2
php: 7.3
install:
- composer install && ant -f build/build.xml -Dapp.host=localhost -Ddb.user=travis -Ddb.host=127.0.0.1 -Ddb.name=shopware build-unit && curl -s -L "https://github.com/phpstan/phpstan/releases/download/0.10.5/phpstan.phar" > phpstan.phar && chmod +x phpstan.phar
script:
Expand Down
16 changes: 8 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"issues": "https://issues.shopware.com"
},
"require": {
"php": "^7.1",
"php": "^7.2",
"ext-ctype": "*",
"ext-curl": "*",
"ext-date": "*",
Expand Down Expand Up @@ -52,11 +52,11 @@
"symfony/expression-language": "3.4.21",
"symfony/web-link": "3.4.21",
"monolog/monolog": "1.23.0",
"doctrine/common": "2.7.3",
"doctrine/collections": "1.4.0",
"doctrine/dbal": "2.5.13",
"doctrine/orm": "2.5.14",
"doctrine/cache": "1.6.2",
"doctrine/common": "2.10.0",
"doctrine/collections": "1.5.0",
"doctrine/dbal": "2.6.3",
"doctrine/orm": "2.6.3",
"doctrine/cache": "1.8.0",
"beberlei/assert": "2.9.2",
"zendframework/zend-escaper": "2.5.2",
"oyejorge/less.php": "1.7.0.14",
Expand All @@ -70,7 +70,7 @@
"ramsey/uuid": "3.5.2",
"setasign/fpdf": "1.8.1",
"setasign/fpdi": "1.6.2",
"ocramius/proxy-manager": "1.0.2",
"ocramius/proxy-manager": "2.2.2",
"mpdf/mpdf": "7.0.3",
"php-http/curl-client": "1.7.1",
"guzzlehttp/psr7": "1.4.2",
Expand Down Expand Up @@ -131,7 +131,7 @@
"autoloader-suffix": "Shopware",
"optimize-autoloader": true,
"platform": {
"php": "7.1.0"
"php": "7.2.0"
}
},
"scripts": {
Expand Down
Loading

0 comments on commit f8b8f37

Please sign in to comment.