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

Add PHP 8.2 compatibility #11

Merged
merged 4 commits into from
Oct 12, 2023
Merged

Add PHP 8.2 compatibility #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c37af64
Add PHP 8.2 compatibility
mdio Oct 12, 2023
fe62b2d
Update packages to latest version
mdio Oct 12, 2023
f1deb83
Fix psalm issues
mdio Oct 12, 2023
491ab18
Only run ci workflow on pushes to or PRs against main
mdio Oct 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
8 changes: 6 additions & 2 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: ci

on: [ push, pull_request ]
on:
push:
branches: [main]
pull_request:
branches: [main]

jobs:
build-test:
Expand All @@ -9,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php-versions: [ '7.4', '8.0', '8.1' ]
php-versions: [ '7.4', '8.0', '8.1', '8.2' ]

steps:
- uses: actions/checkout@v2
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 @@ -28,15 +28,15 @@
}
],
"require": {
"php": "^7.4 | ^8.0 | ^8.1",
"php": "^7.4 | ^8.0 | ^8.1 | ^8.2",
"ext-json": "*",
"researchgate/libris": "^2.3.0"
},
"require-dev": {
"phpunit/phpunit": "^9.3",
"squizlabs/php_codesniffer": "^3.5",
"vimeo/psalm": "^4.9",
"phpstan/phpstan": "^0.12.42",
"vimeo/psalm": "^5.15.0",
"phpstan/phpstan": "^1.10.38",
"friendsofphp/php-cs-fixer": "^3.1"
},
"autoload": {
Expand Down
4 changes: 3 additions & 1 deletion src/Model/Container.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@
namespace Geissler\Converter\Model;

use ReturnTypeWillChange;
use Geissler\Converter\Model\Entry;

/**
* Abstract container to access groups of objects as "array"-object.
*
* @author Benjamin Geißler <benjamin.geissler@gmail.com>
* @license MIT
*
* @template-implements \IteratorAggregate<int, mixed>
* @template-implements \ArrayAccess<int, mixed>
*/
abstract class Container implements \IteratorAggregate, \ArrayAccess, \Countable
{
Expand Down
6 changes: 3 additions & 3 deletions src/Model/Entry.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -950,7 +950,7 @@ public function getInterviewer()
* @param $issue
* @return Entry
*/
public function setIssue($issue)
public function setIssue(string $issue)
{
$this->issue = $issue;
return $this;
Expand Down Expand Up @@ -1582,7 +1582,7 @@ public function getSubmitted()
* @param $title
* @return Entry
*/
public function setTitle($title)
public function setTitle(string $title)
{
$this->title = $title;
return $this;
Expand Down Expand Up @@ -1690,7 +1690,7 @@ public function getVersion()
* @param $volume
* @return Entry
*/
public function setVolume($volume)
public function setVolume(string $volume)
{
$this->volume = $volume;
return $this;
Expand Down
Loading