Skip to content

Commit 0a2f806

Browse files
committed
Compatibility with Benchmark kit 4 and update PHP version to 7.4.2
1 parent 3328922 commit 0a2f806

File tree

13 files changed

+34
-91
lines changed

13 files changed

+34
-91
lines changed

.circleci/config.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,14 @@ jobs:
55
docker:
66
- image: phpbenchmarks/benchmark-kit:4
77
working_directory: /var/www/benchmark
8-
environment:
9-
NGINX_PORT: 80
108
steps:
119
- checkout
1210
- run:
1311
name: /var/entrypoint.sh
1412
command: /var/entrypoint.sh --nginx-as-service
1513
- run:
1614
name: "benchmark:validate"
17-
command: "/var/benchmark-kit/bin/console benchmark:validate"
15+
command: "/var/benchmark-kit/bin/console benchmark:validate:all"
1816

1917
workflows:
2018
version: '2.1'

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
/.idea/
2-
/vendor/
1+
/.idea
2+
/vendor
33
/composer.lock

.phpbenchmarks/Configuration.php

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

.phpbenchmarks/config.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
component:
2+
id: 1
3+
benchmark:
4+
type: 6
5+
relativeUrl: /
6+
sourceCode:
7+
entryPoint: public/index.php
8+
urls:
9+
jsonSerialization: 'https://github.com/phpbenchmarks/php/tree/7.4.2_json-serialization-hello-world_0/public/index.php#L12'
10+
coreDependency:
11+
name: php
12+
version: 7.4.2

.phpbenchmarks/vhost.conf renamed to .phpbenchmarks/nginx/vhost.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
server {
2-
listen 80;
2+
listen ____PORT____;
33
server_name ____HOST____;
44
root ____INSTALLATION_PATH____/public;
55
location / {

.phpbenchmarks/composer/composer.lock.php7.4 renamed to .phpbenchmarks/php/7.4/composer.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.phpbenchmarks/php/7.4/php.ini

Whitespace-only changes.

.phpbenchmarks/php/7.4/preload.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
require(__DIR__ . '/../../../public/index.php');

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
## What is www.phpbenchmarks.com?
88

9-
You will find lot of benchmarks for PHP frameworks, template engines and JSON serializers on [phpbenchmarks.com](http://www.phpbenchmarks.com).
9+
You will find a lot of benchmarks for PHP and PHP libraries on [phpbenchmarks.com](http://www.phpbenchmarks.com).
1010

1111
Benchmarks results are available from PHP 5.6 to latest version.
1212

@@ -18,8 +18,6 @@ It contains PHP benchmark code.
1818

1919
Switch branch to select version and benchmark you want to see.
2020

21-
You can find source code links into [Configuration::getSourceCodeUrls()](.phpbenchmarks/Configuration.php).
22-
2321
## Benchmarks
2422

2523
You can find PHP 7.4 benchmarks results on
@@ -33,12 +31,14 @@ Go to [community page](http://www.phpbenchmarks.com/en/community) to see the Hal
3331

3432
## How version works?
3533

36-
We do not follow semantic version for this repository. Here is an explanation about our versioning system:
37-
38-
`W` PHP major version.
34+
We do not follow semantic version for this repository.
3935

40-
`X` PHP minor version.
36+
Here is an explanation about our versioning system:
4137

42-
`Y` PHP patch version.
38+
`X.Y.Z_benchmark-slug_W`
4339

44-
`Z` Benchmark type: `1`: Hello world, `3`: REST API, `6` JSON serialization of Hello world, `7` Small JSON serialization, `8` Big JSON serialization.
40+
* `X`: PHP major version.
41+
* `Y`: PHP minor version.
42+
* `Z`: PHP patch version.
43+
* `benchmark-slug`: slug of the benchmark, list available on [documentation page](http://www.phpbenchmarks.com/en/documentation).
44+
* `W`: benchmark version

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"license": "proprietary",
44
"type": "project",
55
"require": {
6-
"php": "7.4.0",
6+
"php": "7.4.2",
77
"ext-json": "*",
88
"phpbenchmarks/benchmark-json-serialization-hello-world": "1.0.0"
99
}
10-
}
10+
}

public/index.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,3 @@
1111
} else {
1212
json_encode(BenchmarkService::getDataToSerialize());
1313
}
14-
15-
// require phpbenchmarks stats.php here when needed

0 commit comments

Comments
 (0)