From 3d4232051d8fe0e9a38e23034677ba8133b98cf8 Mon Sep 17 00:00:00 2001 From: janpalen Date: Mon, 15 Jul 2024 14:53:29 +0200 Subject: [PATCH] OP-376 - Fixes --- .github/workflows/build.yml | 5 +- composer.json | 2 +- ecs.php | 2 - tests/Application/package.json.~1.12.0.dist | 58 --------------------- 4 files changed, 5 insertions(+), 62 deletions(-) delete mode 100644 tests/Application/package.json.~1.12.0.dist diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7c6b381..d8632bb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,11 +21,14 @@ jobs: strategy: fail-fast: false matrix: - php: ["8.1"] + php: ["8.0", "8.1"] symfony: ["^5.4", "^6.0"] sylius: ["~1.12.0", "~1.13.0"] node: ["14.x"] mysql: ["5.7", "8.0"] + exclude: + - sylius: "~1.13.0" + php: "8.0" env: APP_ENV: test diff --git a/composer.json b/composer.json index 9c5ca3c..d61b28b 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ "description": "Bonus points plugin for Sylius.", "license": "MIT", "require": { - "php": "^8.1", + "php": "^8.0 || ^8.1", "sylius/sylius": "~1.12.0 || ~1.13.0" }, "require-dev": { diff --git a/ecs.php b/ecs.php index 4a3eb77..4982640 100644 --- a/ecs.php +++ b/ecs.php @@ -5,8 +5,6 @@ use Symplify\EasyCodingStandard\Config\ECSConfig; return static function (ECSConfig $config): void { - - // Change this if you want to automatically add BitBag OpenSource Header putenv('ALLOW_BITBAG_OS_HEADER=1'); $config->import('vendor/bitbag/coding-standard/ecs.php'); diff --git a/tests/Application/package.json.~1.12.0.dist b/tests/Application/package.json.~1.12.0.dist deleted file mode 100644 index 68380d8..0000000 --- a/tests/Application/package.json.~1.12.0.dist +++ /dev/null @@ -1,58 +0,0 @@ -{ - "dependencies": { - "babel-polyfill": "^6.26.0", - "chart.js": "3.7.1", - "jquery": "^3.4.0", - "jquery.dirtyforms": "^2.0.0", - "lightbox2": "^2.9.0", - "semantic-ui-css": "^2.2.0", - "slick-carousel": "^1.8.1" - }, - "devDependencies": { - "@symfony/webpack-encore": "^0.28.0", - "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-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.11.0", - "fast-async": "^6.3.7", - "gulp": "^4.0.0", - "gulp-chug": "^0.5", - "gulp-concat": "^2.6.0", - "gulp-debug": "^2.1.2", - "gulp-if": "^2.0.0", - "gulp-livereload": "^4.0.1", - "gulp-order": "^1.1.1", - "gulp-sass": "^4.0.1", - "gulp-sourcemaps": "^1.6.0", - "gulp-uglifycss": "^1.0.5", - "merge-stream": "^1.0.0", - "rollup": "^0.60.2", - "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", - "sass-loader": "^7.0.1", - "upath": "^1.1.0", - "yargs": "^6.4.0" - }, - "scripts": { - "build": "gulp build", - "gulp": "gulp build", - "lint": "yarn lint:js", - "lint:js": "eslint gulpfile.babel.js" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/Sylius/Sylius.git" - }, - "author": "Paweł Jędrzejewski", - "license": "MIT" -}