Skip to content

Commit c0ec164

Browse files
gsteelgsteel
authored
Merge pull request #130 from laminas/3.21.x-merge-up-into-4.0.x_u2Qc8ega
Merge release 3.21.0 into 4.0.x
2 parents fbcfc10 + c0282b6 commit c0ec164

Some content is hidden

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

61 files changed

+2478
-1027
lines changed

‎.laminas-ci.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"ignore_php_platform_requirements": {
3-
"8.4": true
3+
"8.5": true
44
}
55
}

‎benchmark/ArrayUtilsBench.php‎

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

3-
/**
4-
* @see https://github.com/laminas/laminas-stdlib for the canonical source repository
5-
* @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
6-
* @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
7-
*/
3+
declare(strict_types=1);
84

95
namespace LaminasBench\Stdlib;
106

117
use Laminas\Stdlib\ArrayUtils;
12-
use PhpBench\Benchmark\Metadata\Annotations\Iterations;
13-
use PhpBench\Benchmark\Metadata\Annotations\Revs;
14-
use PhpBench\Benchmark\Metadata\Annotations\Warmup;
8+
use PhpBench\Attributes\Iterations;
9+
use PhpBench\Attributes\Revs;
10+
use PhpBench\Attributes\Warmup;
1511

16-
/**
17-
* @Revs(1000)
18-
* @Iterations(10)
19-
* @Warmup(2)
20-
*/
21-
class ArrayUtilsBench
12+
#[Revs(1000)]
13+
#[Iterations(10)]
14+
#[Warmup(2)]
15+
final class ArrayUtilsBench
2216
{
23-
public function benchHasStringKeys()
17+
public function benchHasStringKeys(): void
2418
{
2519
ArrayUtils::hasStringKeys([
2620
'key' => 'value',
2721
]);
2822
}
2923

30-
public function benchHasIntegerKeys()
24+
public function benchHasIntegerKeys(): void
3125
{
3226
ArrayUtils::hasIntegerKeys([
3327
1 => 'value',
3428
]);
3529
}
3630

37-
public function benchHasNumericKeys()
31+
public function benchHasNumericKeys(): void
3832
{
3933
ArrayUtils::hasNumericKeys([
4034
'1' => 'value',

‎benchmark/ExtractPriorityQueueBench.php‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,27 @@
11
<?php
22

3-
/**
4-
* @see https://github.com/laminas/laminas-stdlib for the canonical source repository
5-
* @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
6-
* @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
7-
*/
3+
declare(strict_types=1);
84

95
namespace LaminasBench\Stdlib;
106

117
use Laminas\Stdlib\FastPriorityQueue;
128
use Laminas\Stdlib\PriorityQueue;
139
use Laminas\Stdlib\SplPriorityQueue;
14-
use PhpBench\Benchmark\Metadata\Annotations\Iterations;
15-
use PhpBench\Benchmark\Metadata\Annotations\Revs;
16-
use PhpBench\Benchmark\Metadata\Annotations\Warmup;
10+
use PhpBench\Attributes\Iterations;
11+
use PhpBench\Attributes\Revs;
12+
use PhpBench\Attributes\Warmup;
1713

1814
use function rand;
1915

20-
/**
21-
* @Revs(1000)
22-
* @Iterations(10)
23-
* @Warmup(2)
24-
*/
25-
class ExtractPriorityQueueBench
16+
#[Revs(1000)]
17+
#[Iterations(10)]
18+
#[Warmup(2)]
19+
final class ExtractPriorityQueueBench
2620
{
21+
private SplPriorityQueue $splPriorityQueue;
22+
private FastPriorityQueue $fastPriorityQueue;
23+
private PriorityQueue $priorityQueue;
24+
2725
public function __construct()
2826
{
2927
$this->splPriorityQueue = new SplPriorityQueue();
@@ -38,17 +36,17 @@ public function __construct()
3836
}
3937
}
4038

41-
public function benchExtractSplPriorityQueue()
39+
public function benchExtractSplPriorityQueue(): void
4240
{
4341
$this->splPriorityQueue->extract();
4442
}
4543

46-
public function benchExtractPriorityQueue()
44+
public function benchExtractPriorityQueue(): void
4745
{
4846
$this->priorityQueue->extract();
4947
}
5048

51-
public function benchExtractFastPriorityQueue()
49+
public function benchExtractFastPriorityQueue(): void
5250
{
5351
$this->fastPriorityQueue->extract();
5452
}

‎benchmark/InsertPriorityQueueBench.php‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,45 @@
11
<?php
22

3-
/**
4-
* @see https://github.com/laminas/laminas-stdlib for the canonical source repository
5-
* @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
6-
* @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
7-
*/
3+
declare(strict_types=1);
84

95
namespace LaminasBench\Stdlib;
106

117
use Laminas\Stdlib\FastPriorityQueue;
128
use Laminas\Stdlib\PriorityQueue;
139
use Laminas\Stdlib\SplPriorityQueue;
14-
use PhpBench\Benchmark\Metadata\Annotations\Iterations;
15-
use PhpBench\Benchmark\Metadata\Annotations\Revs;
16-
use PhpBench\Benchmark\Metadata\Annotations\Warmup;
10+
use PhpBench\Attributes\Iterations;
11+
use PhpBench\Attributes\Revs;
12+
use PhpBench\Attributes\Warmup;
1713

1814
use function rand;
1915

20-
/**
21-
* @Revs(1000)
22-
* @Iterations(10)
23-
* @Warmup(2)
24-
*/
25-
class InsertPriorityQueueBench
16+
#[Revs(1000)]
17+
#[Iterations(10)]
18+
#[Warmup(2)]
19+
final class InsertPriorityQueueBench
2620
{
21+
private SplPriorityQueue $splPriorityQueue;
22+
private FastPriorityQueue $fastPriorityQueue;
23+
private PriorityQueue $priorityQueue;
24+
2725
public function __construct()
2826
{
2927
$this->splPriorityQueue = new SplPriorityQueue();
3028
$this->fastPriorityQueue = new FastPriorityQueue();
3129
$this->priorityQueue = new PriorityQueue();
3230
}
3331

34-
public function benchInsertSplPriorityQueue()
32+
public function benchInsertSplPriorityQueue(): void
3533
{
3634
$this->splPriorityQueue->insert('foo', rand(1, 100));
3735
}
3836

39-
public function benchInsertPriorityQueue()
37+
public function benchInsertPriorityQueue(): void
4038
{
4139
$this->priorityQueue->insert('foo', rand(1, 100));
4240
}
4341

44-
public function benchInsertFastPriorityQueue()
42+
public function benchInsertFastPriorityQueue(): void
4543
{
4644
$this->fastPriorityQueue->insert('foo', rand(1, 100));
4745
}

‎benchmark/RemovePriorityQueueBench.php‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,25 @@
11
<?php
22

3-
/**
4-
* @see https://github.com/laminas/laminas-stdlib for the canonical source repository
5-
* @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
6-
* @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
7-
*/
3+
declare(strict_types=1);
84

95
namespace LaminasBench\Stdlib;
106

117
use Laminas\Stdlib\FastPriorityQueue;
128
use Laminas\Stdlib\PriorityQueue;
13-
use PhpBench\Benchmark\Metadata\Annotations\Iterations;
14-
use PhpBench\Benchmark\Metadata\Annotations\Revs;
15-
use PhpBench\Benchmark\Metadata\Annotations\Warmup;
9+
use PhpBench\Attributes\Iterations;
10+
use PhpBench\Attributes\Revs;
11+
use PhpBench\Attributes\Warmup;
1612

1713
use function rand;
1814

19-
/**
20-
* @Revs(1000)
21-
* @Iterations(10)
22-
* @Warmup(2)
23-
*/
24-
class RemovePriorityQueueBench
15+
#[Revs(1000)]
16+
#[Iterations(10)]
17+
#[Warmup(2)]
18+
final class RemovePriorityQueueBench
2519
{
20+
private FastPriorityQueue $fastPriorityQueue;
21+
private PriorityQueue $priorityQueue;
22+
2623
public function __construct()
2724
{
2825
$this->fastPriorityQueue = new FastPriorityQueue();
@@ -35,12 +32,12 @@ public function __construct()
3532
}
3633
}
3734

38-
public function benchRemovePriorityQueue()
35+
public function benchRemovePriorityQueue(): void
3936
{
4037
$this->priorityQueue->remove('foo');
4138
}
4239

43-
public function benchRemoveFastPriorityQueue()
40+
public function benchRemoveFastPriorityQueue(): void
4441
{
4542
$this->fastPriorityQueue->remove('foo');
4643
}

‎composer.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"config": {
1919
"sort-packages": true,
2020
"platform": {
21-
"php": "8.1.99"
21+
"php": "8.2.99"
2222
},
2323
"allow-plugins": {
2424
"dealerdirect/phpcodesniffer-composer-installer": true
@@ -27,14 +27,14 @@
2727
"extra": {
2828
},
2929
"require": {
30-
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
30+
"php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0"
3131
},
3232
"require-dev": {
33-
"laminas/laminas-coding-standard": "^3.0",
34-
"phpbench/phpbench": "^1.3.1",
35-
"phpunit/phpunit": "^10.5.38",
36-
"psalm/plugin-phpunit": "^0.19.0",
37-
"vimeo/psalm": "^5.26.1"
33+
"laminas/laminas-coding-standard": "^3.1.0",
34+
"phpbench/phpbench": "^1.4.1",
35+
"phpunit/phpunit": "^11.5.42",
36+
"psalm/plugin-phpunit": "^0.19.5",
37+
"vimeo/psalm": "^6.13.1"
3838
},
3939
"autoload": {
4040
"psr-4": {

0 commit comments

Comments
 (0)