Merge remote-tracking branch 'origin/master'

# Conflicts:
#	composer.lock

Author: msyk

.github/workflows/Dockerfile-for-php-7.2 .github/workflows/php-7.2.dockerfile.github/workflows/Dockerfile-for-php-7.2 renamed to .github/workflows/php-7.2.dockerfile

@@ -0,0 +1,25 @@
+FROM --platform=linux/amd64 php:8.3.0beta1-apache
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    git \
+    iputils-ping \
+    libldap2-dev \
+    libpng-dev \
+    libpq-dev \
+    libsqlite3-dev \
+    libzip-dev \
+    mariadb-client \
+    postgresql-client \
+    sqlite3 \
+    sudo \
+    unzip \
+    vim \
+ && apt-get -y clean \
+ && rm -rf /var/lib/apt/lists/*
+RUN docker-php-ext-install bcmath zip pdo pdo_mysql pdo_pgsql pdo_sqlite exif gd ldap
+COPY composer.json /composer.json
+COPY composer.lock /composer.lock
+COPY src /src
+COPY test /test
+RUN curl -sS https://getcomposer.org/installer | php; mv composer.phar /usr/local/bin/composer; chmod +x /usr/local/bin/composer
+RUN cd / && composer update
+#RUN composer test

.github/workflows/Dockerfile-for-php-7.3 .github/workflows/php-7.3.dockerfile.github/workflows/Dockerfile-for-php-7.3 renamed to .github/workflows/php-7.3.dockerfile

@@ -4,76 +4,29 @@ on:
   push:
     branches:
       - "*"
+  pull_request:
+    branches: [ 'master', 'main' ]
+  schedule:
+    - cron:  '0 9 15 * *'
 
 jobs:
-  test-with-php82:
+  test:
+    name: Test
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
     steps:
-      - uses: actions/checkout@v2
-      - name: docker-compose-run
+      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - name: Run docker-compose
         shell: bash
         run: |
-          cp .github/workflows/Dockerfile-for-php-8.2 Dockerfile
+          cp .github/workflows/php-${{ matrix.php }}.dockerfile Dockerfile
           docker-compose up -d
-          sleep 60
-          docker-compose exec -T web sh -c "cd / && composer test"
-
-  test-with-php81:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: docker-compose-run
-        shell: bash
-        run: |
-          cp .github/workflows/Dockerfile-for-php-8.1 Dockerfile
-          docker-compose up -d
-          sleep 60
-          docker-compose exec -T web sh -c "cd / && composer test"
-
-  test-with-php80:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: docker-compose-run
-        shell: bash
-        run: |
-          cp .github/workflows/Dockerfile-for-php-8.0 Dockerfile
-          docker-compose up -d
-          sleep 60
-          docker-compose exec -T web sh -c "cd / && composer test"
-
-  test-with-php74:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: docker-compose-run
-        shell: bash
-        run: |
-          cp .github/workflows/Dockerfile-for-php-7.4 Dockerfile
-          docker-compose up -d
-          sleep 60
-          docker-compose exec -T web sh -c "cd / && composer test"
-
-  test-with-php73:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: docker-compose-run
-        shell: bash
-        run: |
-          cp .github/workflows/Dockerfile-for-php-7.3 Dockerfile
-          docker-compose up -d
-          sleep 60
-          docker-compose exec -T web sh -c "cd / && composer test"
+          sleep 30
 
-  test-with-php72:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: docker-compose-run
+      - name: Run testing
         shell: bash
         run: |
-          cp .github/workflows/Dockerfile-for-php-7.2 Dockerfile
-          docker-compose up -d
-          sleep 60
+          sleep 30
           docker-compose exec -T web sh -c "cd / && composer test"

.github/workflows/Dockerfile-for-php-7.4 .github/workflows/php-7.4.dockerfile.github/workflows/Dockerfile-for-php-7.4 renamed to .github/workflows/php-7.4.dockerfile

@@ -0,0 +1,42 @@
+name: run-phpstan
+
+on:
+  push:
+    branches:
+      - "*"
+  pull_request:
+    branches: [ 'master', 'main' ]
+
+jobs:
+  run:
+    name: Run PHPStan
+    runs-on: 'ubuntu-latest'
+    strategy:
+      matrix:
+        level: [ 0, 1, 2 ]
+        include:
+          - current-level: 0
+    steps:
+      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@72ae4ccbe57f82bbe08411e84e2130bd4ba1c10f # v2.25.5
+        with:
+          php-version: '8.1'
+
+      - name: Install PHPStan
+        run: composer require --dev phpstan/phpstan
+
+      - name: Run PHPStan
+        if:  matrix.level == matrix.current-level
+        continue-on-error: true
+        run: |
+             ./vendor/bin/phpstan analyse -l "${{ matrix.level }}" --memory-limit 128M src test
+             exit 0
+
+      - name: Run PHPStan
+        if:  matrix.level > matrix.current-level
+        continue-on-error: true
+        run: |
+             ./vendor/bin/phpstan analyse -l "${{ matrix.level }}" --memory-limit 128M src test
+             exit 0

.github/workflows/Dockerfile-for-php-8.0 .github/workflows/php-8.0.dockerfile.github/workflows/Dockerfile-for-php-8.0 renamed to .github/workflows/php-8.0.dockerfile

@@ -16,7 +16,8 @@
   },
   "require-dev": {
     "phpunit/phpunit": "*",
-    "phpdocumentor/phpdocumentor": ">=3"
+    "phpdocumentor/phpdocumentor": ">=3",
+    "phpstan/phpstan": "^1.10"
   },
   "autoload": {
     "psr-4": {