Skip to content

Commit 07ab4ac

Browse files
dmetznerdmetzner
authored
Merge pull request #1648 from Catrobat/release/v3.9.0
Release v3.9.0 into master
2 parents 61ed335 + 5634cce commit 07ab4ac

File tree

287 files changed

+14410
-12265
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

287 files changed

+14410
-12265
lines changed

‎.env‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
1515

1616
# Define the App Environment
17-
APP_VERSION='3.8.7'
17+
APP_VERSION='3.9.0'
1818
APP_ENV=dev
1919
APP_DEBUG=0
2020
APP_NAME="PocketCode Share"
@@ -120,3 +120,7 @@ APPLE_SECRET=''
120120
#
121121
FB_OAUTH_PUBLIC_KEY="-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt8PoehZlIGzBqrm8fLTr\n2vVkLC1H/CYCv7DFz16KGiTVqMEyKiAYoCudcmtGJTJ5+Do62Zvl+VRwpOMmNUof\nEfe7ngUYNWu1/cab3P74HxGDy3mBcBZUhBk7V+nvN/j+mWCfDRaKxZZUjv1TVLUa\n990kUHnPchwyVMFEIrP//xhY5z0K8FijfKuSgjeBuXT5wRreUP7Y9L4v8WjnWuUM\nteptT5Oh+k0E13Oui4hCIELGW2tMnmrPjb6ObGx4swKN5wAePZeJ4mP0Xn39G8Vd\n+bkMtZeosNmo6S/oNIdE+TfKT0Hpe4HK4ft4MWtMyzj27zEqqCfzqNfMqiNIYjHb\nHwIDAQAB\n-----END PUBLIC KEY-----"
122122
###< hwi/oauth-bundle ###
123+
124+
###> translation ###
125+
ITRANSLATE_API_KEY=''
126+
###< translation ###

‎.github/workflows/check_for_new_bricks.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
name: Check for new Catroid Bricks
3838
runs-on: ubuntu-latest
3939
steps:
40-
- uses: actions/checkout@v2
40+
- uses: actions/checkout@v2.3.4
4141

4242
- name: Set Permissions
4343
run: sudo chmod 755 bin/checkCatroidRepositoryForNewBricks

‎.github/workflows/code_quality.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
name: JavaScript [ESLint]
6161
runs-on: ubuntu-latest
6262
steps:
63-
- uses: actions/checkout@v2
63+
- uses: actions/checkout@v2.3.4
6464

6565
# Download and set up node (caching is enabled)
6666
- uses: actions/setup-node@v2.1.5
@@ -97,7 +97,7 @@ jobs:
9797
name: Sass,CSS [StyleLint]
9898
runs-on: ubuntu-latest
9999
steps:
100-
- uses: actions/checkout@v2
100+
- uses: actions/checkout@v2.3.4
101101

102102
# Download and set up node (caching is enabled)
103103
- uses: actions/setup-node@v2.1.5
@@ -136,7 +136,7 @@ jobs:
136136
name: PHP Code Style [Php-CS-Fixer]
137137
runs-on: ubuntu-latest
138138
steps:
139-
- uses: actions/checkout@v2
139+
- uses: actions/checkout@v2.3.4
140140

141141
- name: Install dependencies (php-imagick)
142142
run: |
@@ -179,7 +179,7 @@ jobs:
179179
name: PHP Static Analysis [Php-Stan]
180180
runs-on: ubuntu-latest
181181
steps:
182-
- uses: actions/checkout@v2
182+
- uses: actions/checkout@v2.3.4
183183

184184
- name: Install dependencies (php-imagick)
185185
run: |
@@ -223,10 +223,10 @@ jobs:
223223
name: PHP Static Analysis [Psalm]
224224
runs-on: ubuntu-latest
225225
steps:
226-
- uses: actions/checkout@v2
226+
- uses: actions/checkout@v2.3.4
227227

