Skip to content

Commit 220b003

Browse files
qkdreyerqkdreyer
authored
Merge branch 'php-enqueue:master' into patch-3
2 parents cffc9b5 + 3679f9a commit 220b003

615 files changed

Lines changed: 1233 additions & 3087 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 26 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ jobs:
99
name: Static analysis
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v4
1313

14-
- uses: technote-space/get-diff-action@v4
14+
- uses: technote-space/get-diff-action@v6
1515
with:
1616
PATTERNS: |
1717
pkg/**/*.php
@@ -25,7 +25,7 @@ jobs:
2525

2626
- run: php ./bin/fix-symfony-version.php "5.4.*"
2727

28-
- uses: "ramsey/composer-install@v1"
28+
- uses: "ramsey/composer-install@v3"
2929

3030
- run: sed -i 's/525568/16777471/' vendor/kwn/php-rdkafka-stubs/stubs/constants.php
3131

@@ -37,9 +37,9 @@ jobs:
3737
name: Code style check
3838
runs-on: ubuntu-latest
3939
steps:
40-
- uses: actions/checkout@v2
40+
- uses: actions/checkout@v4
4141

42-
- uses: technote-space/get-diff-action@v4
42+
- uses: technote-space/get-diff-action@v6
4343
with:
4444
PATTERNS: |
4545
pkg/**/*.php
@@ -49,7 +49,7 @@ jobs:
4949
run: |
5050
echo "::set-output name=dir::$(composer config cache-files-dir)"
5151
52-
- uses: actions/cache@v2
52+
- uses: actions/cache@v4
5353
with:
5454
path: ${{ steps.composer-cache.outputs.dir }}
5555
key: composer-cs-check-${{ hashFiles('**/composer.json') }}
@@ -58,7 +58,7 @@ jobs:
5858
5959
- uses: shivammathur/setup-php@v2
6060
with:
61-
php-version: '7.4'
61+
php-version: '8.2'
6262
coverage: none
6363
extensions: mongodb, redis, :xdebug
6464
ini-values: memory_limit=2048M
@@ -69,38 +69,32 @@ jobs:
6969

7070
- run: sed -i 's/525568/16777471/' vendor/kwn/php-rdkafka-stubs/stubs/constants.php
7171

72-
- run: ./bin/php-cs-fixer fix --config=.php_cs.php --no-interaction --dry-run --diff -v --path-mode=intersection -- ${{ env.GIT_DIFF_FILTERED }}
72+
- run: ./bin/php-cs-fixer fix --config=.php-cs-fixer.dist.php --no-interaction --dry-run --diff -v --path-mode=intersection -- ${{ env.GIT_DIFF_FILTERED }}
7373
if: env.GIT_DIFF_FILTERED
7474

7575
unit_tests:
7676
runs-on: ubuntu-latest
7777
strategy:
7878
fail-fast: false
7979
matrix:
80-
php: ['7.4', '8.0', '8.1', '8.2']
81-
symfony_version: ['5.4.*', '6.2.*', '6.3.*']
80+
php: ['8.1', '8.2']
81+
symfony_version: ['6.2.*', '6.3.*', '6.4.*', '7.0.*']
8282
dependencies: ['--prefer-lowest', '--prefer-dist']
8383
exclude:
84-
- php: '7.4'
85-
symfony_version: '6.2.*'
86-
- php: '7.4'
87-
symfony_version: '6.3.*'
88-
- php: '8.0'
89-
symfony_version: '6.2.*'
90-
- php: '8.0'
91-
symfony_version: '6.3.*'
84+
- php: '8.1'
85+
symfony_version: '7.0.*'
9286

9387
name: PHP ${{ matrix.php }} unit tests on Sf ${{ matrix.symfony_version }}, deps=${{ matrix.dependencies }}
9488

9589
steps:
96-
- uses: actions/checkout@v2
90+
- uses: actions/checkout@v4
9791

