Skip to content

Commit a69e121

Browse files
committed
Codestyle: improvements (#36)
1 parent 109c7cb commit a69e121

File tree

4 files changed

+29
-21
lines changed

4 files changed

+29
-21
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ indent_style = tab
1111
indent_size = tab
1212
tab_width = 4
1313

14-
[{*.json,*.yaml,*.yml,*.md}]
14+
[{*.yaml, *.yml, *.md}]
1515
indent_style = space
1616
indent_size = 2

.github/workflows/main.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ name: "build"
33
on:
44
pull_request:
55
paths-ignore:
6-
- ".docs/**"
6+
- ".docs/**"
77
push:
88
branches:
9-
- "master"
9+
- "*"
1010
schedule:
1111
- cron: "0 8 * * 1" # At 08:00 on Monday
1212

1313
env:
1414
extensions: "json"
1515
cache-version: "1"
16-
composer-version: "v1"
16+
composer-version: "v2"
1717
composer-install: "composer update --no-interaction --no-progress --no-suggest --prefer-dist --prefer-stable"
1818

1919
jobs:
@@ -23,8 +23,8 @@ jobs:
2323

2424
strategy:
2525
matrix:
26-
php-version: ["7.4"]
27-
operating-system: ["ubuntu-latest"]
26+
php-version: [ "7.4" ]
27+
operating-system: [ "ubuntu-latest" ]
2828
fail-fast: false
2929

3030
steps:
@@ -82,8 +82,8 @@ jobs:
8282

8383
strategy:
8484
matrix:
85-
php-version: ["7.4"]
86-
operating-system: ["ubuntu-latest"]
85+
php-version: [ "7.4" ]
86+
operating-system: [ "ubuntu-latest" ]
8787
fail-fast: false
8888

8989
steps:
@@ -138,16 +138,16 @@ jobs:
138138

139139
strategy:
140140
matrix:
141-
php-version: ["7.2", "7.3", "7.4"]
142-
operating-system: ["ubuntu-latest"]
141+
php-version: [ "7.2", "7.3", "7.4" ]
142+
operating-system: [ "ubuntu-latest" ]
143143
composer-args: [ "" ]
144144
include:
145145
- php-version: "7.4"
146146
operating-system: "ubuntu-latest"
147147
composer-args: "--prefer-lowest"
148148
- php-version: "8.0"
149149
operating-system: "ubuntu-latest"
150-
composer-args: "--ignore-platform-reqs"
150+
composer-args: ""
151151
fail-fast: false
152152

153153
continue-on-error: "${{ matrix.php-version == '8.0' }}"
@@ -207,8 +207,8 @@ jobs:
207207

208208
strategy:
209209
matrix:
210-
php-version: ["7.4"]
211-
operating-system: ["ubuntu-latest"]
210+
php-version: [ "7.4" ]
211+
operating-system: [ "ubuntu-latest" ]
212212
fail-fast: false
213213

214214
if: "github.event_name == 'push'"

README.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,10 @@ For details on how to use this package, check out our [documentation](.docs).
3232

3333
## Versions
3434

35-
| State | Version | Branch | Nette | PHP |
36-
|-------------|---------|----------|--------|----------|
37-
| dev | `^1.2` | `master` | 3.0+ | `>= 7.1` |
38-
| stable | `^1.1` | `master` | 3.0+ | `>= 7.1` |
39-
35+
| State | Version | Branch | Nette | PHP |
36+
|-------------|-----------|----------|--------|----------|
37+
| dev | `^2.2.0` | `master` | 3.0+ | `>= 7.1` |
38+
| stable | `^2.1.0` | `master` | 3.0+ | `>= 7.1` |
4039

4140
## Development
4241

composer.json

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,17 @@
22
"name": "contributte/image-storage",
33
"type": "library",
44
"description": "Image storage for Nette framework",
5-
"keywords": ["image", "nette", "storage", "crop", "resize", "upload"],
6-
"license": ["MIT"],
5+
"keywords": [
6+
"image",
7+
"nette",
8+
"storage",
9+
"crop",
10+
"resize",
11+
"upload"
12+
],
13+
"license": [
14+
"MIT"
15+
],
716
"support": {
817
"issues": "https://github.com/contributte/image-storage/issues"
918
},
@@ -42,7 +51,7 @@
4251
"prefer-stable": true,
4352
"extra": {
4453
"branch-alias": {
45-
"dev-master": "1.2.x-dev"
54+
"dev-master": "2.2.x-dev"
4655
}
4756
}
4857
}

0 commit comments

Comments
 (0)