228228
- name: Setup PHP 7.4
229-
uses: shivammathur/setup-php@v2
229+
uses: shivammathur/setup-php@2.11.0
230230
with:
231231
php-version: 7.4
232232

@@ -269,7 +269,7 @@ jobs:
269269
name: PHP Static Analysis [PhpCPD]
270270
runs-on: ubuntu-latest
271271
steps:
272-
- uses: actions/checkout@v2
272+
- uses: actions/checkout@v2.3.4
273273
- name: PHP Copy Paste Detector
274274
uses: StephaneBour/actions-php-cpd@8.0
275275
with:
@@ -284,7 +284,7 @@ jobs:
284284
name: PHP Static Analysis [Phpdd]
285285
runs-on: ubuntu-latest
286286
steps:
287-
- uses: actions/checkout@v2
287+
- uses: actions/checkout@v2.3.4
288288

289289
- name: Install dependencies (php-imagick)
290290
run: |
@@ -324,7 +324,7 @@ jobs:
324324
name: PHP Info [PhpLoc]
325325
runs-on: ubuntu-latest
326326
steps:
327-
- uses: actions/checkout@v2
327+
- uses: actions/checkout@v2.3.4
328328
- run: wget https://phar.phpunit.de/phploc.phar
329329
- run: php phploc.phar src tests
330330

@@ -337,7 +337,7 @@ jobs:
337337
name: Twig [Lint]
338338
runs-on: ubuntu-latest
339339
steps:
340-
- uses: actions/checkout@v2
340+
- uses: actions/checkout@v2.3.4
341341

342342
- name: Install dependencies (php-imagick)
343343
run: |
@@ -378,7 +378,7 @@ jobs:
378378
name: Yaml [Lint]
379379
runs-on: ubuntu-latest
380380
steps:
381-
- uses: actions/checkout@v2
381+
- uses: actions/checkout@v2.3.4
382382

383383
- name: Install dependencies (php-imagick)
384384
run: |
@@ -423,7 +423,7 @@ jobs:
423423
name: Symfony Container [Lint]
424424
runs-on: ubuntu-latest
425425
steps:
426-
- uses: actions/checkout@v2
426+
- uses: actions/checkout@v2.3.4
427427

428428
- name: Install dependencies (php-imagick)
429429
run: |

‎.github/workflows/container_tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
runs-on: ubuntu-latest
4444
steps:
4545
- name: Checkout
46-
uses: actions/checkout@v2
46+
uses: actions/checkout@v2.3.4
4747

4848
- name: Build and start all containers (Docker Compose)
4949
run: |

‎.github/workflows/create_release_pull_request.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
if: '[[ ${{ github.event.inputs.versionCode }} =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]'
2929

3030
steps:
31-
- uses: actions/checkout@v2
31+
- uses: actions/checkout@v2.3.4
3232

3333
# The changes here will be overwritten, however we need changes, else the PR will be automatically closed by GitHub
3434
- name: Dummy Changes to keep PR open
@@ -37,7 +37,7 @@ jobs:
3737
3838
- name: Create Pull Request to main branch
3939
id: cpr-main
40-
uses: peter-evans/create-pull-request@v3
40+
uses: peter-evans/create-pull-request@v3.9.2
4141
with:
4242
token: ${{ secrets.GITHUB_TOKEN }}
4343
commit-message: Prepare release v${{ github.event.inputs.versionCode }}
@@ -70,15 +70,15 @@ jobs:
7070
needs: createRelease_01
7171

7272
steps:
73-
- uses: actions/checkout@v2
73+
- uses: actions/checkout@v2.3.4
7474

