Skip to content

Commit

Permalink
Merge branch '7.1' into 7.2
Browse files Browse the repository at this point in the history
* 7.1:
  fix tests
  fix tests
  [DependencyInjection] Add tests for repeating `#[Autoconfigure]` attributes
  [DependencyInjection] Fix handling of repeated `#[Autoconfigure]` attributes
  update from Postgres 10 to 16
  [SecurityBundle] Make security schema deterministic
  [Translations][Core] Fix security Italian translation.
  clean up PHP version checks
  Support the `unique_proxy_open` event
  • Loading branch information
xabbuh committed Aug 22, 2024
2 parents 6b3d6c6 + dc908bc commit b70474b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Tests/Fixtures/pgbouncer/pgbouncer.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pidfile = /var/run/postgresql/pgbouncer.pid
listen_addr = localhost
listen_port = 6432
unix_socket_dir = /var/run/postgresql
auth_type = md5
auth_type = scram-sha-256
auth_file = /etc/pgbouncer/userlist.txt
max_client_conn = 20
default_pool_size = 20
2 changes: 1 addition & 1 deletion Tests/Fixtures/pgbouncer/userlist.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"postgres" "md532e12f215ba27cb750c9e093ce4b5127"
"postgres" "password"

0 comments on commit b70474b

Please sign in to comment.