From d6d353fafff539684d4143d4ab276b4ecbe0a4f2 Mon Sep 17 00:00:00 2001 From: wakebit <32976842+wakebit@users.noreply.github.com> Date: Thu, 31 Mar 2022 23:32:29 +0500 Subject: [PATCH] remove support for laravel 6 nonresolvable dependency conflict (?) --- .github/workflows/tests-laravel-6.yml | 33 --------------------------- README.md | 2 +- composer.json | 6 ++--- 3 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 .github/workflows/tests-laravel-6.yml diff --git a/.github/workflows/tests-laravel-6.yml b/.github/workflows/tests-laravel-6.yml deleted file mode 100644 index 7900473..0000000 --- a/.github/workflows/tests-laravel-6.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: Tests Laravel 6 - -on: [push, pull_request] - -jobs: - tests-laravel-6: - runs-on: ubuntu-latest - - strategy: - fail-fast: false - matrix: - php: [7.2, 7.3, 7.4] - - name: PHP ${{ matrix.php }} - - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - extensions: mbstring, sqlite, pdo_sqlite, iconv - coverage: none - - - name: Install dependencies - run: | - composer require "laravel/framework:6.*" "orchestra/testbench:4.*" --no-interaction --no-update - composer update --prefer-stable --prefer-dist --no-interaction - - - name: Execute tests - run: vendor/bin/phpunit diff --git a/README.md b/README.md index 8e9ed24..b7a1d45 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ This package provides an integration [Cycle ORM v1](https://cycle-orm.dev) with ## Requirements * PHP >= 7.2 -* Laravel 6, 7, 8, 9 +* Laravel 7, 8, 9 ## Installation 1. Install the package via composer: diff --git a/composer.json b/composer.json index 716f6d8..60a6f5f 100644 --- a/composer.json +++ b/composer.json @@ -5,9 +5,9 @@ "license": "MIT", "require": { "php": "^7.2|^7.3|^7.4|^8.0|^8.1", - "illuminate/console": "^6.0|^7.0|^8.0|^9.0", - "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0", - "illuminate/support": "^6.0|^7.0|^8.0|^9.0", + "illuminate/console": "^7.0|^8.0|^9.0", + "illuminate/contracts": "^7.0|^8.0|^9.0", + "illuminate/support": "^7.0|^8.0|^9.0", "wakebit/cycle-bridge": "^1.0" }, "require-dev": {