Merge pull request #14 from antistatique/petarmarj/swisstopo/dev

antistatique · Jul 12, 2023 · d49b95c · d49b95c
2 parents a35cbac + cac35a2
commit d49b95c
Show file tree

Hide file tree

Showing 12 changed files with 110 additions and 109 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -10,7 +10,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['7.4', '8.0', '8.1']
+        php-versions: ['8.0', '8.1']
     steps:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

diff --git a/.gitignore b/.gitignore
@@ -18,3 +18,4 @@ composer.lock
 # PHPCS cache files
 .php_cs.cache
 .phpcs-cache
+.php-cs-fixer.cache
diff --git a/.php_cs.dist → .php-cs-fixer.dist.php b/.php_cs.dist → .php-cs-fixer.dist.php
@@ -1,16 +1,15 @@
 <?php
 
-$finder = PhpCsFixer\Finder::create()
+$finder = \PhpCsFixer\Finder::create()
     ->exclude('vendor')
     ->exclude('.sonarlint')
-    ->in(__DIR__)
-;
+    ->in(__DIR__);
 
-return PhpCsFixer\Config::create()
-    ->setRules([
+$config = new \PhpCsFixer\Config();
+
+return $config->setRules([
         '@Symfony' => true,
         'array_syntax' => ['syntax' => 'short'],
         'phpdoc_align' => ['align' => 'vertical', 'tags' => ['type', 'var']],
     ])
-    ->setFinder($finder)
-;
+    ->setFinder($finder);
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- fixed deprecations for development
+- fixed deprecations for PHP 8.1
+
 ### Changed
 - update changelog following 'keep a changelog' format
 - run code-styles Github Actions on PHP 8.1
@@ -18,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 - remove Travis integration for tests
 - remove StyleCI integration
+- remove support for PHP 7.4
 
 ## [0.0.1-alpha] - 2020-06-12
 ### Added

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Antistatique
+Copyright (c) 2020–2022 Antistatique
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/composer.json b/composer.json
@@ -3,18 +3,18 @@
     "description": "Convert GPS (WGS84) to Swiss (LV03 and LV95) coordinates (and vice versa)",
     "license": "MIT",
     "require": {
-        "php": ">=7.4"
+        "php": ">=8.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.0.0",
         "phpunit/php-code-coverage": "^9.2.0",
-        "friendsofphp/php-cs-fixer": "^2.16",
+        "friendsofphp/php-cs-fixer": "^3.0",
         "phpmd/phpmd": "^2.8",
         "sebastian/phpcpd": "^6.0",
         "sensiolabs/security-checker": "^5.0",
         "php-coveralls/php-coveralls": "^2.1",
         "php-mock/php-mock-phpunit": "^2.4",
-        "vimeo/psalm": "^3.11",
+        "vimeo/psalm": "^4.29",
         "phpstan/phpstan-deprecation-rules": "^0.12.2"
     },
     "autoload": {

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,27 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         failOnRisky="true"
-         failOnWarning="true"
-         stopOnFailure="false">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" colors="true" failOnRisky="true" failOnWarning="true" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+    <report>
+      <clover outputFile="./build/logs/clover.xml"/>
+      <html outputDirectory="./build/logs/coverage-html"/>
+    </report>
+  </coverage>
   <testsuites>
     <testsuite name="Swisstopo Test Suite">
       <directory suffix=".php">./tests/</directory>
     </testsuite>
   </testsuites>
-  <logging>
-    <log type="coverage-clover" target="./build/logs/clover.xml"/>
-    <log type="coverage-html" target="./build/logs/coverage-html"/>
-  </logging>
-  <filter>
-    <whitelist processUncoveredFilesFromWhitelist="true">
-      <directory suffix=".php">src</directory>
-    </whitelist>
-  </filter>
+  <logging/>
   <php>
     <!-- Temporarily preventing https://github.com/xdebug/xdebug/pull/699 -->
-    <const name="XDEBUG_CC_UNUSED"  value=""/>
-    <const name="XDEBUG_CC_DEAD_CODE"  value="-1"/>
+    <const name="XDEBUG_CC_UNUSED" value=""/>
+    <const name="XDEBUG_CC_DEAD_CODE" value="-1"/>
   </php>
 </phpunit>
diff --git a/psalm.xml b/psalm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <psalm
+  errorLevel="1"
   autoloader="vendor/autoload.php"
-  totallyTyped="false"
   requireVoidReturnType="false"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns="https://getpsalm.org/schema/config"