Merge pull request #33 from acsiomatic/dep-compat-policy

Update to maintained dependencies

.editorconfig

@@ -10,6 +10,3 @@ trim_trailing_whitespace = true
 
 [*.md]
 trim_trailing_whitespace = false
-
-[Makefile]
-indent_style = tab

.github/workflows/composer-normalizer.yaml

@@ -13,20 +13,20 @@ on:
 
 jobs:
 
- rector:
+ composer-normalizer:
 
  name: Composer Normalizer
  runs-on: ubuntu-latest
 
  steps:
 
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
 
  - name: Setup tools
  uses: shivammathur/setup-php@v2
  with:
- php-version: 8.1
+ php-version: 8.2
  tools: composer-normalize
  coverage: none
 

.github/workflows/php-cs-fixer.yaml

@@ -21,27 +21,23 @@ jobs:
  steps:
 
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
 
  - name: Setup tools
  uses: shivammathur/setup-php@v2
  with:
- php-version: 8.1
+ php-version: 8.2
  tools: cs2pr
  coverage: none
 
  - name: Install Composer dependencies
  uses: ramsey/composer-install@v2
 
- - name: Create var/ directory
- run: mkdir var
-
  - name: Cache PHP Coding Standards
- uses: actions/cache@v2
+ uses: actions/cache@v3
  with:
  path: var/.php_cs.cache
  key: php-cs-fixer-${{ github.sha }}
- restore-keys: php-cs-fixer-
 
  - name: Run PHP Coding Standards
  run: vendor/bin/php-cs-fixer fix --dry-run --format=checkstyle | cs2pr

.github/workflows/phpstan.yaml

@@ -21,24 +21,23 @@ jobs:
  steps:
 
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
 
  - name: Setup tools
  uses: shivammathur/setup-php@v2
  with:
- php-version: 8.1
+ php-version: 8.2
  tools: cs2pr
  coverage: none
 
  - name: Install Composer dependencies
  uses: ramsey/composer-install@v2
 
  - name: Cache PHPStan
- uses: actions/cache@v2
+ uses: actions/cache@v3
  with:
  path: var/phpstan/
  key: phpstan-${{ github.sha }}
- restore-keys: phpstan-
 
  - name: Run PHP Static Analysis
  run: vendor/bin/phpstan analyse --no-progress --error-format=checkstyle | cs2pr

.github/workflows/phpunit.yaml

@@ -17,27 +17,19 @@ jobs:
 
  name: DD ${{ matrix.dd }} SF ${{ matrix.sf }} PHP ${{ matrix.php }}
  runs-on: ubuntu-latest
+ continue-on-error: ${{ matrix.is_next }}
+
  strategy:
- fail-fast: false
  matrix:
  include:
- - { dd: '4.0.*', sf: '4.0.*', php: '7.2' }
- - { dd: '^4.0', sf: '^4.0', php: '7.2' }
- - { dd: '4.0.*', sf: '5.0.*', php: '7.3' }
- - { dd: '^4.0', sf: '^5.0', php: '7.3' }
- - { dd: '5.0.*', sf: '5.0.*', php: '7.4' }
- - { dd: '^5.0', sf: '^5.0', php: '7.4' }
- - { dd: '5.0.*', sf: '6.0.*', php: '8.0' }
- - { dd: '^5.0', sf: '^6.0', php: '8.0' }
- - { dd: '5.0.*', sf: '6.0.*', php: '8.1' }
- - { dd: '^5.0', sf: '^6.0', php: '8.1' }
- - { dd: '6.0.*', sf: '6.0.*', php: '8.1' }
- - { dd: '^6.0', sf: '^6.0', php: '8.1' }
+ - { dd: '6.1.*', sf: '5.4.*', php: '8.1', is_next: false }
+ - { dd: '6.1.*', sf: '6.4.*', php: '8.2', is_next: false }
+ - { dd: '6.1.*', sf: '7.0.*', php: '8.3', is_next: false }
 
  steps:
 
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
 
  - name: Setup PHP
  uses: shivammathur/setup-php@v2
@@ -46,10 +38,10 @@ jobs:
  coverage: none
 
  - name: Require specific dependencies versions
- run: composer require matomo/device-detector:${{ matrix.dd }} symfony/framework-bundle:${{ matrix.sf }}
+ run: composer require -w matomo/device-detector:${{ matrix.dd }} symfony/framework-bundle:${{ matrix.sf }}
 
  - name: Install Composer dependencies
  uses: ramsey/composer-install@v2
 
  - name: Run PHPUnit
- run: vendor/bin/phpunit --testdox
+ run: vendor/bin/phpunit

.github/workflows/rector.yaml

@@ -21,12 +21,12 @@ jobs:
  steps:
 
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
 
  - name: Setup tools
  uses: shivammathur/setup-php@v2
  with:
- php-version: 8.1
+ php-version: 8.2
  coverage: none
 
  - name: Install Composer dependencies

.gitignore

@@ -1,5 +1,4 @@
 /.php-cs-fixer.php
-/Makefile
 /composer.lock
 /phpstan.neon
 /phpunit.xml

.php-cs-fixer.dist.php

@@ -1,21 +1,14 @@
 <?php
 
-$finder = PhpCsFixer\Finder::create()
- ->in([
- __DIR__.'/src',
- __DIR__.'/tests',
- ]);
-
 return (new PhpCsFixer\Config())
- ->setCacheFile(__DIR__.'/var/.php_cs.cache')
+ ->setCacheFile(__DIR__ . '/var/.php_cs.cache')
  ->setRiskyAllowed(true)
  ->setRules([
- '@Symfony' => true,
- '@Symfony:risky' => true,
- 'method_chaining_indentation' => true,
- 'ordered_class_elements' => true,
- 'php_unit_test_case_static_method_calls' => true,
- 'static_lambda' => true,
- 'yoda_style' => false,
+ '@PER-CS' => true,
+ '@PER-CS:risky' => true,
+ 'no_unused_imports' => true,
  ])
- ->setFinder($finder);
+ ->setFinder(PhpCsFixer\Finder::create()->in([
+ __DIR__ . '/src',
+ __DIR__ . '/tests',
+ ]));