9892
- name: Get Composer Cache Directory
9993
id: composer-cache
10094
run: |
10195
echo "::set-output name=dir::$(composer config cache-files-dir)"
10296
103-
- uses: actions/cache@v2
97+
- uses: actions/cache@v4
10498
with:
10599
path: ${{ steps.composer-cache.outputs.dir }}
106100
key: composer-${{ matrix.php }}-${{ matrix.symfony_version }}-${{ matrix.dependencies }}-${{ hashFiles('**/composer.json') }}
@@ -127,30 +121,28 @@ jobs:
127121
strategy:
128122
fail-fast: false
129123
matrix:
130-
php: ['7.4', '8.0', '8.1', '8.2'] # same as in the container
131-
symfony_version: ['5.4.*', '6.2.*', '6.3.*']
132-
dependencies: ['--prefer-lowest', '--prefer-dist']
124+
php: [ '8.1', '8.2' ]
125+
symfony_version: [ '6.4.*', '7.0.*', '7.1.*', '7.2.*' ]
126+
dependencies: [ '--prefer-lowest', '--prefer-dist' ]
133127
exclude:
134-
- php: '7.4'
135-
symfony_version: '6.2.*'
136-
- php: '7.4'
137-
symfony_version: '6.3.*'
138-
- php: '8.0'
139-
symfony_version: '6.2.*'
140-
- php: '8.0'
141-
symfony_version: '6.3.*'
128+
- php: '8.1'
129+
symfony_version: '7.0.*'
130+
- php: '8.1'
131+
symfony_version: '7.1.*'
132+
- php: '8.1'
133+
symfony_version: '7.2.*'
142134

143135
name: PHP ${{ matrix.php }} functional tests on Sf ${{ matrix.symfony_version }}, deps=${{ matrix.dependencies }}
144136

145137
steps:
146-
- uses: actions/checkout@v2
138+
- uses: actions/checkout@v4
147139

148140
- name: Get Composer Cache Directory
149141
id: composer-cache
150142
run: |
151143
echo "::set-output name=dir::$(composer config cache-files-dir)"
152144
153-
- uses: actions/cache@v2
145+
- uses: actions/cache@v4
154146
with:
155147
path: ${{ steps.composer-cache.outputs.dir }}
156148
key: composer-${{ matrix.php }}-${{ matrix.symfony_version }}-${{ matrix.dependencies }}-${{ hashFiles('**/composer.json') }}
@@ -174,10 +166,4 @@ jobs:
174166
env:
175167
PHP_VERSION: ${{ matrix.php }}
176168

177-
# TODO: convert these two steps into one w/o excludes when Gearman extension gets a release for PHP 8.1
178-
# See https://github.com/php/pecl-networking-gearman/issues/16
179-
- run: bin/test.sh
180-
if: ${{ matrix.php != '8.1' && matrix.php != '8.2' }}
181-
182-
- run: bin/test.sh --exclude-group=gearman
183-
if: ${{ matrix.php == '8.1' && matrix.php != '8.2' }}
169+
- run: bin/test.sh --group=functional

‎.gitignore‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
*~
22
/.idea/
33
bin/doctrine*
4-
bin/php-cs-fixer
5-
bin/phpunit
6-
bin/sql-formatter
7-
bin/phpstan
8-
bin/jp.php
9-
bin/php-parse
10-
bin/google-cloud-batch
4+
bin/php-cs-fixer*
5+
bin/phpunit*
6+
bin/sql-formatter*
7+
bin/phpstan*
8+
bin/jp.php*
9+
bin/php-parse*
10+
bin/google-cloud-batch*
11+
bin/patch-type-declarations*
1112
bin/thruway
12-
bin/phpstan.phar
13-
bin/var-dump-server
14-
bin/yaml-lint
13+
bin/var-dump-server*
14+
bin/yaml-lint*
1515
vendor
1616
var
1717
.php_cs
1818
.php_cs.cache
1919
composer.lock
2020
.phpunit.result.cache
21+
.php-cs-fixer.cache

.php_cs.php renamed to .php-cs-fixer.dist.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22

