Merge pull request #118 from Coderberg/2.x

Release v2.10.0

.eslintrc

@@ -8,18 +8,6 @@
     "sourceType": "module"
   },
   "rules": {
-    "linebreak-style": ["off", "unix"],
-    "no-console": "error",
-    "quotes": ["error", "single"],
-    "semi": ["error", "always"],
-    "no-var": "error",
-    "eqeqeq": ["error", "always"],
-    "object-curly-spacing": "off",
-    "no-const-assign": "error",
-    "newline-before-return": "error",
-    "no-unreachable": "error",
-    "no-extra-semi": "error",
-    "no-unexpected-multiline": "error",
     "comma-dangle": [
       "error",
       {
@@ -29,6 +17,22 @@
         "exports": "never",
         "functions": "never"
       }
-    ]
+    ],
+    "eqeqeq": ["error", "always"],
+    "linebreak-style": ["off", "unix"],
+    "newline-before-return": "error",
+    "no-console": "error",
+    "no-const-assign": "error",
+    "no-extra-semi": "error",
+    "no-lonely-if": "error",
+    "no-unexpected-multiline": "error",
+    "no-unused-vars": "error",
+    "no-unreachable": "error",
+    "no-var": "error",
+    "object-curly-spacing": "off",
+    "operator-assignment": "error",
+    "prefer-destructuring": "error",
+    "quotes": ["error", "single"],
+    "semi": ["error", "always"]
   }
 }

.github/workflows/lint.yml

@@ -5,8 +5,7 @@ on:
   push:
     branches:
       - master
-      - 1.x
-      - 2.x
+      - '*.x'
 
 env:
   fail-fast: true
@@ -22,7 +21,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v2.3.3
+        uses: actions/checkout@v4
 
       - name: "Install PHP with extensions"
         uses: shivammathur/[email protected]
@@ -37,7 +36,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: "Cache composer"
-        uses: actions/cache@v2.1.2
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-${{ matrix.php-version }}-composer-${{ hashFiles('composer.lock') }}

.github/workflows/mariadb.yml

@@ -21,7 +21,7 @@ jobs:
         php-versions: ['8.3']
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Verify MariaDB connection
         env:
           PORT: ${{ job.services.mariadb.ports[3306] }}
@@ -39,7 +39,7 @@ jobs:
         id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composercache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

.github/workflows/mysql.yml

@@ -20,7 +20,7 @@ jobs:
         php-versions: ['8.2']
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       # Docs: https://github.com/shivammathur/setup-php
       - name: Setup PHP, with composer and extensions
@@ -38,7 +38,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache composer dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composercache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

.github/workflows/ossar-analysis.yml

@@ -16,7 +16,7 @@ jobs:
     steps:
       # Checkout your code repository to scan
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.

.github/workflows/postgres.yml

@@ -20,7 +20,7 @@ jobs:
         php-versions: ['8.2', '8.3']
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
         with:
@@ -31,7 +31,7 @@ jobs:
         id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composercache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

.php-cs-fixer.dist.php

@@ -17,7 +17,7 @@
     ->setRiskyAllowed(true)
     ->setRules([
         '@PHP80Migration:risky' => true,
-        '@PHP81Migration' => true,
+        '@PHP82Migration' => true,
         '@Symfony' => true,
         '@Symfony:risky' => true,
         'array_syntax' => ['syntax' => 'short'],

Dockerfile

@@ -2,8 +2,6 @@
 
 # Versions
 FROM dunglas/frankenphp:1-alpine AS frankenphp_upstream
-FROM composer/composer:2-bin AS composer_upstream
-
 
 # The different stages of this Dockerfile are meant to be built into separate images
 # https://docs.docker.com/develop/develop-images/multistage-build/#stop-at-a-specific-build-stage
@@ -26,13 +24,17 @@ RUN apk add --no-cache \
 
 RUN set -eux; \
 	install-php-extensions \
+		@composer \
 		apcu \
     	gd \
 		intl \
 		opcache \
 		zip \
 	;
 
+# https://getcomposer.org/doc/03-cli.md#composer-allow-superuser
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
 ###> recipes ###
 ###> symfony/panther ###
 # Chromium and ChromeDriver
@@ -59,12 +61,6 @@ COPY --link frankenphp/Caddyfile /etc/caddy/Caddyfile
 
 ENTRYPOINT ["docker-entrypoint"]
 
-# https://getcomposer.org/doc/03-cli.md#composer-allow-superuser
-ENV COMPOSER_ALLOW_SUPERUSER=1
-ENV PATH="${PATH}:/root/.composer/vendor/bin"
-
-COPY --from=composer_upstream --link /composer /usr/bin/composer
-
 HEALTHCHECK --start-period=60s CMD curl -f http://localhost:2019/metrics || exit 1
 CMD [ "frankenphp", "run", "--config", "/etc/caddy/Caddyfile" ]
 

assets/js/user/_property.js

@@ -22,7 +22,7 @@
         let $counter = $('.js-counter');
         let counter = $counter.text();
         counter = Number.parseInt(counter);
-        counter = counter - 1;
+        counter -= 1;
         $counter.text(counter);
     }
 })($);

assets/js/user/password/_update_password.js

@@ -22,7 +22,7 @@
                 location.reload();
             })
             .fail(function (data) {
-                const message = JSON.parse(data.responseText).message;
+                const {message} = JSON.parse(data.responseText);
                 $alert.text(message).slideDown();
             });
     });

compose.yaml

@@ -55,7 +55,7 @@ services:
 
   phpmyadmin:
     image: phpmyadmin/phpmyadmin
-    restart: always
+    restart: unless-stopped
     environment:
       PMA_HOST: mysql
       PMA_PORT: 3306