Skip to content

Commit

Permalink
Update dependencies (#21)
Browse files Browse the repository at this point in the history
  • Loading branch information
mpdude authored Sep 4, 2024
1 parent 0f2b4b5 commit b1a0657
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 20 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ on:
pull_request:

env:
PHP_VERSION: 8.1
PHP_VERSION: 8.3

jobs:
composer-require-checker:
name: Check missing composer requirements
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- uses: shivammathur/setup-php@v2
with:
Expand All @@ -33,4 +33,4 @@ jobs:
- run: |
composer install --no-interaction --no-progress --ansi --no-scripts
composer show
- uses: docker://webfactory/composer-require-checker:3.2.0
- uses: docker://ghcr.io/webfactory/composer-require-checker:4.12.0
2 changes: 1 addition & 1 deletion .github/workflows/fix-cs-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ name: Coding Standards
jobs:
fix-cs-issues:
name: PHP-CS-Fixer
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
if: github.actor != 'dependabot[bot]'
steps:
- name: Checkout code
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ on:
pull_request:

env:
PHP_VERSION: 7.4
PSALM_VERSION: 4.22.0
PHP_VERSION: 8.3
PSALM_VERSION: 5.25.0

jobs:
Psalm:
name: Psalm
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- uses: shivammathur/setup-php@v2
with:
Expand Down
7 changes: 4 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@
],

"require": {
"psr/log": "^1|^2|^3",
"php": "^7.2|8.0.*|8.1.*|8.2.*|8.3.*"
"php": "^7.2|8.0.*|8.1.*|8.2.*|8.3.*",
"psr/log": "^1|^2|^3"
},

"require-dev": {
"phpunit/phpunit": "^8.5|^9.5",
"phpunit/phpunit": "^8.5|^9.5|^10.5",
"symfony/error-handler": "^5.4|^6.4|^7.1",
"symfony/phpunit-bridge": ">= 6.0"
},

Expand Down
9 changes: 1 addition & 8 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/8.5/phpunit.xsd"
bootstrap="vendor/autoload.php" colors="true">

<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" bootstrap="vendor/autoload.php" colors="true" cacheDirectory=".phpunit.cache">
<testsuites>
<testsuite name="Project Test Suite">
<directory>tests</directory>
</testsuite>
</testsuites>
<listeners>
<listener class="\Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
</listeners>
</phpunit>
4 changes: 2 additions & 2 deletions src/Synchronizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ private function fetchSourceId(object $sourceObject): int
{
$id = $this->mapper->idOf($sourceObject);

if ($this->lastSourceId && $id < $this->lastSourceId) {
if (null !== $this->lastSourceId && $id < $this->lastSourceId) {
throw new ContentMappingException('Source IDs are out of order');
}
$this->lastSourceId = $id;
Expand All @@ -115,7 +115,7 @@ private function fetchDestinationId(object $destinationObject): int
{
$id = $this->destination->idOf($destinationObject);

if ($this->lastDestinationId && $id < $this->lastDestinationId) {
if (null !== $this->lastDestinationId && $id < $this->lastDestinationId) {
throw new ContentMappingException('Destination IDs are out of order');
}
$this->lastDestinationId = $id;
Expand Down

0 comments on commit b1a0657

Please sign in to comment.