7575
- name: Set Version Code
7676
run: |
7777
sed -i -E "s/APP_VERSION='[0-9]+\.[0-9]+\.[0-9]+'/APP_VERSION='${{ github.event.inputs.versionCode }}'/" .env
7878
7979
- name: Create Pull Request to develop branch
8080
id: cpr-develop
81-
uses: peter-evans/create-pull-request@v3
81+
uses: peter-evans/create-pull-request@v3.9.2
8282
with:
8383
token: ${{ secrets.GITHUB_TOKEN }}
8484
commit-message: Prepare release v${{ github.event.inputs.versionCode }}

‎.github/workflows/deployment.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
runs-on: ubuntu-latest
2929
steps:
3030
- name: Checkout
31-
uses: actions/checkout@v2
31+
uses: actions/checkout@v2.3.4
3232

3333
- name: Connect to TUG via VPN
3434
run: |

‎.github/workflows/sync_crowdin.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
name: Synchronize Crowdin Translations
4646
runs-on: ubuntu-latest
4747
steps:
48-
- uses: actions/checkout@v2
48+
- uses: actions/checkout@v2.3.4
4949

5050
- uses: crowdin/github-action@1.1.0
5151
with:

‎.github/workflows/tests.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- name: Checkout
35-
uses: actions/checkout@v2
35+
uses: actions/checkout@v2.3.4
3636

3737
- name: Build catroweb app image
3838
run: |
@@ -62,7 +62,7 @@ jobs:
6262
runs-on: ubuntu-latest
6363
steps:
6464
- name: Checkout
65-
uses: actions/checkout@v2
65+
uses: actions/checkout@v2.3.4
6666

6767
- name: Pull the latest images to build (Faster than caching)
6868
run: |
@@ -98,7 +98,7 @@ jobs:
9898
name: PhpUnitTestReport
9999
path: tests/testreports/coverage/phpunit
100100

101-
- uses: codecov/codecov-action@v1
101+
- uses: codecov/codecov-action@v1.5.0
102102
with:
103103
# token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
104104
file: tests/testreports/coverage/phpunit/coverage.xml
@@ -149,6 +149,7 @@ jobs:
149149
- api-deprecated-profile
150150
- api-deprecated-upload
151151

152+
- web-achievements
152153
- web-admin
153154
- web-apk-generation
154155
- web-authentication
@@ -172,7 +173,7 @@ jobs:
172173

173174
steps:
174175
- name: Checkout
175-
uses: actions/checkout@v2
176+
uses: actions/checkout@v2.3.4
176177

177178
- name: Pull the latest images to build (Faster than caching)
178179
run: |
@@ -240,7 +241,7 @@ jobs:
240241
docker exec app.catroweb bin/behat -s ${{ matrix.testSuite }} -f pretty;
241242
fi
242243
243-
- uses: codecov/codecov-action@v1
244+
- uses: codecov/codecov-action@v1.5.0
244245
with:
245246
# token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
246247
file: tests/testreports/coverage/behat/coverage.xml

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ behat.yml
8888
###> friendsofphp/php-cs-fixer ###
8989
/.php_cs
9090
/.php_cs.cache
91+
/.php-cs-fixer.cache
9192
###< friendsofphp/php-cs-fixer ###
9293

9394
###> lexik/jwt-authentication-bundle ###

.php_cs.dist renamed to .php-cs-fixer.dist.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@
22

33
$finder = PhpCsFixer\Finder::create()
44
->exclude(['Migrations', 'Resources'])
5-
->in(['src', 'tests']);
5+
->in(['src', 'tests'])
6+
->append([
7+
__DIR__.'/php-cs-fixer',
8+
]);
69

7-
return PhpCsFixer\Config::create()
10+
$config = new PhpCsFixer\Config();
11+
$config
12+
->setRiskyAllowed(true)
813
->setRules([
914
'@PSR2' => true,
1015
'@PhpCsFixer' => true,
@@ -15,3 +20,5 @@
1520
->setFinder($finder)
1621
->setUsingCache(true)
1722
->setIndent(' ');
23+
24+
return $config;

0 commit comments

Comments
 (0)