diff --git a/.travis.yml b/.travis.yml index 18ea154..d379a66 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,24 +4,8 @@ dist: trusty sudo: false -matrix: - include: - - - php: 7.1 - env: - - SYMFONY_VERSION="3.4.*" - - - php: 7.1 - env: - - SYMFONY_VERSION="4.1.*" - - - php: 7.2 - env: - - SYMFONY_VERSION="3.4.*" - - - php: 7.2 - env: - - SYMFONY_VERSION="4.1.*" +php: + - 7.2 cache: yarn: true @@ -33,6 +17,9 @@ env: global: - SYLIUS_CACHE_DIR=$HOME/.sylius-cache - SYLIUS_BUILD_DIR=etc/build + matrix: + - SYMFONY_VERSION="3.4.*" + - SYMFONY_VERSION="4.1.*" before_install: - phpenv config-rm xdebug.ini diff --git a/composer.json b/composer.json index 5022274..f943b31 100644 --- a/composer.json +++ b/composer.json @@ -3,13 +3,20 @@ "type": "sylius-plugin", "description": "Sylius plugin that enables order reordering for a customer", "license": "MIT", + "authors": [ + { + "name": "Bartosz Pietrzak", + "homepage": "/~https://github.com/bartoszpietrzak1994" + } + ], "require": { - "php": "^7.1", + "php": "^7.2", - "sylius/sylius": "^1.2" + "sylius/sylius": "~1.3.0", + "symfony/symfony": "^3.4|^4.1" }, "require-dev": { - "behat/behat": "^3.3", + "behat/behat": "^3.4", "behat/mink": "^1.7@dev", "behat/mink-browserkit-driver": "^1.3", "behat/mink-extension": "^2.2", @@ -23,9 +30,9 @@ "phpspec/phpspec": "^4.0", "phpstan/phpstan-shim": "^0.9.2", "phpunit/phpunit": "^6.5", - "se/selenium-server-standalone": "^2.52", "sylius-labs/coding-standard": "^2.0" }, + "minimum-stability": "dev", "prefer-stable": true, "autoload": { "psr-4": { diff --git a/phpstan.neon b/phpstan.neon index 7f94328..aa9fe5a 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -6,6 +6,3 @@ parameters: # Test dependencies - 'tests/Application/app/**.php' - 'tests/Application/src/**.php' - - ignoreErrors: - - '/Parameter #2 \$message of method Symfony\\Component\\HttpFoundation\\Session\\Flash\\FlashBagInterface::add\(\) expects string, array|string> given\./' diff --git a/tests/Application/.babelrc b/tests/Application/.babelrc index 22bda1f..e563a62 100644 --- a/tests/Application/.babelrc +++ b/tests/Application/.babelrc @@ -10,11 +10,6 @@ "plugins": [ ["transform-object-rest-spread", { "useBuiltIns": true - }], - ["transform-runtime", { - "helpers": true, - "polyfill": true, - "regenerator": true }] ] } diff --git a/tests/Application/package.json b/tests/Application/package.json index 576984f..6d89aa2 100644 --- a/tests/Application/package.json +++ b/tests/Application/package.json @@ -7,13 +7,18 @@ "semantic-ui-css": "^2.2.0" }, "devDependencies": { + "babel-core": "^6.26.3", + "babel-plugin-external-helpers": "^6.22.0", + "babel-plugin-module-resolver": "^3.1.1", "babel-plugin-transform-object-rest-spread": "^6.26.0", - "babel-plugin-transform-runtime": "^6.23.0", "babel-preset-env": "^1.7.0", "babel-register": "^6.26.0", + "dedent": "^0.7.0", "eslint": "^4.19.1", "eslint-config-airbnb-base": "^12.1.0", + "eslint-import-resolver-babel-module": "^4.0.0", "eslint-plugin-import": "^2.12.0", + "fast-async": "^6.3.7", "gulp": "^4.0.0", "gulp-chug": "^0.5", "gulp-concat": "^2.6.0", @@ -23,15 +28,20 @@ "gulp-order": "^1.1.1", "gulp-sass": "^4.0.1", "gulp-sourcemaps": "^1.6.0", - "gulp-uglify": "^1.5.1", "gulp-uglifycss": "^1.0.5", "merge-stream": "^1.0.0", + "rollup": "^0.60.7", + "rollup-plugin-babel": "^3.0.4", + "rollup-plugin-commonjs": "^9.1.3", + "rollup-plugin-inject": "^2.0.0", + "rollup-plugin-node-resolve": "^3.3.0", + "rollup-plugin-uglify": "^4.0.0", "upath": "^1.1.0", "yargs": "^6.4.0" }, "scripts": { - "build": "gulp", - "gulp": "gulp", + "build": "gulp build", + "gulp": "gulp build", "lint": "yarn lint:js", "lint:js": "eslint gulpfile.babel.js" },