Compatibility with Benchmark kit 4 and update PHP version to 7.4.2

steevanb · steevanb · commit bf9b86e96851 · 2020-02-14T11:35:39.000+01:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,16 +5,14 @@ jobs:
         docker:
             - image: phpbenchmarks/benchmark-kit:4
         working_directory: /var/www/benchmark
-        environment:
-            NGINX_PORT: 80
         steps:
             - checkout
             - run:
                 name: /var/entrypoint.sh
                 command: /var/entrypoint.sh --nginx-as-service
             - run:
                 name: "benchmark:validate"
-                command: "/var/benchmark-kit/bin/console benchmark:validate"
+                command: "/var/benchmark-kit/bin/console benchmark:validate:all"
 
 workflows:
     version: '2.1'
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
+/.idea
+/vendor
 /composer.lock
-.idea/
-vendor/
-composer.lock
diff --git a/.phpbenchmarks/Configuration.php b/.phpbenchmarks/Configuration.php
diff --git a/.phpbenchmarks/config.yml b/.phpbenchmarks/config.yml
@@ -0,0 +1,23 @@
+component:
+    id: 1
+benchmark:
+    type: 4
+    relativeUrl: /
+sourceCode:
+    entryPoint: public/index.php
+    urls:
+        template: 'https://github.com/phpbenchmarks/php/tree/7.4.2_templating-small-overload_0/public/index.php'
+        templatingLayout: 'https://github.com/phpbenchmarks/php/tree/7.4.2_templating-small-overload_0/public/index.php#L6'
+        templatingBlocks: 'https://github.com/phpbenchmarks/php/tree/7.4.2_templating-small-overload_0/templates/layout/layout_start.php#L31'
+        templatingFunctions: 'https://github.com/phpbenchmarks/php/tree/7.4.2_templating-small-overload_0/public/index.php#L8'
+        templatingMacros: 'https://github.com/phpbenchmarks/php/tree/7.4.2_templating-small-overload_0/public/index.php#L432'
+        templatingEscapeStringHtml: 'https://github.com/phpbenchmarks/php/tree/7.4.2_templating-small-overload_0/public/index.php#856'
+        templatingEscapeStringJs: 'https://github.com/phpbenchmarks/php/tree/7.4.2_templating-small-overload_0/public/index.php#2877'
+        templatingVariables: 'https://github.com/phpbenchmarks/php/tree/7.4.2_templating-small-overload_0/public/index.php#L5933'
+        templatingOutputRaw: 'https://github.com/phpbenchmarks/php/tree/7.4.2_templating-small-overload_0/public/index.php#L5933'
+        templatingOutputUnknownVariables: 'https://github.com/phpbenchmarks/php/tree/7.4.2_templating-small-overload_0/public/index.php#L6855'
+        templatingOutputMethodCalls: 'https://github.com/phpbenchmarks/php/tree/7.4.2_templating-small-overload_0/public/index.php#L7277'
+        templatingIncludeTemplates: 'https://github.com/phpbenchmarks/php/tree/7.4.2_templating-small-overload_0/public/index.php#L9308'
+coreDependency:
+    name: php
+    version: 7.4.2
diff --git a/.phpbenchmarks/nginx/vhost.conf b/.phpbenchmarks/nginx/vhost.conf
@@ -1,5 +1,5 @@
 server {
-    listen 80;
+    listen ____PORT____;
     server_name ____HOST____;
     root ____INSTALLATION_PATH____/public;
     location / {
diff --git a/.phpbenchmarks/php/7.4/composer.lock b/.phpbenchmarks/php/7.4/composer.lock
diff --git a/.phpbenchmarks/php/7.4/initBenchmark.sh b/.phpbenchmarks/php/7.4/initBenchmark.sh
@@ -2,5 +2,4 @@
 
 set -e
 
-# add commands to initialize benchmark: clear cache and logs, warm up cache etc
 composer install --no-dev --classmap-authoritative --ansi
diff --git a/.phpbenchmarks/php/7.4/php.ini b/.phpbenchmarks/php/7.4/php.ini
diff --git a/.phpbenchmarks/php/7.4/preload.php b/.phpbenchmarks/php/7.4/preload.php
@@ -0,0 +1,5 @@
+<?php
+
+declare(strict_types=1);
+
+require(__DIR__ . '/../../../public/index.php');
diff --git a/.phpbenchmarks/php/7.4/responseBody/responseBody.html b/.phpbenchmarks/php/7.4/responseBody/responseBody.html
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 
 ## What is www.phpbenchmarks.com?
 
-You will find lot of benchmarks for PHP frameworks, template engines and JSON serializers on [phpbenchmarks.com](http://www.phpbenchmarks.com).
+You will find a lot of benchmarks for PHP and PHP libraries on [phpbenchmarks.com](http://www.phpbenchmarks.com).
 
 Benchmarks results are available from PHP 5.6 to latest version.
 
@@ -18,8 +18,6 @@ It contains PHP benchmark code.
 
 Switch branch to select version and benchmark you want to see.
 
-You can find source code links into [Configuration::getSourceCodeUrls()](.phpbenchmarks/Configuration.php).
-
 ## Benchmarks
 
 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
 
 ## How version works?
 
-We do not follow semantic version for this repository. Here is an explanation about our versioning system:
-
-`W` PHP major version.
+We do not follow semantic version for this repository.
 
-`X` PHP minor version.
+Here is an explanation about our versioning system:
 
-`Y` PHP patch version.
+`X.Y.Z_benchmark-slug_W`
 
-`Z` Benchmark type: `1`: Hello world, `3`: REST API, `6` JSON serialization of Hello world, `7` Small JSON serialization, `8` Big JSON serialization.
+* `X`: PHP major version.
+* `Y`: PHP minor version.
+* `Z`: PHP patch version.
+* `benchmark-slug`: slug of the benchmark, list available on [documentation page](http://www.phpbenchmarks.com/en/documentation).
+* `W`: benchmark version
diff --git a/composer.json b/composer.json
@@ -3,6 +3,6 @@
     "license": "proprietary",
     "type": "project",
     "require": {
-        "php": "7.4.0"
+        "php": "7.4.2"
     }
-}
+}

-Original file line number
+Diff line change
@@ @@ -1,4 +1,3 @@ @@
 +/.idea
 +/vendor
 /composer.lock
 -.idea/
 -vendor/
 -composer.lock
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,4 @@`
`2`	`2`
`3`	`3`	`set -e`
`4`	`4`
`5`		`-# add commands to initialize benchmark: clear cache and logs, warm up cache etc`
`6`	`5`	`composer install --no-dev --classmap-authoritative --ansi`