From 0ab1646597eb975e27c437d629b55975f02291ad Mon Sep 17 00:00:00 2001 From: Andrey Helldar Date: Mon, 14 Feb 2022 14:18:34 +0300 Subject: [PATCH] Added Laravel 9 --- .codecov.yml | 1 - .github/workflows/laravel-8.yml | 2 +- .github/workflows/laravel-9.yml | 48 +++++++++++++++++++++++ .styleci.yml | 67 --------------------------------- composer.json | 10 ++--- 5 files changed, 54 insertions(+), 74 deletions(-) delete mode 100644 .codecov.yml create mode 100644 .github/workflows/laravel-9.yml delete mode 100644 .styleci.yml diff --git a/.codecov.yml b/.codecov.yml deleted file mode 100644 index db24720..0000000 --- a/.codecov.yml +++ /dev/null @@ -1 +0,0 @@ -comment: off diff --git a/.github/workflows/laravel-8.yml b/.github/workflows/laravel-8.yml index 4f9a16a..3acb38e 100644 --- a/.github/workflows/laravel-8.yml +++ b/.github/workflows/laravel-8.yml @@ -11,7 +11,7 @@ jobs: php: [ "7.3", "7.4", "8.0", "8.1" ] laravel: [ "8.0" ] - name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }} + name: PHP ${{ matrix.php }} services: mysql: diff --git a/.github/workflows/laravel-9.yml b/.github/workflows/laravel-9.yml new file mode 100644 index 0000000..2505d83 --- /dev/null +++ b/.github/workflows/laravel-9.yml @@ -0,0 +1,48 @@ +name: "Laravel 9" +on: [ push ] + +jobs: + build: + runs-on: ubuntu-latest + + strategy: + fail-fast: true + matrix: + php: [ "8.0", "8.1" ] + laravel: [ "9.0" ] + + name: PHP ${{ matrix.php }} + + services: + mysql: + image: mysql:5.7 + env: + MYSQL_ROOT_PASSWORD: root + MYSQL_DATABASE: default + ports: + - 3306:3306 + options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv, bcmath + coverage: none + + - name: Store environment variables + run: | + echo "CASHIER_TINKOFF_QR_CLIENT_ID=${{ secrets.CASHIER_TINKOFF_QR_CLIENT_ID }}" >> .env + echo "CASHIER_TINKOFF_QR_CLIENT_SECRET=${{ secrets.CASHIER_TINKOFF_QR_CLIENT_SECRET }}" >> .env + + - name: Install dependencies + run: composer require laravel/framework:^${{ matrix.laravel }} --prefer-stable --prefer-dist --no-progress --no-interaction + + - name: Execute tests + run: sudo vendor/bin/phpunit + env: + MYSQL_HOST: 127.0.0.1 diff --git a/.styleci.yml b/.styleci.yml deleted file mode 100644 index cb07b4b..0000000 --- a/.styleci.yml +++ /dev/null @@ -1,67 +0,0 @@ -preset: psr12 - -risky: true - -enabled: - - align_double_arrow - - align_equals - - align_phpdoc - - alpha_ordered_imports - - binary_operator_spaces - - blank_line_before_continue - - blank_line_before_declare - - blank_line_before_return - - blank_line_before_throw - - blank_line_before_try - - cast_spaces - - combine_consecutive_issets - - const_separation - - dir_constant - - fully_qualified_strict_types - - logical_operators - - method_separation - - no_alias_functions - - no_blank_lines_after_phpdoc - - no_blank_lines_between_traits - - no_empty_comment - - no_empty_phpdoc - - no_extra_block_blank_lines - - no_extra_consecutive_blank_lines - - no_short_bool_cast - - no_trailing_comma_in_singleline_array - - no_unneeded_control_parentheses - - no_unused_imports - - ordered_class_elements - - php_unit_construct - - php_unit_fqcn_annotation - - phpdoc_indent - - phpdoc_inline_tag - - phpdoc_link_to_see - - phpdoc_no_access - - phpdoc_no_empty_return - - phpdoc_no_package - - phpdoc_no_useless_inheritdoc - - phpdoc_order - - phpdoc_property - - phpdoc_return_self_reference - - phpdoc_scalar - - phpdoc_separation - - phpdoc_summary - - phpdoc_to_comment - - phpdoc_trim - - phpdoc_type_to_var - - phpdoc_types - - phpdoc_types_order - - phpdoc_var_without_name - - property_separation - - self_accessor - - short_array_syntax - - short_list_syntax - - single_line_class_definition - - single_line_throw - - single_quote - - space_after_semicolon - - standardize_not_equals - - ternary_to_null_coalescing - - trailing_comma_in_multiline_array - - trim_array_spaces diff --git a/composer.json b/composer.json index 5912147..b61a06b 100644 --- a/composer.json +++ b/composer.json @@ -25,17 +25,17 @@ }, "require": { "php": "^7.3 || ^8.0", - "cashier-provider/core": "^2.0", - "cashier-provider/tinkoff-auth": "^2.0", + "cashier-provider/core": "^2.5", + "cashier-provider/tinkoff-auth": "^2.1", "psr/http-message": "^1.0" }, "require-dev": { "ext-json": "*", "dragon-code/support": "^5.0", - "illuminate/database": "^6.0 || ^7.0 || ^8.0", - "orchestra/testbench": "^4.0 || ^5.0 || ^6.0", + "illuminate/database": "^6.0 || ^7.0 || ^8.0 || ^9.0", + "orchestra/testbench": "^4.0 || ^5.0 || ^6.0 || ^7.0", "phpunit/phpunit": "^9.0", - "symfony/var-dumper": "^4.0 || ^5.0" + "symfony/var-dumper": "^4.0 || ^5.0 || ^6.0" }, "minimum-stability": "stable", "prefer-stable": true,