Merge pull request #1477 from Catrobat/develop

Patch release v3.8.3

Author: dmetzner

.env

@@ -14,7 +14,7 @@
 # https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
 
 # Define the App Environment
-APP_VERSION=3.8.3
+APP_VERSION=3.8.4
 APP_ENV=dev
 APP_DEBUG=0
 APP_NAME="PocketCode Share"

.github/workflows/code_quality.yml

@@ -69,7 +69,7 @@ jobs:
 
       # Optional - improve performance by caching
       - id: npm-cache
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         with:
           path: node_modules
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -106,7 +106,7 @@ jobs:
 
       # Optional - improve performance by caching
       - id: npm-cache
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         with:
           path: node_modules
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -147,7 +147,7 @@ jobs:
 
       # Optional - improve performance by caching
       - id: composer-cache
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         with:
           path: |
             vendor
@@ -191,7 +191,7 @@ jobs:
 
       # Optional - improve performance by caching
       - id: composer-cache
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         with:
           path: |
             vendor
@@ -240,7 +240,7 @@ jobs:
 
       # Optional - improve performance by caching
       - id: composer-cache
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         with:
           path: |
             vendor
@@ -295,7 +295,7 @@ jobs:
 
       # Optional - improve performance by caching
       - id: composer-cache
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         with:
           path: |
             vendor
@@ -349,7 +349,7 @@ jobs:
 
       # Optional - improve performance by caching
       - id: composer-cache
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         with:
           path: |
             vendor
@@ -389,7 +389,7 @@ jobs:
 
       # Optional - improve performance by caching
       - id: composer-cache
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         with:
           path: |
             vendor
@@ -430,7 +430,7 @@ jobs:
 
       # Optional - improve performance by caching
       - id: composer-cache
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         with:
           path: |
             vendor

composer.json

@@ -61,10 +61,10 @@
         "doctrine/doctrine-fixtures-bundle": "^3.3",
         "dvdoug/behat-code-coverage": "^5.0",
         "friendsofphp/php-cs-fixer": "^2.17",
-        "phpstan/phpstan": "0.12.82",
+        "phpstan/phpstan": "0.12.83",
         "phpstan/phpstan-doctrine": "0.12.33",
         "phpstan/phpstan-phpunit": "0.12.18",
-        "phpstan/phpstan-symfony": "0.12.21",
+        "phpstan/phpstan-symfony": "0.12.24",
         "phpunit/phpunit": "^9.5",
         "symfony/browser-kit": "^5.0",
         "symfony/maker-bundle": "*",

composer.lock

@@ -23,8 +23,8 @@
   "devDependencies": {
     "@fortawesome/fontawesome-free": "^5.15.2",
     "@symfony/webpack-encore": "^1.1.2",
-    "core-js": "^3.10.0",
-    "eslint": "^7.23.0",
+    "core-js": "^3.10.1",
+    "eslint": "^7.24.0",
     "eslint-config-standard": "^16.0.2",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-node": "^11.1.0",
@@ -75,9 +75,9 @@
     "js-yaml": "^4.0.0",
     "lazysizes": "^5.3.2",
     "material-design-icons": "^3.0.1",
-    "npm": "^7.8.0",
+    "npm": "^7.9.0",
     "popper.js": "^1.16.1",
-    "sweetalert2": "^10.15.7",
+    "sweetalert2": "^10.16.0",
     "textfilljs": "^1.0.3-a",
     "vis": "^4.21.0"
   },

package-lock.json

@@ -205,7 +205,9 @@ public function projectsCategoriesGet(?string $max_version = null, ?string $flav
     $flavor = $this->getDefaultFlavorOnNull($flavor);
 
     $response = [];
-    $categories = ['recent', 'random', 'most_viewed', 'most_downloaded', 'example', 'scratch', 'recommended'];
+
+    //removed recommended on purpose
+    $categories = ['recent', 'random', 'most_viewed', 'most_downloaded', 'example', 'scratch'];
     $user = $this->facade->getAuthenticationManager()->getAuthenticatedUser();
 
     foreach ($categories as $category) {

package.json

@@ -1,2 +1,2 @@
 <a class="btn btn-sm btn-default" href="{{ admin.generateObjectUrl('acceptProgramReport', object) }}"><i
-      class="glyphicon glyphicon-edit"></i> Accept </a>
+      class="glyphicon glyphicon-edit"></i> Confirm report</a>

src/Api/ProjectsApi.php

@@ -1,2 +1,2 @@
 <a class="btn btn-sm btn-default" href="{{ admin.generateObjectUrl('unreportProgram', object) }}"><i
-      class="glyphicon glyphicon-edit"></i> Decline </a>
+      class="glyphicon glyphicon-edit"></i> Reject report </a>