diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index bafec72..38a3d9e 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-version: ['8.3', '8.2', '8.1', '8.0'] + php-version: ['8.3', '8.2', '8.1'] steps: - uses: actions/checkout@v4 - name: Install PHP diff --git a/Dockerfile b/Dockerfile index e823b8c..e5737a1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ COPY composer.json /app RUN composer install --no-dev --optimize-autoloader -FROM php:8.3-alpine +FROM php:8.2-alpine COPY . /app diff --git a/composer.json b/composer.json index bd95acb..29566cc 100644 --- a/composer.json +++ b/composer.json @@ -11,11 +11,11 @@ "monolog/monolog": "^2.1.1", "pimple/pimple": "^3.2", "psr/log": "^1.1.4", - "symfony/browser-kit": "^5.4", - "symfony/css-selector": "^5.4", - "symfony/dom-crawler": "^5.4", - "symfony/http-client": "^5.4", - "symfony/yaml": "^5.3", + "symfony/browser-kit": "^6.3", + "symfony/css-selector": "^6.3", + "symfony/dom-crawler": "^6.3", + "symfony/http-client": "^6.3", + "symfony/yaml": "^6.3", "telegram-bot/api": "^2.3", "verifiedjoseph/ntfy-php-library": "^4" }, @@ -25,7 +25,7 @@ } }, "require-dev": { - "phpunit/phpunit": "^9.3.8" + "phpunit/phpunit": "^10.4" }, "autoload-dev": { "psr-4": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 221ad9c..9d997b4 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,23 +1,18 @@ - - - - - - - - src - - - - - tests - - + + + + + + + + tests + + + + + src + + diff --git a/tests/Config/Rules/AfterDateRuleTest.php b/tests/Config/Rules/AfterDateRuleTest.php index c69279d..3a2408f 100644 --- a/tests/Config/Rules/AfterDateRuleTest.php +++ b/tests/Config/Rules/AfterDateRuleTest.php @@ -14,7 +14,7 @@ public function testInvalidInput(): void { self::expectException(\InvalidArgumentException::class); new AfterDateRule('HelloWorld'); - self::assertStringStartsWith('Failed to parse before', self::getExpectedExceptionMessage()); + self::expectExceptionMessage('Failed to parse before'); } public function testPassesValid(): void diff --git a/tests/Config/Rules/AfterRuleTest.php b/tests/Config/Rules/AfterRuleTest.php index 4afb985..213c02c 100644 --- a/tests/Config/Rules/AfterRuleTest.php +++ b/tests/Config/Rules/AfterRuleTest.php @@ -14,7 +14,7 @@ public function testInvalidInput(): void { self::expectException(\InvalidArgumentException::class); new AfterRule('HelloWorld'); - self::assertStringStartsWith('Failed to parse after', self::getExpectedExceptionMessage()); + self::expectExceptionMessage('Failed to parse after'); } public function testPassesValid(): void diff --git a/tests/Config/Rules/BeforeDateRuleTest.php b/tests/Config/Rules/BeforeDateRuleTest.php index f303ab4..b129521 100644 --- a/tests/Config/Rules/BeforeDateRuleTest.php +++ b/tests/Config/Rules/BeforeDateRuleTest.php @@ -14,7 +14,7 @@ public function testInvalidInput(): void { self::expectException(\InvalidArgumentException::class); new BeforeDateRule('HelloWorld'); - self::assertStringStartsWith('Failed to parse before', self::getExpectedExceptionMessage()); + self::expectExceptionMessage('Failed to parse before'); } public function testPassesValid(): void diff --git a/tests/Config/Rules/BeforeRuleTest.php b/tests/Config/Rules/BeforeRuleTest.php index 2bafece..2714b07 100644 --- a/tests/Config/Rules/BeforeRuleTest.php +++ b/tests/Config/Rules/BeforeRuleTest.php @@ -14,7 +14,7 @@ public function testInvalidInput(): void { self::expectException(\InvalidArgumentException::class); new BeforeRule('HelloWorld'); - self::assertStringStartsWith('Failed to parse before', self::getExpectedExceptionMessage()); + self::expectExceptionMessage('Failed to parse before'); } public function testPassesValid(): void