Skip to content

Commit

Permalink
Laravel 10.x Compatibility (tzsk#922)
Browse files Browse the repository at this point in the history
* Bump dependencies for Laravel 10

* Update GitHub Actions for Laravel 10

* Drop PHP 8.0 and Use Pint

* Remove php8.0 from test workflow

---------

Co-authored-by: tzsk <[email protected]>
  • Loading branch information
laravel-shift and tzsk authored Feb 15, 2023
1 parent 4533f04 commit 2eaea22
Show file tree
Hide file tree
Showing 17 changed files with 1,125 additions and 1,065 deletions.
24 changes: 0 additions & 24 deletions .github/workflows/php-cs-fixer.yml

This file was deleted.

33 changes: 33 additions & 0 deletions .github/workflows/pint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Pint

on: [pull_request]

jobs:
Pint:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: "8.1"

- name: Cache composer dependencies
uses: actions/cache@v2
with:
path: vendor
key: composer-${{ hashFiles('composer.lock') }}

- name: Run composer install
run: composer install -n --prefer-dist

- name: Run Pint
run: ./vendor/bin/pint

- name: Commit changes
uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: Apply php-cs Fixes
commit_author: Kazi Ahmed <[email protected]>
4 changes: 1 addition & 3 deletions .github/workflows/psalm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.0'
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
coverage: none
php-version: "8.1"

- name: Cache composer dependencies
uses: actions/cache@v2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@ jobs:
fail-fast: true
matrix:
os: [ubuntu-latest]
php: [8.0, 8.1]
laravel: [8.*, 9.*]
php: [8.1]
laravel: [8.*, 9.*, 10.*]
dependency-version: [prefer-stable]
include:
- laravel: 10.*
testbench: 8.*
- laravel: 8.*
testbench: 6.*
- laravel: 9.*
Expand All @@ -34,8 +36,6 @@ jobs:
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
coverage: none

- name: Install dependencies
run: |
Expand Down
41 changes: 0 additions & 41 deletions .php-cs-fixer.dist.php

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

![GitHub License](https://img.shields.io/github/license/tzsk/sms?style=for-the-badge)
[![Latest Version on Packagist](https://img.shields.io/packagist/v/tzsk/sms.svg?style=for-the-badge&logo=composer)](https://packagist.org/packages/tzsk/sms)
[![GitHub Tests Action Status](https://img.shields.io/github/actions/workflow/status/tzsk/sms/run-tests.yml?branch=master&label=tests&style=for-the-badge&logo=github)](https://github.com/tzsk/sms/actions?query=workflow%3ATests+branch%3Amaster)
[![GitHub Tests Action Status](https://img.shields.io/github/actions/workflow/status/tzsk/sms/tests.yml?branch=master&label=tests&style=for-the-badge&logo=github)](https://github.com/tzsk/sms/actions?query=workflow%3ATests+branch%3Amaster)
[![Total Downloads](https://img.shields.io/packagist/dt/tzsk/sms.svg?style=for-the-badge&logo=laravel)](https://packagist.org/packages/tzsk/sms)

This is a Laravel Package for SMS Gateway Integration. Now Sending SMS is easy.
Expand Down
17 changes: 8 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,24 +27,24 @@
}
],
"require": {
"php": "^8.0",
"php": "^8.1",
"guzzlehttp/guzzle": "^7.0",
"illuminate/http": "^8.0|^9.0",
"illuminate/support": "^8.0|^9.0"
"illuminate/http": "^8.0|^9.0|^10.0",
"illuminate/support": "^8.0|^9.0|^10.0"
},
"require-dev": {
"aws/aws-sdk-php": "^3.87",
"friendsofphp/php-cs-fixer": "^3.0",
"kavenegar/php": "^1.2",
"laravel/legacy-factories": "^1.0",
"laravel/pint": "^1.5",
"mediaburst/clockworksms": "^2.0",
"melipayamak/php": "^1.0.0",
"orchestra/testbench": "^6.0|^7.0",
"orchestra/testbench": "^6.0|^7.0|^8.0",
"phpunit/phpunit": "^9.3",
"sms77/api": "^v2.4.0",
"smsgatewayme/client": "^0.0.1",
"twilio/sdk": "^6.0",
"vimeo/psalm": "^5.0",
"sms77/api": "^v2.4.0"
"vimeo/psalm": "^5.0"
},
"autoload": {
"psr-4": {
Expand All @@ -62,8 +62,7 @@
"scripts": {
"psalm": "vendor/bin/psalm",
"test": "vendor/bin/phpunit --colors=always",
"test-coverage": "vendor/bin/phpunit --coverage-html coverage",
"format": "vendor/bin/php-cs-fixer fix --allow-risky=yes"
"format": "vendor/bin/pint"
},
"config": {
"sort-packages": true
Expand Down
Loading

0 comments on commit 2eaea22

Please sign in to comment.