Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix deprecation (implicit conversion) for PHP 8.1 #14

Merged
merged 14 commits into from
Jul 12, 2023
Merged

Fix deprecation (implicit conversion) for PHP 8.1 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
50e29b7
Update dependencies
Sep 13, 2022
88bfc0b
Migrate PHPUnit
Sep 13, 2022
8871987
PHP 8 fix
Sep 13, 2022
a072338
Update Version + PSR12
Sep 13, 2022
e72c690
Update psalm, fix deprecated config file
Nov 2, 2022
2a3142a
psalm: totallyTyped=true becomes errorLevel=1
Nov 2, 2022
ce3e3c5
php-cs-fixer: upgrade config for codesniffer
Nov 2, 2022
687ff41
security-checker is deprecated, should be replaced
Nov 2, 2022
89f1732
happy new year.
Nov 2, 2022
a90396a
changelog
Nov 2, 2022
cf5e3da
Merge branch 'dev' into dev
WengerK Jul 12, 2023
14168dc
Apply suggestions from code review
WengerK Jul 12, 2023
b378528
remove support of PPH 7.4
WengerK Jul 12, 2023
cac35a2
remove PHP 7.4 tests coverage
WengerK Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ composer.lock
# PHPCS cache files
.php_cs.cache
.phpcs-cache
.php-cs-fixer.cache
13 changes: 6 additions & 7 deletions .php_cs.dist → .php-cs-fixer.dist.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
30 changes: 13 additions & 17 deletions phpunit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion psalm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Loading
Loading