Skip to content

Commit 2852759

Browse files
committed
wip
1 parent c9d26b6 commit 2852759

File tree

7 files changed

+26
-28
lines changed

7 files changed

+26
-28
lines changed

.github/workflows/tests.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,12 @@ jobs:
9999
- name: Setup Problem Matchers for PHPUnit
100100
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
101101

102+
- name: Allow Symfony 8 pre-releases
103+
if: contains(matrix.symfony-version, '8.')
104+
run: |
105+
composer config minimum-stability dev
106+
composer config prefer-stable true
107+
102108
# These dependencies are not used running the tests but can cause deprecation warnings so we remove them before running the tests
103109
- name: Remove unused dependencies
104110
run: composer remove vimeo/psalm phpstan/phpstan friendsofphp/php-cs-fixer --dev --no-interaction --no-update
@@ -156,6 +162,12 @@ jobs:
156162
- name: Remove optional packages
157163
run: composer remove doctrine/dbal doctrine/doctrine-bundle symfony/messenger symfony/twig-bundle symfony/cache symfony/http-client --dev --no-update
158164

165+
- name: Allow Symfony 8 pre-releases
166+
if: contains(matrix.symfony-version || '', '8.')
167+
run: |
168+
composer config minimum-stability dev
169+
composer config prefer-stable true
170+
159171
- name: Install dependencies
160172
uses: ramsey/composer-install@v3
161173
with:

composer.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
"description": "Symfony integration for Sentry (http://getsentry.com)",
55
"keywords": ["logging", "errors", "symfony", "sentry"],
66
"homepage": "http://getsentry.com",
7+
"minimum-stability": "dev",
8+
"prefer-stable": true,
79
"license": "MIT",
810
"authors": [
911
{
@@ -27,7 +29,7 @@
2729
},
2830
"require-dev": {
2931
"doctrine/dbal": "^2.13||^3.3||^4.0",
30-
"doctrine/doctrine-bundle": "^2.6",
32+
"doctrine/doctrine-bundle": "^2.6||^3.0",
3133
"friendsofphp/php-cs-fixer": "^2.19||^3.40",
3234
"masterminds/html5": "^2.8",
3335
"phpstan/extension-installer": "^1.0",
@@ -41,7 +43,7 @@
4143
"symfony/framework-bundle": "^4.4.20||^5.0.11||^6.0||^7.0||^8.0",
4244
"symfony/http-client": "^4.4.20||^5.0.11||^6.0||^7.0||^8.0",
4345
"symfony/messenger": "^4.4.20||^5.0.11||^6.0||^7.0||^8.0",
44-
"symfony/monolog-bundle": "^3.4",
46+
"symfony/monolog-bundle": "^3.4||^4.0",
4547
"symfony/phpunit-bridge": "^5.2.6||^6.0||^7.0||^8.0",
4648
"symfony/process": "^4.4.20||^5.0.11||^6.0||^7.0||^8.0",
4749
"symfony/security-core": "^4.4.20||^5.0.11||^6.0||^7.0||^8.0",

tests/End2End/App/KernelForBufferTest.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
1616
{
1717
parent::registerContainerConfiguration($loader);
1818
$loader->load(__DIR__ . '/config_buffer_test.yml');
19-
20-
if ($this->supportsHubId()) {
21-
$loader->load(__DIR__ . '/config_buffer_test_newer_versions.yml');
22-
} else {
23-
$loader->load(__DIR__ . '/config_buffer_test_php72.yml');
24-
}
2519
}
2620

2721
/**

tests/End2End/App/config.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ framework:
1717
router: { resource: "%routing_config_dir%/routing.yml" }
1818
secret: secret
1919
test: ~
20-
annotations: false
2120
php_errors:
2221
log: true
2322
# Use FS cache for testing

tests/End2End/App/config_buffer_test.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ services:
44
- '@Sentry\State\HubInterface'
55
- !php/const Monolog\Logger::WARNING
66

7+
app.sentry.handler:
8+
class: Sentry\Monolog\Handler
9+
arguments:
10+
- '@Sentry\State\HubInterface'
11+
- !php/const Monolog\Logger::WARNING
12+
713
Sentry\SentryBundle\Tests\End2End\App\Controller\BufferFlushController:
814
autowire: true
915
tags:
@@ -31,6 +37,10 @@ services:
3137

3238
monolog:
3339
handlers:
40+
sentry:
41+
type: service
42+
id: app.sentry.handler
43+
level: warning
3444
main:
3545
type: stream
3646
path: "%kernel.logs_dir%/%kernel.environment%.log"

tests/End2End/App/config_buffer_test_newer_versions.yml

Lines changed: 0 additions & 6 deletions
This file was deleted.

tests/End2End/App/config_buffer_test_php72.yml

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)