Skip to content

Commit e73eedd

Browse files
committed
Merge branch 'develop' for v4.3.0
2 parents 379791d + 2db9423 commit e73eedd

File tree

12 files changed

+1138
-343
lines changed

12 files changed

+1138
-343
lines changed

.github/workflows/test_and_build.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
schedule:
88
- cron: '30 3 * * *'
99

10-
name: EE test & build
10+
name: Build 🔨 + Test 👨‍🔧
1111

1212
jobs:
1313

@@ -35,7 +35,7 @@ jobs:
3535
- name: Set up PHP
3636
uses: shivammathur/setup-php@v2
3737
with:
38-
php-version: '7.3'
38+
php-version: '7.4'
3939
coverage: none
4040
tools: composer
4141
extensions: pcntl, curl, sqlite3, zip, dom, mbstring, json
@@ -86,7 +86,11 @@ jobs:
8686
test: #----------------------------------------------------------------------
8787
runs-on: ubuntu-latest
8888
needs: [build]
89-
name: Behat Tests
89+
name: Behat Tests - PHP ${{ matrix.php }}
90+
strategy:
91+
fail-fast: false
92+
matrix:
93+
php: ['7.2', '7.3', '7.4', '8.0']
9094
steps:
9195
- name: Check out source code
9296
uses: actions/checkout@v2
@@ -108,7 +112,7 @@ jobs:
108112
- name: Set up PHP
109113
uses: shivammathur/setup-php@v2
110114
with:
111-
php-version: '7.3'
115+
php-version: '${{ matrix.php }}'
112116
coverage: none
113117
tools: composer
114118
extensions: pcntl, curl, sqlite3, zip, dom, mbstring, json

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.2.0
1+
4.3.0

composer.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"config": {
1919
"platform": {
20-
"php": "7.1"
20+
"php": "7.3"
2121
},
2222
"sort-packages": true
2323
},
@@ -35,27 +35,27 @@
3535
"easyengine/mailhog-command": "v1.0.2",
3636
"easyengine/service-command": "v1.2.0",
3737
"easyengine/shell-command": "v1.1.0",
38-
"easyengine/site-command": "v2.7.1",
39-
"easyengine/site-type-php": "v1.4.0",
40-
"easyengine/site-type-wp": "v1.4.0",
38+
"easyengine/site-command": "v2.8.2",
39+
"easyengine/site-type-php": "v1.5.0",
40+
"easyengine/site-type-wp": "v1.5.0",
4141
"monolog/monolog": "1.24.0",
42-
"mustache/mustache": "2.12.0",
42+
"mustache/mustache": "2.13.0",
4343
"rmccue/requests": "1.8.0",
44-
"symfony/config": "3.4.18",
45-
"symfony/console": "3.4.35",
46-
"symfony/debug": "3.4.18",
47-
"symfony/dependency-injection": "3.4.27",
48-
"symfony/event-dispatcher": "3.4.18",
49-
"symfony/filesystem": "3.4.35",
50-
"symfony/finder": "3.4.35",
51-
"symfony/process": "3.4.35",
52-
"symfony/translation": "3.4.18",
53-
"symfony/yaml": "3.4.18",
44+
"symfony/config": "4.4.*",
45+
"symfony/console": "4.4.*",
46+
"symfony/debug": "4.4.*",
47+
"symfony/dependency-injection": "4.4.*",
48+
"symfony/event-dispatcher": "4.4.*",
49+
"symfony/filesystem": "4.4.*",
50+
"symfony/finder": "4.4.*",
51+
"symfony/process": "4.4.*",
52+
"symfony/translation": "4.4.*",
53+
"symfony/yaml": "4.4.*",
5454
"wp-cli/mustangostang-spyc": "0.6.3",
5555
"wp-cli/php-cli-tools": "0.11.10"
5656
},
5757
"require-dev": {
58-
"behat/behat": "3.7.0",
58+
"behat/behat": "3.8.1",
5959
"dealerdirect/phpcodesniffer-composer-installer": "0.7.0",
6060
"phpunit/phpunit": "3.7.*",
6161
"phpcompatibility/php-compatibility": "8.2.0",

0 commit comments

Comments
 (0)