Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
dave-redfern committed Mar 2, 2024
1 parent 96b2d71 commit ed8710e
Show file tree
Hide file tree
Showing 8 changed files with 57 additions and 37 deletions.
48 changes: 32 additions & 16 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,40 @@
name: tests

on:
push:

create:
tags:
- '*'

push:
branches: [ master ]
pull_request:
branches: [ master ]
workflow_dispatch:
create:
tags:
- '*'
jobs:
build:
runs-on: ubuntu-latest
testsuite:
name: Unittests
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
php-version: ['8.1', '8.2', '8.3']

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 1

steps:
- uses: actions/checkout@v2
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-version }}
extensions: json
tools: pecl

- name: Validate composer.json and composer.lock
run: composer validate
- name: Validate composer.json
run: composer validate

- name: Install dependencies
run: composer install --prefer-dist --no-progress --no-suggest
- name: Composer install
run: composer install --prefer-dist --no-progress

- name: Run test suite
run: vendor/bin/phpunit
- name: Run PHPUnit
run: vendor/bin/phpunit --exclude-group=amqp
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,4 @@ Network Trash Folder
Temporary Items
.apdisk
/.phpunit.result.cache
/.phpunit.cache
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Change Log
==========

2024-02-24 - 5.4.0
------------------

* Bump minimum PHP to 8.1
* Remove all unnecessary docblock comments

2022-05-27 - 5.3.0
------------------

Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
}
],
"require": {
"php": ">=8.0",
"php": ">=8.1",
"ext-json": "*"
},
"require-dev": {
"phpunit/phpunit": "~9.5",
"symfony/phpunit-bridge": "~6.0",
"symfony/var-dumper": "~6.0",
"phpunit/phpunit": "^10.5",
"symfony/phpunit-bridge": "^6.4",
"symfony/var-dumper": "^6.4",
"victorjonsson/markdowndocs": "^1.3"
},
"autoload": {
Expand Down
25 changes: 11 additions & 14 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,28 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
backupGlobals="false" colors="true">
<coverage processUncoveredFiles="true">
<include>
<directory suffix=".php">src/</directory>
</include>
<exclude>
<directory>bin</directory>
<directory>tests</directory>
</exclude>
</coverage>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
backupGlobals="false" colors="true" cacheDirectory=".phpunit.cache">
<php>
<ini name="error_reporting" value="-1"/>
<ini name="memory_limit" value="256M"/>
<env name="SHELL_VERBOSITY" value="-1"/>
<env name="SYMFONY_DEPRECATIONS_HELPER" value="weak"/>
</php>
<listeners>
<listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
</listeners>
<testsuites>
<testsuite name="Project Test Suite">
<directory>tests/</directory>
</testsuite>
</testsuites>
<source>
<include>
<directory suffix=".php">src/</directory>
</include>
<exclude>
<directory>bin</directory>
<directory>tests</directory>
</exclude>
</source>
</phpunit>
2 changes: 1 addition & 1 deletion tests/Behaviours/MagicMethodTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@ public function testMagicUnset()

$this->assertEquals('bar', $col->foo);
unset($col->foo);
$this->assertObjectNotHasAttribute('foo', $col);
$this->assertObjectNotHasProperty('foo', $col);
}
}
2 changes: 1 addition & 1 deletion tests/Behaviours/Query/ArrayAccessorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,6 @@ public function testOffsetUnset()
$col['bar'] = 'too';
unset($col['bar']);

$this->assertObjectNotHasAttribute('bar', $col);
$this->assertObjectNotHasProperty('bar', $col);
}
}
2 changes: 1 addition & 1 deletion tests/MutableSetTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public function testMutatingMethodsReturnCollectionInstance(string $method, ...$
$this->assertInstanceOf($col->getCollectionClass(), $ret);
}

public function methods(): array
public static function methods(): array
{
return [
['keys',],
Expand Down

0 comments on commit ed8710e

Please sign in to comment.