From 57c98f2ded33d0dce4823ae899caa124a1384a3d Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Sat, 24 Jul 2021 21:09:57 +0200 Subject: [PATCH] Upgraded to `phpbench/phpbench:1.0.4` This patch upgrades `phpbench` to `^1`, allowing us to use `--tag=` and `--ref=` during benchmark runs, for more accurate comparison of the performance impact between code iterations. --- composer.json | 2 +- composer.lock | 274 +++++++++++++++++++++++++++----------------------- phpbench.json | 7 +- 3 files changed, 155 insertions(+), 128 deletions(-) diff --git a/composer.json b/composer.json index 0a992b60..6c367cf8 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ "laminas/laminas-dependency-plugin": "^2.1.2", "mikey179/vfsstream": "^1.6.8", "ocramius/proxy-manager": "^2.2.3", - "phpbench/phpbench": "^1.0.0-alpha3", + "phpbench/phpbench": "^1.0.4", "phpspec/prophecy-phpunit": "^2.0", "phpunit/phpunit": "^9.4", "psalm/plugin-phpunit": "^0.16.1", diff --git a/composer.lock b/composer.lock index 79dbbb2a..c6ea43de 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "71191fbd4791c42c9b8b7cb4afd3e04e", + "content-hash": "e090ce6236c2e7929878aca459fbdf52", "packages": [ { "name": "container-interop/container-interop", @@ -358,67 +358,6 @@ ], "time": "2021-03-30T17:13:30+00:00" }, - { - "name": "beberlei/assert", - "version": "v3.3.0", - "source": { - "type": "git", - "url": "https://github.com/beberlei/assert.git", - "reference": "5367e3895976b49704ae671f75bc5f0ba1b986ab" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/beberlei/assert/zipball/5367e3895976b49704ae671f75bc5f0ba1b986ab", - "reference": "5367e3895976b49704ae671f75bc5f0ba1b986ab", - "shasum": "" - }, - "require": { - "ext-ctype": "*", - "ext-intl": "*", - "ext-json": "*", - "ext-mbstring": "*", - "ext-simplexml": "*", - "php": "^7.0 || ^8.0" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "*", - "phpstan/phpstan": "*", - "phpunit/phpunit": ">=6.0.0", - "yoast/phpunit-polyfills": "^0.1.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Assert\\": "lib/Assert" - }, - "files": [ - "lib/Assert/functions.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-2-Clause" - ], - "authors": [ - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de", - "role": "Lead Developer" - }, - { - "name": "Richard Quadling", - "email": "rquadling@gmail.com", - "role": "Collaborator" - } - ], - "description": "Thin assertion library for input validation in business models.", - "keywords": [ - "assert", - "assertion", - "validation" - ], - "time": "2020-11-13T20:02:54+00:00" - }, { "name": "composer/package-versions-deprecated", "version": "1.11.99.2", @@ -746,35 +685,32 @@ }, { "name": "doctrine/annotations", - "version": "1.11.1", + "version": "1.13.1", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "ce77a7ba1770462cd705a91a151b6c3746f9c6ad" + "reference": "e6e7b7d5b45a2f2abc5460cc6396480b2b1d321f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/ce77a7ba1770462cd705a91a151b6c3746f9c6ad", - "reference": "ce77a7ba1770462cd705a91a151b6c3746f9c6ad", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/e6e7b7d5b45a2f2abc5460cc6396480b2b1d321f", + "reference": "e6e7b7d5b45a2f2abc5460cc6396480b2b1d321f", "shasum": "" }, "require": { "doctrine/lexer": "1.*", "ext-tokenizer": "*", - "php": "^7.1 || ^8.0" + "php": "^7.1 || ^8.0", + "psr/cache": "^1 || ^2 || ^3" }, "require-dev": { - "doctrine/cache": "1.*", + "doctrine/cache": "^1.11 || ^2.0", "doctrine/coding-standard": "^6.0 || ^8.1", "phpstan/phpstan": "^0.12.20", - "phpunit/phpunit": "^7.5 || ^9.1.5" + "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5", + "symfony/cache": "^4.4 || ^5.2" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.11.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" @@ -813,7 +749,11 @@ "docblock", "parser" ], - "time": "2020-10-26T10:28:16+00:00" + "support": { + "issues": "https://github.com/doctrine/annotations/issues", + "source": "https://github.com/doctrine/annotations/tree/1.13.1" + }, + "time": "2021-05-16T18:07:53+00:00" }, { "name": "doctrine/instantiator", @@ -940,6 +880,10 @@ "parser", "php" ], + "support": { + "issues": "https://github.com/doctrine/lexer/issues", + "source": "https://github.com/doctrine/lexer/tree/1.2.1" + }, "funding": [ { "url": "https://www.doctrine-project.org/sponsorship.html", @@ -1776,20 +1720,20 @@ }, { "name": "phpbench/container", - "version": "2.0.1", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/phpbench/container.git", - "reference": "04054b7c8cb30f948e5a289601c34834db58aa9f" + "reference": "4af6c2619296e95b72409fd6244f000276277047" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpbench/container/zipball/04054b7c8cb30f948e5a289601c34834db58aa9f", - "reference": "04054b7c8cb30f948e5a289601c34834db58aa9f", + "url": "https://api.github.com/repos/phpbench/container/zipball/4af6c2619296e95b72409fd6244f000276277047", + "reference": "4af6c2619296e95b72409fd6244f000276277047", "shasum": "" }, "require": { - "psr/container": "^1.0", + "psr/container": "^1.0|^2.0", "symfony/options-resolver": "^4.2 || ^5.0" }, "require-dev": { @@ -1819,33 +1763,39 @@ } ], "description": "Simple, configurable, service container.", - "time": "2020-11-21T10:55:32+00:00" + "support": { + "issues": "https://github.com/phpbench/container/issues", + "source": "https://github.com/phpbench/container/tree/2.2.0" + }, + "time": "2021-07-14T20:56:29+00:00" }, { "name": "phpbench/dom", - "version": "0.3.0", + "version": "0.3.1", "source": { "type": "git", "url": "https://github.com/phpbench/dom.git", - "reference": "a126b32e83d0541f3c89befa1b166ba32d0048ab" + "reference": "d26e615c4d64da41d168ab1096e4f55d97f2344f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpbench/dom/zipball/a126b32e83d0541f3c89befa1b166ba32d0048ab", - "reference": "a126b32e83d0541f3c89befa1b166ba32d0048ab", + "url": "https://api.github.com/repos/phpbench/dom/zipball/d26e615c4d64da41d168ab1096e4f55d97f2344f", + "reference": "d26e615c4d64da41d168ab1096e4f55d97f2344f", "shasum": "" }, "require": { "ext-dom": "*", - "php": "^7.2|^8.0" + "php": "^7.2||^8.0" }, "require-dev": { - "phpunit/phpunit": "^8.0|^9.0" + "friendsofphp/php-cs-fixer": "^2.18", + "phpstan/phpstan": "^0.12.83", + "phpunit/phpunit": "^8.0||^9.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "0.3-dev" + "dev-master": "1.0-dev" } }, "autoload": { @@ -1864,26 +1814,28 @@ } ], "description": "DOM wrapper to simplify working with the PHP DOM implementation", - "time": "2020-10-25T08:41:08+00:00" + "support": { + "issues": "https://github.com/phpbench/dom/issues", + "source": "https://github.com/phpbench/dom/tree/0.3.1" + }, + "time": "2021-04-21T20:44:19+00:00" }, { "name": "phpbench/phpbench", - "version": "1.0.0-alpha4", + "version": "1.0.4", "source": { "type": "git", "url": "https://github.com/phpbench/phpbench.git", - "reference": "a0e8edfc1a308d79b4950648ece538cef7a6446e" + "reference": "52cb206677ef235d4f26317a25db8791a64cda12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpbench/phpbench/zipball/a0e8edfc1a308d79b4950648ece538cef7a6446e", - "reference": "a0e8edfc1a308d79b4950648ece538cef7a6446e", + "url": "https://api.github.com/repos/phpbench/phpbench/zipball/52cb206677ef235d4f26317a25db8791a64cda12", + "reference": "52cb206677ef235d4f26317a25db8791a64cda12", "shasum": "" }, "require": { - "beberlei/assert": "^2.4 || ^3.0", "doctrine/annotations": "^1.2.7", - "doctrine/lexer": "^1.2", "ext-dom": "*", "ext-json": "*", "ext-pcre": "*", @@ -1891,8 +1843,9 @@ "ext-spl": "*", "ext-tokenizer": "*", "php": "^7.2 || ^8.0", - "phpbench/container": "^2.0", - "phpbench/dom": "~0.3.0", + "phpbench/container": "^2.1", + "phpbench/dom": "~0.3.1", + "psr/log": "^1.1", "seld/jsonlint": "^1.1", "symfony/console": "^4.2 || ^5.0", "symfony/filesystem": "^4.2 || ^5.0", @@ -1902,13 +1855,13 @@ "webmozart/path-util": "^2.3" }, "require-dev": { - "dantleech/invoke": "^1.2", + "dantleech/invoke": "^2.0", "friendsofphp/php-cs-fixer": "^2.13.1", "jangregor/phpstan-prophecy": "^0.8.1", - "padraic/phar-updater": "^1.0", - "phpspec/prophecy": "^1.11", + "phpspec/prophecy": "^1.12", "phpstan/phpstan": "^0.12.7", "phpunit/phpunit": "^8.5.8 || ^9.0", + "symfony/error-handler": "^5.2", "symfony/var-dumper": "^4.0 || ^5.0" }, "suggest": { @@ -1941,7 +1894,17 @@ } ], "description": "PHP Benchmarking Framework", - "time": "2020-12-29T09:42:38+00:00" + "support": { + "issues": "https://github.com/phpbench/phpbench/issues", + "source": "https://github.com/phpbench/phpbench/tree/1.0.4" + }, + "funding": [ + { + "url": "https://github.com/dantleech", + "type": "github" + } + ], + "time": "2021-07-18T14:07:54+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -2722,6 +2685,55 @@ }, "time": "2021-06-18T23:56:46+00:00" }, + { + "name": "psr/cache", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/cache.git", + "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/cache/zipball/aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", + "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", + "shasum": "" + }, + "require": { + "php": ">=8.0.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Cache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for caching libraries", + "keywords": [ + "cache", + "psr", + "psr-6" + ], + "support": { + "source": "https://github.com/php-fig/cache/tree/3.0.0" + }, + "time": "2021-02-03T23:26:27+00:00" + }, { "name": "psr/log", "version": "1.1.4", @@ -3723,6 +3735,10 @@ "parser", "validator" ], + "support": { + "issues": "https://github.com/Seldaek/jsonlint/issues", + "source": "https://github.com/Seldaek/jsonlint/tree/1.8.3" + }, "funding": [ { "url": "https://github.com/Seldaek", @@ -4019,16 +4035,16 @@ }, { "name": "symfony/filesystem", - "version": "v5.2.3", + "version": "v5.3.3", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "262d033b57c73e8b59cd6e68a45c528318b15038" + "reference": "19b71c8f313b411172dd5f470fd61f24466d79a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/262d033b57c73e8b59cd6e68a45c528318b15038", - "reference": "262d033b57c73e8b59cd6e68a45c528318b15038", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/19b71c8f313b411172dd5f470fd61f24466d79a9", + "reference": "19b71c8f313b411172dd5f470fd61f24466d79a9", "shasum": "" }, "require": { @@ -4060,6 +4076,9 @@ ], "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/filesystem/tree/v5.3.3" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -4074,20 +4093,20 @@ "type": "tidelift" } ], - "time": "2021-01-27T10:01:46+00:00" + "time": "2021-06-30T07:27:52+00:00" }, { "name": "symfony/finder", - "version": "v5.2.3", + "version": "v5.3.0", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "4adc8d172d602008c204c2e16956f99257248e03" + "reference": "0ae3f047bed4edff6fd35b26a9a6bfdc92c953c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/4adc8d172d602008c204c2e16956f99257248e03", - "reference": "4adc8d172d602008c204c2e16956f99257248e03", + "url": "https://api.github.com/repos/symfony/finder/zipball/0ae3f047bed4edff6fd35b26a9a6bfdc92c953c6", + "reference": "0ae3f047bed4edff6fd35b26a9a6bfdc92c953c6", "shasum": "" }, "require": { @@ -4118,6 +4137,9 @@ ], "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/finder/tree/v5.3.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -4132,20 +4154,20 @@ "type": "tidelift" } ], - "time": "2021-01-28T22:06:19+00:00" + "time": "2021-05-26T12:52:38+00:00" }, { "name": "symfony/options-resolver", - "version": "v5.2.3", + "version": "v5.3.0", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "5d0f633f9bbfcf7ec642a2b5037268e61b0a62ce" + "reference": "162e886ca035869866d233a2bfef70cc28f9bbe5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/5d0f633f9bbfcf7ec642a2b5037268e61b0a62ce", - "reference": "5d0f633f9bbfcf7ec642a2b5037268e61b0a62ce", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/162e886ca035869866d233a2bfef70cc28f9bbe5", + "reference": "162e886ca035869866d233a2bfef70cc28f9bbe5", "shasum": "" }, "require": { @@ -4184,6 +4206,9 @@ "configuration", "options" ], + "support": { + "source": "https://github.com/symfony/options-resolver/tree/v5.3.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -4198,7 +4223,7 @@ "type": "tidelift" } ], - "time": "2021-01-27T12:56:27+00:00" + "time": "2021-05-26T17:43:10+00:00" }, { "name": "symfony/polyfill-ctype", @@ -4688,16 +4713,16 @@ }, { "name": "symfony/process", - "version": "v5.2.3", + "version": "v5.3.2", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "313a38f09c77fbcdc1d223e57d368cea76a2fd2f" + "reference": "714b47f9196de61a196d86c4bad5f09201b307df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/313a38f09c77fbcdc1d223e57d368cea76a2fd2f", - "reference": "313a38f09c77fbcdc1d223e57d368cea76a2fd2f", + "url": "https://api.github.com/repos/symfony/process/zipball/714b47f9196de61a196d86c4bad5f09201b307df", + "reference": "714b47f9196de61a196d86c4bad5f09201b307df", "shasum": "" }, "require": { @@ -4729,6 +4754,9 @@ ], "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/process/tree/v5.3.2" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -4743,7 +4771,7 @@ "type": "tidelift" } ], - "time": "2021-01-27T10:15:41+00:00" + "time": "2021-06-12T10:15:01+00:00" }, { "name": "symfony/service-contracts", @@ -5224,9 +5252,7 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "phpbench/phpbench": 15 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": { diff --git a/phpbench.json b/phpbench.json index f782945a..f7bf94a8 100644 --- a/phpbench.json +++ b/phpbench.json @@ -1,5 +1,6 @@ { - "bootstrap": "vendor/autoload.php", - "path": "benchmarks", - "retry_threshold": 5 + "runner.bootstrap": "vendor/autoload.php", + "runner.file_pattern": "*Bench.php", + "runner.path": "benchmarks", + "runner.retry_threshold": 5 }