33
return (new PhpCsFixer\Config())
4+
->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
45
->setRiskyAllowed(true)
56
->setRules(array(
67
'@Symfony' => true,

‎CHANGELOG.md‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,65 @@
11
# Change Log
22

3+
## [0.10.26](https://github.com/php-enqueue/enqueue-dev/tree/0.10.26) (2025-05-10)
4+
[Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.10.25...0.10.26)
5+
6+
**Merged pull requests:**
7+
8+
- Fix: Updating composer [\#1383](https://github.com/php-enqueue/enqueue-dev/pull/1383) ([JimTools](https://github.com/JimTools))
9+
- Fix: Fixing CI [\#1382](https://github.com/php-enqueue/enqueue-dev/pull/1382) ([JimTools](https://github.com/JimTools))
10+
11+
## [0.10.25](https://github.com/php-enqueue/enqueue-dev/tree/0.10.25) (2025-04-18)
12+
[Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.10.24...0.10.25)
13+
14+
**Merged pull requests:**
15+
16+
- Bugfix/static drift [\#1373](https://github.com/php-enqueue/enqueue-dev/pull/1373) ([JimTools](https://github.com/JimTools))
17+
- CS Fixes [\#1372](https://github.com/php-enqueue/enqueue-dev/pull/1372) ([JimTools](https://github.com/JimTools))
18+
- Fixing risky tests [\#1371](https://github.com/php-enqueue/enqueue-dev/pull/1371) ([JimTools](https://github.com/JimTools))
19+
20+
## [0.10.24](https://github.com/php-enqueue/enqueue-dev/tree/0.10.24) (2024-11-30)
21+
[Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.10.23...0.10.24)
22+
23+
**Merged pull requests:**
24+
25+
- SF7 deprecations fix [\#1364](https://github.com/php-enqueue/enqueue-dev/pull/1364) ([zavitkov](https://github.com/zavitkov))
26+
- add symfony 7 support for enqueue-bundle [\#1362](https://github.com/php-enqueue/enqueue-dev/pull/1362) ([zavitkov](https://github.com/zavitkov))
27+
28+
## [0.10.23](https://github.com/php-enqueue/enqueue-dev/tree/0.10.23) (2024-10-01)
29+
[Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.10.22...0.10.23)
30+
31+
**Merged pull requests:**
32+
33+
- Drop useless call to end method [\#1359](https://github.com/php-enqueue/enqueue-dev/pull/1359) ([ddziaduch](https://github.com/ddziaduch))
34+
35+
## [0.10.22](https://github.com/php-enqueue/enqueue-dev/tree/0.10.22) (2024-08-13)
36+
[Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.10.21...0.10.22)
37+
38+
**Merged pull requests:**
39+
40+
- GPS: revert the attributes and use the headers instead. [\#1355](https://github.com/php-enqueue/enqueue-dev/pull/1355) ([p-pichet](https://github.com/p-pichet))
41+
42+
## [0.10.21](https://github.com/php-enqueue/enqueue-dev/tree/0.10.21) (2024-08-12)
43+
[Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.10.20...0.10.21)
44+
45+
**Merged pull requests:**
46+
47+
- feat\(GPS\): allow send attributes in Google PubSub message. [\#1349](https://github.com/php-enqueue/enqueue-dev/pull/1349) ([p-pichet](https://github.com/p-pichet))
48+
49+
## [0.10.19](https://github.com/php-enqueue/enqueue-dev/tree/0.10.19) (2023-07-15)
50+
[Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.10.18...0.10.19)
51+
52+
**Merged pull requests:**
53+
54+
- fix: do not reset attemps header when message is requeue [\#1301](https://github.com/php-enqueue/enqueue-dev/pull/1301) ([eortiz-tracktik](https://github.com/eortiz-tracktik))
55+
- Allow doctrine/persistence 3.1 version [\#1300](https://github.com/php-enqueue/enqueue-dev/pull/1300) ([xNarkon](https://github.com/xNarkon))
56+
- Add support for rediss and phpredis [\#1297](https://github.com/php-enqueue/enqueue-dev/pull/1297) ([splagemann](https://github.com/splagemann))
57+
- Replaced `json\_array` with `json` due to Doctrine Dbal 3.0 [\#1294](https://github.com/php-enqueue/enqueue-dev/pull/1294) ([NovakHonza](https://github.com/NovakHonza))
58+
- pkg PHP 8.1 and 8.2 support [\#1292](https://github.com/php-enqueue/enqueue-dev/pull/1292) ([snapshotpl](https://github.com/snapshotpl))
59+
- Update doctrine/persistence [\#1290](https://github.com/php-enqueue/enqueue-dev/pull/1290) ([jlabedo](https://github.com/jlabedo))
60+
- Add PHP 8.1 and 8.2, Symfony 6.2 to CI [\#1285](https://github.com/php-enqueue/enqueue-dev/pull/1285) ([andrewmy](https://github.com/andrewmy))
61+
- \[SNSQS\] added possibility to send FIFO-related parameters using snsqs transport [\#1278](https://github.com/php-enqueue/enqueue-dev/pull/1278) ([onatskyy](https://github.com/onatskyy))
62+
363
## [0.10.18](https://github.com/php-enqueue/enqueue-dev/tree/0.10.18) (2023-03-18)
464
[Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.10.17...0.10.18)
565

‎bin/changelog‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ then
88
exit 1
99
fi
1010

11-
docker-compose run -e CHANGELOG_GITHUB_TOKEN=${CHANGELOG_GITHUB_TOKEN:-""} --workdir="/mqdev" --rm generate-changelog github_changelog_generator --future-release "$1" --no-issues --unreleased-only --output "CHANGELOG_FUTURE.md"
11+
docker compose run -e CHANGELOG_GITHUB_TOKEN=${CHANGELOG_GITHUB_TOKEN:-""} --workdir="/mqdev" --rm generate-changelog github_changelog_generator --future-release "$1" --no-issues --unreleased-only --output "CHANGELOG_FUTURE.md"
1212

13-
#git add CHANGELOG.md && git commit -m "Release $1" -S && git push origin "$CURRENT_BRANCH"
13+
git add CHANGELOG.md && git commit -m "Release $1" -S && git push origin "$CURRENT_BRANCH"

‎bin/dev‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ set -e
66
while getopts "bustefdp" OPTION; do
77
case $OPTION in
88
b)
9-
docker-compose pull -q && docker-compose build
9+
docker compose pull -q && docker compose build
1010
;;
1111
u)
12-
docker-compose up
12+
docker compose up
1313
;;
1414
s)
15-
docker-compose stop
15+
docker compose stop
1616
;;
1717
e)
1818
docker exec -it mqdev_dev_1 /bin/bash
@@ -21,7 +21,7 @@ while getopts "bustefdp" OPTION; do
2121
./bin/php-cs-fixer fix
2222
;;
2323

24-
d) docker-compose run --workdir="/mqdev" --rm dev php pkg/enqueue-bundle/Tests/Functional/app/console.php config:dump-reference enqueue -vvv
24+
d) docker compose run --workdir="/mqdev" --rm dev php pkg/enqueue-bundle/Tests/Functional/app/console.php config:dump-reference enqueue -vvv
2525
;;
2626
\?)
2727
echo "Invalid option: -$OPTARG" >&2

‎bin/fix-symfony-version.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?php
22

33
if (empty($argv[1])) {
4-
throw new \LogicException('The new symfony version must be provided');
4+
throw new LogicException('The new symfony version must be provided');
55
}
66

77
$newVersion = $argv[1];
88

9-
$composer = file_get_contents(__DIR__.'/../composer.json');
9+
$composer = trim(file_get_contents(__DIR__.'/../composer.json'));
1010

11-
$updatedComposer = preg_replace('/"symfony\/(.*)": ".*"/', '"symfony/$1": "'.$newVersion.'"', $composer).PHP_EOL;
12-
echo $updatedComposer.PHP_EOL;
11+
$updatedComposer = preg_replace('/"symfony\/(.*)": ".*"/', '"symfony/$1": "'.$newVersion.'"', $composer).\PHP_EOL;
12+
echo $updatedComposer.\PHP_EOL;
1313

1414
file_put_contents(__DIR__.'/../composer.json', $updatedComposer);

‎bin/release‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ do
4343
if [[ -z "$LAST_RELEASE" ]]; then
4444
echo "There has not been any releases. Releasing $1";
4545

46-
git tag $1 -a -s -m "Release $1"
46+
#git tag $1 -a -s -m "Release $1"
47+
git tag $1 -a -m "Release $1"
4748
git push origin --tags
4849
else
4950
echo "Last release $LAST_RELEASE";
@@ -53,7 +54,8 @@ do
5354
if [[ ! -z "$CHANGES_SINCE_LAST_RELEASE" ]]; then
5455
echo "There are changes since last release. Releasing $1";
5556

56-
git tag $1 -s -m "Release $1"
57+
#git tag $1 -s -m "Release $1"
58+
git tag $1 -m "Release $1"
5759
git push origin --tags
5860
else
5961
echo "No change since last release.";

‎bin/test.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
set -x
44
set -e
55

6-
docker-compose run --workdir="/mqdev" --rm dev ./docker/bin/test.sh $@
6+
docker compose run --workdir="/mqdev" --rm dev ./docker/bin/test.sh $@

0 commit comments

Comments
 (0)