Skip to content

Commit 6f98d74

Browse files
Merge pull request #245 from fedeisas/Drop-composer-lock
refactor: Drop composer.lock as this is a lib and composer.lock remains unused
2 parents db33890 + 62ea1f5 commit 6f98d74

File tree

5 files changed

+19
-5457
lines changed

5 files changed

+19
-5457
lines changed

.github/workflows/main.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,18 @@ jobs:
1616
include:
1717
- php: 8.0
1818
allow_fail: false
19-
name: 'PHP 8.0'
19+
name: 'PHP 8.0 with latest deps'
20+
- php: 8.0
21+
allow_fail: false
22+
name: 'PHP 8.0 with lowest stable deps'
23+
composer_update_flags: '--prefer-lowest --prefer-stable'
2024
- php: 8.1
2125
allow_fail: false
22-
name: 'PHP 8.1'
26+
name: 'PHP 8.1 with latest deps'
27+
- php: 8.1
28+
allow_fail: false
29+
name: 'PHP 8.1 with lowest stable deps'
30+
composer_update_flags: '--prefer-lowest --prefer-stable'
2331
steps:
2432
- uses: actions/checkout@v1
2533

@@ -38,12 +46,16 @@ jobs:
3846
uses: actions/cache@v2
3947
with:
4048
path: ${{ steps.composer-cache.outputs.dir }}
41-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
49+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
4250
restore-keys: ${{ runner.os }}-composer-
4351

4452
- name: Install dependencies
4553
run: composer install --prefer-dist --no-ansi --no-interaction --no-progress --optimize-autoloader
4654

55+
- name: Update dependencies
56+
if: matrix.composer_update_flags
57+
run: composer update ${{ matrix.composer_update_flags }}
58+
4759
- name: Setup Problem Matchers for PHPUnit
4860
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
4961
continue-on-error: ${{ matrix.allow_fail }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ composer.phar
44
.DS_Store
55
.idea/
66
.phpunit.result.cache
7+
composer.lock

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Laravel Mail CSS Inliner
1212
Most email clients won't render CSS (on a `<link>` or a `<style>`). The solution is inline your CSS directly on the HTML. Doing this by hand easily turns into unmantainable templates.
1313
The goal of this package is to automate the process of inlining that CSS before sending the emails.
1414

15-
## Instalation and compatability
15+
## Installation and compatability
1616

1717
Starting with version 5 this package requires PHP 8.0 and Laravel 9.0 or higher.
1818

composer.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@
1818
"ext-dom": "*",
1919
"illuminate/mail": "^9.0",
2020
"illuminate/support": "^9.0",
21+
"paragonie/random_compat": "~2.0 || ~9.99",
2122
"tijsverkoyen/css-to-inline-styles": "~2.2"
2223
},
2324
"require-dev": {
2425
"enlightn/security-checker": "^1.10",
26+
"guzzlehttp/guzzle": "^6.5.8 || ^7.4.5",
2527
"phpunit/phpunit": "^9.0",
2628
"symfony/mailer": "^6.0"
2729
},

0 commit comments

Comments
 (0)