Released version 3.3.7

See #58

.github/workflows/tests.yml

@@ -0,0 +1,43 @@
+name: Tests
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  tests:
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '7.2'
+          tools: phpunit:8,psalm
+
+      - name: Setup problem matchers for PHPUnit
+        run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
+      - name: Get composer cache directory
+        id: composercache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.composercache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - run: composer install --no-interaction
+
+      - name: Psalm
+        run: psalm --output-format=github
+        if: always()
+
+      - name: PHPUnit
+        run: phpunit --coverage-text
+        if: always()

CHANGELOG.md

@@ -6,6 +6,28 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+## 3.3.7 - 2022-06-16
+
+### Fixed
+- PHP warning, when accessing OPcache status with `opcache.restrict_api`
+
+## 3.3.6 - 2022-02-08
+
+### Changed
+- updated dependencies (Mustache.php, Pimple)
+- minimum required PHP version 7.2.5 (was de-facto required by dependencies before)
+
+### Fixed
+- deprecation notices on PHP 8.1
+
+## 3.3.5 - 2021-09-28
+
+### Changed
+- reduced maximum Server Timing headers size to 2K (half of possible nginx defaults) 
+
+### Fixed
+- allowed Composer install on PHP 8
+
 ## 3.3.4 - 2020-11-16
 
 ### Fixed

README.md

@@ -4,13 +4,10 @@
 
 _Make a site, make it fast._
 
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/Rarst/laps/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/Rarst/laps/?branch=master)
+[![Tests Status](https://github.com/rarst/laps/actions/workflows/tests.yml/badge.svg)](https://github.com/Rarst/laps/actions/workflows/tests.yml)
-[![Build Status](https://scrutinizer-ci.com/g/Rarst/laps/badges/build.png?b=master)](https://scrutinizer-ci.com/g/Rarst/laps/build-status/master)
-[![Code Coverage](https://scrutinizer-ci.com/g/Rarst/laps/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/Rarst/laps/?branch=master)
 [![Total Downloads](https://img.shields.io/packagist/dt/rarst/laps.svg)](https://packagist.org/packages/rarst/laps)
 [![Latest Stable Version](https://img.shields.io/packagist/v/rarst/laps.svg?label=version)](https://packagist.org/packages/rarst/laps)
 [![PHP from Packagist](https://img.shields.io/packagist/php-v/rarst/laps.svg)](https://packagist.org/packages/rarst/laps)
-[![PDS Skeleton](https://img.shields.io/badge/pds-skeleton-blue.svg)](https://github.com/php-pds/skeleton)
 [![Download Laps](https://img.shields.io/badge/download-laps.zip-blue)](https://github.com/Rarst/laps/releases/latest/download/laps.zip)
 
 Laps is a plugin that **shows performance information** about WordPress page load.
@@ -40,7 +37,7 @@ API requests need to be authenticated as admin for performance data to be sent.
 
 | [Composer](https://getcomposer.org/) (recommended) | Release archive |
 | -------------------------------------------------- | -------- |
-| `composer require rarst/laps` | [![Download Laps](https://img.shields.io/badge/download-laps.zip-blue?style=for-the-badge)](https://github.com/Rarst/laps/releases/latest/download/laps.zip) |  
+| `composer require rarst/laps` | [![Download Laps](https://img.shields.io/badge/download-laps.zip-blue?style=for-the-badge)](https://github.com/Rarst/laps/releases/latest/download/laps.zip)|
 
 ## Tests
 

RoboFile.php

@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 require __DIR__ . '/vendor/autoload.php';
 
@@ -68,14 +69,65 @@ class RoboFile extends \Robo\Tasks {
 		$dir = __DIR__ . '/src/mustache/cache';
 		$this->_cleanDir( $dir );
 		$mustache = new \Mustache_Engine(
-			array(
+			[
 				'loader' => new \Mustache_Loader_FilesystemLoader( __DIR__ . '/src/mustache' ),
 				'cache'  => $dir,
-			)
+			]
 		);
 		$mustache->loadTemplate( 'laps' );
 	}
 
+	/**
+	 * Creates release zip
+	 *
+	 * @param string $php PHP version to target.
+	 */
+	public function makeArchive( $php = '7.2.5' ): void {
+
+		$composer = json_decode( file_get_contents( __DIR__ . '/composer.json' ) );
+		$package  = $composer->name;
+
+		[ $vendor, $name ] = explode( '/', $package );
+
+		if ( empty( $vendor ) || empty( $name ) ) {
+			return;
+		}
+
+		$this->_mkdir( 'release' );
+
+		$version = $this->latestTag();
+
+		$this->taskExec( "composer create-project {$package} {$name} {$version}" )
+		     ->dir( __DIR__ . '/release' )
+		     ->arg( '--prefer-dist' )
+		     ->arg( '--no-install' )
+		     ->run();
+
+		if ( $php ) {
+			$this->taskExec( "composer config platform.php {$php}" )
+			     ->dir( __DIR__ . "/release/{$name}" )
+			     ->run();
+		}
+
+		$this->taskExec( 'composer remove composer/installers --no-update' )
+		     ->dir( __DIR__ . "/release/{$name}" )
+		     ->run();
+
+		$this->taskExec( 'composer update --no-dev --optimize-autoloader' )
+		     ->dir( __DIR__ . "/release/{$name}" )
+		     ->run();
+
+		$zipFile = "release/{$name}.zip";
+
+		$this->_remove( $zipFile );
+
+		$this->taskPack( $zipFile )
+		     ->addDir( $name, "release/{$name}" )
+		     ->run();
+
+		$this->_deleteDir( "release/{$name}" );
+	}
+
 	/**
 	 * Updates version in header and makes git version tag.
 	 *
@@ -83,12 +135,13 @@ class RoboFile extends \Robo\Tasks {
 	 */
 	public function tag( $version ) {
 
-		$this->versionSet( $version );
+		$this->makeVersion( $version );
 
 		$this->taskGitStack()
 		     ->stopOnFail()
+		     ->add( 'CHANGELOG.md' )
 		     ->add( 'laps.php' )
-		     ->commit( "Updated header version to {$version}" )
+		     ->commit( "Released version $version" )
 		     ->tag( $version )
 		     ->run();
 	}
@@ -98,11 +151,31 @@ class RoboFile extends \Robo\Tasks {
 	 *
 	 * @param string $version Version string.
 	 */
-	public function versionSet( $version ) {
+	public function makeVersion( $version ) {
+
+		$this->taskReplaceInFile( 'CHANGELOG.md' )
+		     ->from( '## Unreleased' )
+		     ->to( '## Unreleased' . PHP_EOL . PHP_EOL . "## $version - " . date_format( date_create(), 'Y-m-d' ) )
+		     ->run();
 
 		$this->taskReplaceInFile( 'laps.php' )
 		     ->regex( '|^Version:.*$|m' )
 		     ->to( 'Version: ' . $version )
 		     ->run();
 	}
+
+	public function upload() {
+		$version = $this->latestTag();
+		$zipFile = __DIR__ . '/release/laps.zip';
+
+		$this->makeArchive();
+		$this->_exec("gh release upload $version $zipFile");
+		$this->_remove( $zipFile );
+	}
+
+	private function latestTag(): string {
+		$commit = escapeshellarg( exec( 'git rev-list --tags --max-count=1' ) );
+
+		return escapeshellarg( exec( "git describe --tags {$commit}" ) );
+	}
 }

composer.json

@@ -8,7 +8,7 @@
 	"authors"    : [
 		{
 			"name"    : "Andrey Savchenko",
-			"homepage": "http://www.Rarst.net/"
+			"homepage": "https://www.Rarst.net/"
 		}
 	],
 	"support"    : {
@@ -25,11 +25,11 @@
 		}
 	},
 	"require"    : {
-		"php"                : "^7.1.3",
+		"php"                : "^7.2.5 || ^8",
-		"composer/installers": "^1.6",
+		"composer/installers": "^1.6 || ^2",
 		"symfony/stopwatch"  : "^4.2.1",
-		"mustache/mustache"  : "^2.12",
+		"mustache/mustache"  : "^2.14.1",
-		"pimple/pimple"      : "^3.2.3"
+		"pimple/pimple"      : "^3.5"
 	},
 	"require-dev": {
 		"twbs/bootstrap": "^3.4",
@@ -49,5 +49,13 @@
 				"Tests"
 			]
 		}
+	},
+	"config": {
+		"allow-plugins": {
+			"composer/installers": true
+		},
+		"platform": {
+			"php": "7.2.5"
+		}
 	}
 }

composer.lock

@@ -4,39 +4,41 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a72036af9e80358500e4274847500bcc",
+    "content-hash": "1bf4582190f9dfcabf70f1a29f7f15e8",
     "packages": [
         {
             "name": "composer/installers",
-            "version": "v1.8.0",
+            "version": "v2.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/installers.git",
-                "reference": "7d610d50aae61ae7ed6675e58efeabdf279bb5e3"
+                "reference": "af93ba6e52236418f07a278033eba6959ee5b983"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/installers/zipball/7d610d50aae61ae7ed6675e58efeabdf279bb5e3",
+                "url": "https://api.github.com/repos/composer/installers/zipball/af93ba6e52236418f07a278033eba6959ee5b983",
-                "reference": "7d610d50aae61ae7ed6675e58efeabdf279bb5e3",
+                "reference": "af93ba6e52236418f07a278033eba6959ee5b983",
                 "shasum": ""
             },
             "require": {
-                "composer-plugin-api": "^1.0"
+                "composer-plugin-api": "^1.0 || ^2.0",
-            },
+                "php": "^7.2 || ^8.0"
-            "replace": {
-                "roundcube/plugin-installer": "*",
-                "shama/baton": "*"
             },
             "require-dev": {
-                "composer/composer": "1.0.*@dev",
+                "composer/composer": "1.6.* || ^2.0",
-                "phpunit/phpunit": "^4.8.36"
+                "composer/semver": "^1 || ^3",
+                "phpstan/phpstan": "^0.12.55",
+                "phpstan/phpstan-phpunit": "^0.12.16",
+                "symfony/phpunit-bridge": "^5.3",
+                "symfony/process": "^5"
             },
             "type": "composer-plugin",
             "extra": {
                 "class": "Composer\\Installers\\Plugin",
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-main": "2.x-dev"
-                }
+                },
+                "plugin-modifies-install-path": true
             },
             "autoload": {
                 "psr-4": {
@@ -57,7 +59,6 @@
             "description": "A multi-framework Composer library installer",
             "homepage": "https://composer.github.io/installers/",
             "keywords": [
-                "Craft",
                 "Dolibarr",
                 "Eliasis",
                 "Hurad",
@@ -73,11 +74,11 @@
                 "Porto",
                 "RadPHP",
                 "SMF",
+                "Starbug",
                 "Thelia",
                 "Whmcs",
                 "WolfCMS",
                 "agl",
-                "aimeos",
                 "annotatecms",
                 "attogram",
                 "bitrix",
@@ -96,7 +97,6 @@
                 "grav",
                 "installer",
                 "itop",
-                "joomla",
                 "known",
                 "kohana",
                 "laravel",
@@ -106,13 +106,16 @@
                 "majima",
                 "mako",
                 "mediawiki",
+                "miaoxing",
                 "modulework",
                 "modx",
                 "moodle",
                 "osclass",
+                "pantheon",
                 "phpbb",
                 "piwik",
                 "ppi",
+                "processwire",
                 "puppet",
                 "pxcms",
                 "reindex",
@@ -121,27 +124,44 @@
                 "silverstripe",
                 "sydes",
                 "sylius",
-                "symfony",
+                "tastyigniter",
-                "typo3",
                 "wordpress",
                 "yawik",
                 "zend",
                 "zikula"
             ],
-            "time": "2020-02-07T10:39:20+00:00"
+            "support": {
+                "issues": "https://github.com/composer/installers/issues",
+                "source": "https://github.com/composer/installers/tree/v2.1.1"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-04-13T09:13:00+00:00"
         },
         {
             "name": "mustache/mustache",
-            "version": "v2.13.0",
+            "version": "v2.14.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/mustache.php.git",
-                "reference": "e95c5a008c23d3151d59ea72484d4f72049ab7f4"
+                "reference": "579ffa5c96e1d292c060b3dd62811ff01ad8c24e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/mustache.php/zipball/e95c5a008c23d3151d59ea72484d4f72049ab7f4",
+                "url": "https://api.github.com/repos/bobthecow/mustache.php/zipball/579ffa5c96e1d292c060b3dd62811ff01ad8c24e",
-                "reference": "e95c5a008c23d3151d59ea72484d4f72049ab7f4",
+                "reference": "579ffa5c96e1d292c060b3dd62811ff01ad8c24e",
                 "shasum": ""
             },
             "require": {
@@ -174,33 +194,37 @@
                 "mustache",
                 "templating"
             ],
-            "time": "2019-11-23T21:40:31+00:00"
+            "support": {
+                "issues": "https://github.com/bobthecow/mustache.php/issues",
+                "source": "https://github.com/bobthecow/mustache.php/tree/v2.14.1"
+            },
+            "time": "2022-01-21T06:08:36+00:00"
         },
         {
             "name": "pimple/pimple",
-            "version": "v3.2.3",
+            "version": "v3.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/silexphp/Pimple.git",
-                "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32"
+                "reference": "a94b3a4db7fb774b3d78dad2315ddc07629e1bed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/silexphp/Pimple/zipball/9e403941ef9d65d20cba7d54e29fe906db42cf32",
+                "url": "https://api.github.com/repos/silexphp/Pimple/zipball/a94b3a4db7fb774b3d78dad2315ddc07629e1bed",
-                "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32",
+                "reference": "a94b3a4db7fb774b3d78dad2315ddc07629e1bed",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0",
+                "php": ">=7.2.5",
-                "psr/container": "^1.0"
+                "psr/container": "^1.1 || ^2.0"
             },
             "require-dev": {
-                "symfony/phpunit-bridge": "^3.2"
+                "symfony/phpunit-bridge": "^5.4@dev"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2.x-dev"
+                    "dev-master": "3.4.x-dev"
                 }
             },
             "autoload": {
@@ -219,36 +243,34 @@
                 }
             ],
             "description": "Pimple, a simple Dependency Injection Container",
-            "homepage": "http://pimple.sensiolabs.org",
+            "homepage": "https://pimple.symfony.com",
             "keywords": [
                 "container",
                 "dependency injection"
             ],
-            "time": "2018-01-21T07:42:36+00:00"
+            "support": {
+                "source": "https://github.com/silexphp/Pimple/tree/v3.5.0"
+            },
+            "time": "2021-10-28T11:13:42+00:00"
         },
         {
             "name": "psr/container",
-            "version": "1.0.0",
+            "version": "1.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/container.git",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
+                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=7.2.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Psr\\Container\\": "src/"
@@ -261,7 +283,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common Container Interface (PHP FIG PSR-11)",
@@ -273,25 +295,100 @@
                 "container-interop",
                 "psr"
             ],
-            "time": "2017-02-14T16:28:37+00:00"
+            "support": {
+                "issues": "https://github.com/php-fig/container/issues",
+                "source": "https://github.com/php-fig/container/tree/1.1.1"
+            },
+            "time": "2021-03-05T17:36:06+00:00"
         },
         {
-            "name": "symfony/service-contracts",
+            "name": "symfony/deprecation-contracts",
-            "version": "v2.0.1",
+            "version": "v2.5.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/service-contracts.git",
+                "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "144c5e51266b281231e947b51223ba14acf1a749"
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/144c5e51266b281231e947b51223ba14acf1a749",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
-                "reference": "144c5e51266b281231e947b51223ba14acf1a749",
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
+                "php": ">=7.1"
-                "psr/container": "^1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "2.5-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "function.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "A generic function and convention to trigger deprecation notices",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-01-02T09:53:40+00:00"
+        },
+        {
+            "name": "symfony/service-contracts",
+            "version": "v2.5.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/service-contracts.git",
+                "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/24d9dc654b83e91aa59f9d167b131bc3b5bea24c",
+                "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "psr/container": "^1.1",
+                "symfony/deprecation-contracts": "^2.1|^3"
+            },
+            "conflict": {
+                "ext-psr": "<1.1|>=2"
             },
             "suggest": {
                 "symfony/service-implementation": ""
@@ -299,7 +396,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-main": "2.5-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -331,32 +432,44 @@
                 "interoperability",
                 "standards"
             ],
-            "time": "2019-11-18T17:27:11+00:00"
+            "support": {
+                "source": "https://github.com/symfony/service-contracts/tree/v2.5.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-03-13T20:07:29+00:00"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v4.4.4",
+            "version": "v4.4.38",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "abc08d7c48987829bac301347faa10f7e8bbf4fb"
+                "reference": "7f4f5a8122f7530d688cc9edf2f8c9261552fa2d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/abc08d7c48987829bac301347faa10f7e8bbf4fb",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/7f4f5a8122f7530d688cc9edf2f8c9261552fa2d",
-                "reference": "abc08d7c48987829bac301347faa10f7e8bbf4fb",
+                "reference": "7f4f5a8122f7530d688cc9edf2f8c9261552fa2d",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3",
+                "php": ">=7.1.3",
                 "symfony/service-contracts": "^1.0|^2"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.4-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Stopwatch\\": ""
@@ -379,24 +492,41 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Stopwatch Component",
+            "description": "Provides a way to profile code",
             "homepage": "https://symfony.com",
-            "time": "2020-01-04T13:00:46+00:00"
+            "support": {
+                "source": "https://github.com/symfony/stopwatch/tree/v4.4.38"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-02-18T15:34:20+00:00"
         }
     ],
     "packages-dev": [
         {
             "name": "antecedent/patchwork",
-            "version": "2.1.12",
+            "version": "2.1.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/antecedent/patchwork.git",
-                "reference": "b98e046dd4c0acc34a0846604f06f6111654d9ea"
+                "reference": "25c1fa0cd9a6e6d0d13863d8df8f050b6733f16d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/antecedent/patchwork/zipball/b98e046dd4c0acc34a0846604f06f6111654d9ea",
+                "url": "https://api.github.com/repos/antecedent/patchwork/zipball/25c1fa0cd9a6e6d0d13863d8df8f050b6733f16d",
-                "reference": "b98e046dd4c0acc34a0846604f06f6111654d9ea",
+                "reference": "25c1fa0cd9a6e6d0d13863d8df8f050b6733f16d",
                 "shasum": ""
             },
             "require": {
@@ -427,31 +557,35 @@
                 "runkit",
                 "testing"
             ],
-            "time": "2019-12-22T17:52:09+00:00"
+            "support": {
+                "issues": "https://github.com/antecedent/patchwork/issues",
+                "source": "https://github.com/antecedent/patchwork/tree/2.1.21"
+            },
+            "time": "2022-02-07T07:28:34+00:00"
         },
         {
             "name": "brain/monkey",
-            "version": "2.4.0",
+            "version": "2.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Brain-WP/BrainMonkey.git",
-                "reference": "b3ce8b619c26db6abd01b9dcfd6a2c0254060956"
+                "reference": "a31c84515bb0d49be9310f52ef1733980ea8ffbb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Brain-WP/BrainMonkey/zipball/b3ce8b619c26db6abd01b9dcfd6a2c0254060956",
+                "url": "https://api.github.com/repos/Brain-WP/BrainMonkey/zipball/a31c84515bb0d49be9310f52ef1733980ea8ffbb",
-                "reference": "b3ce8b619c26db6abd01b9dcfd6a2c0254060956",
+                "reference": "a31c84515bb0d49be9310f52ef1733980ea8ffbb",
                 "shasum": ""
             },
             "require": {
-                "antecedent/patchwork": "^2.0",
+                "antecedent/patchwork": "^2.1.17",
-                "mockery/mockery": ">=0.9 <2",
+                "mockery/mockery": "^1.3.5 || ^1.4.4",
                 "php": ">=5.6.0"
             },
             "require-dev": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.4",
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
                 "phpcompatibility/php-compatibility": "^9.3.0",
-                "phpunit/phpunit": "^5.7.9 || ^6.0 || ^7.0"
+                "phpunit/phpunit": "^5.7.26 || ^6.0 || ^7.0 || >=8.0 <8.5.12 || ^8.5.14 || ^9.0"
             },
             "type": "library",
             "extra": {
@@ -461,12 +595,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Brain\\Monkey\\": "src/"
-                },
                 "files": [
                     "inc/api.php"
-                ]
+                ],
+                "psr-4": {
+                    "Brain\\Monkey\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -493,24 +627,28 @@
                 "test",
                 "testing"
             ],
-            "time": "2019-11-24T16:03:21+00:00"
+            "support": {
+                "issues": "https://github.com/Brain-WP/BrainMonkey/issues",
+                "source": "https://github.com/Brain-WP/BrainMonkey"
+            },
+            "time": "2021-11-11T15:53:55+00:00"
         },
         {
             "name": "hamcrest/hamcrest-php",
-            "version": "v2.0.0",
+            "version": "v2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/hamcrest/hamcrest-php.git",
-                "reference": "776503d3a8e85d4f9a1148614f95b7a608b046ad"
+                "reference": "8c3d0a3f6af734494ad8f6fbbee0ba92422859f3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/776503d3a8e85d4f9a1148614f95b7a608b046ad",
+                "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/8c3d0a3f6af734494ad8f6fbbee0ba92422859f3",
-                "reference": "776503d3a8e85d4f9a1148614f95b7a608b046ad",
+                "reference": "8c3d0a3f6af734494ad8f6fbbee0ba92422859f3",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3|^7.0"
+                "php": "^5.3|^7.0|^8.0"
             },
             "replace": {
                 "cordoval/hamcrest-php": "*",
@@ -518,14 +656,13 @@
                 "kodova/hamcrest-php": "*"
             },
             "require-dev": {
-                "phpunit/php-file-iterator": "1.3.3",
+                "phpunit/php-file-iterator": "^1.4 || ^2.0",
-                "phpunit/phpunit": "~4.0",
+                "phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0"
-                "satooshi/php-coveralls": "^1.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "2.1-dev"
                 }
             },
             "autoload": {
@@ -535,35 +672,39 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD"
+                "BSD-3-Clause"
             ],
             "description": "This is the PHP port of Hamcrest Matchers",
             "keywords": [
                 "test"
             ],
-            "time": "2016-01-20T08:20:44+00:00"
+            "support": {
+                "issues": "https://github.com/hamcrest/hamcrest-php/issues",
+                "source": "https://github.com/hamcrest/hamcrest-php/tree/v2.0.1"
+            },
+            "time": "2020-07-09T08:09:16+00:00"
         },
         {
             "name": "mockery/mockery",
-            "version": "1.3.1",
+            "version": "1.3.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mockery/mockery.git",
-                "reference": "f69bbde7d7a75d6b2862d9ca8fab1cd28014b4be"
+                "reference": "472fa8ca4e55483d55ee1e73c963718c4393791d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mockery/mockery/zipball/f69bbde7d7a75d6b2862d9ca8fab1cd28014b4be",
+                "url": "https://api.github.com/repos/mockery/mockery/zipball/472fa8ca4e55483d55ee1e73c963718c4393791d",
-                "reference": "f69bbde7d7a75d6b2862d9ca8fab1cd28014b4be",
+                "reference": "472fa8ca4e55483d55ee1e73c963718c4393791d",
                 "shasum": ""
             },
             "require": {
-                "hamcrest/hamcrest-php": "~2.0",
+                "hamcrest/hamcrest-php": "^2.0.1",
                 "lib-pcre": ">=7.0",
                 "php": ">=5.6.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~5.7.10|~6.5|~7.0|~8.0"
+                "phpunit/phpunit": "^5.7.10|^6.5|^7.5|^8.5|^9.3"
             },
             "type": "library",
             "extra": {
@@ -606,7 +747,11 @@
                 "test double",
                 "testing"
             ],
-            "time": "2019-12-26T09:49:15+00:00"
+            "support": {
+                "issues": "https://github.com/mockery/mockery/issues",
+                "source": "https://github.com/mockery/mockery/tree/1.3.5"
+            },
+            "time": "2021-09-13T15:33:03+00:00"
         },
         {
             "name": "pds/skeleton",
@@ -637,6 +782,10 @@
             ],
             "description": "Standard for PHP package skeletons.",
             "homepage": "https://github.com/php-pds/skeleton",
+            "support": {
+                "issues": "https://github.com/php-pds/skeleton/issues",
+                "source": "https://github.com/php-pds/skeleton/tree/1.x"
+            },
             "time": "2017-01-25T23:30:41+00:00"
         },
         {
@@ -688,6 +837,10 @@
                 "responsive",
                 "web"
             ],
+            "support": {
+                "issues": "https://github.com/twbs/bootstrap/issues",
+                "source": "https://github.com/twbs/bootstrap/tree/v3.4.1"
+            },
             "time": "2019-02-13T15:55:38+00:00"
         }
     ],
@@ -697,7 +850,11 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "^7.1.3"
+        "php": "^7.2.5 || ^8"
     },
-    "platform-dev": []
+    "platform-dev": [],
+    "platform-overrides": {
+        "php": "7.2.5"
+    },
+    "plugin-api-version": "2.3.0"
 }

laps.php

@@ -5,10 +5,10 @@ Plugin Name: Laps
 Plugin URI: https://github.com/Rarst/laps
 Description: Light WordPress profiler.
 Author: Andrey “Rarst” Savchenko
-Version: 3.3.4
+Version: 3.3.7
 Author URI: https://www.rarst.net/
-Text Domain: laps
+Requires PHP: 7.1.3
-Domain Path: /lang
+Update URI: false
 License: MIT
 */
 

psalm.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <psalm
-        totallyTyped="false"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xmlns="https://getpsalm.org/schema/config"
         xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+        errorLevel="2"
 >
     <projectFiles>
         <directory name="src"/>

src/Manager/Server_Timing_Manager.php

@@ -63,7 +63,7 @@ class Server_Timing_Manager {
 
 			$header .= sprintf( '%s;dur=%.2f;desc="%s", ', $record->get_category(), $duration, $record->get_name() );
 
-			if ( strlen( $header ) > 4000 ) { // 8+KB headers break proxies, so we cut off at 1/2 that limit.
+			if ( strlen( $header ) > 2000 ) { // 8+KB headers break proxies, 4+KB nginx, so we cut off at 1/2 that limit.
 				break;
 			}
 		}

src/Record/Collector/Core_Load_Collector.php

@@ -36,8 +36,12 @@ class Core_Load_Collector implements Record_Collector_Interface {
 
 		$php = 'PHP Load – ' . PHP_VERSION;
 
-		if ( function_exists( 'opcache_get_status' ) ) {
+		if ( $this->opcache_api_available() ) {
-			$zend_status = opcache_get_status();
+			/**
+			 * This is silenced since it might still emit warning for correct `opcache.resrict_api` configuration.
+			 * @see https://github.com/php/php-src/issues/8799
+			 */
+			$zend_status = @opcache_get_status();
 			$php         .= empty( $zend_status['opcache_enabled'] ) ? '' : ' – OPcache';
 		}
 
@@ -52,4 +56,22 @@ class Core_Load_Collector implements Record_Collector_Interface {
 			new Record( $load, $timestart, $this->timeload - $timestart, '', 'core' ),
 		];
 	}
+
+	private function opcache_api_available(): bool {
+		if ( ! function_exists( 'opcache_get_status' ) ) {
+			return false;
+		}
+
+		$restrict_api = ini_get( 'opcache.restrict_api' );
+
+		if ( ! $restrict_api ) {
+			return true;
+		}
+
+		/**
+		 * The paths aren't normalized, because it is unclear if they are in PHP itself
+		 * and this should rather be false negative to prevent warning emitted.
+		 */
+		return 0 === stripos( __FILE__, $restrict_api );
+	}
 }

src/Record/Collector/Hook_Collector.php

@@ -78,7 +78,6 @@ class Hook_Collector extends Stopwatch_Collector {
 		/**
 		 * @var int|string $key
 		 * @var array      $data
-		 * @psalm-var array{0:string} $data
 		 */
 		foreach ( $stops as $key => $data ) {
 

src/Record/Iterator/Recursive_Record_Iterator.php

@@ -7,6 +7,9 @@ use Rarst\Laps\Record\Record_Interface;
 
 /**
  * Processes records, recursively bumping overlapping ones to children.
+ *
+ * @template-extends \ArrayIterator<array-key,Record_Interface>
+ * @template-implements \RecursiveIterator<array-key,Record_Interface>
  */
 class Recursive_Record_Iterator extends \ArrayIterator implements \RecursiveIterator {
 
@@ -15,7 +18,7 @@ class Recursive_Record_Iterator extends \ArrayIterator implements \RecursiveIter
 
 	/**
 	 * @param Record_Interface[] $records Records to process.
-	 * @param int                $flags   Configuration flags.
+	 * @psalm-param 0|1|2|3      $flags   Configuration flags.
 	 */
 	public function __construct( array $records, int $flags = 0 ) {
 
@@ -67,10 +70,10 @@ class Recursive_Record_Iterator extends \ArrayIterator implements \RecursiveIter
 	}
 
 	/**
-	 * @return static
+	 * This should be `static` for possible subclassing, but problems hinting that for PHP <8, also don't subclass this.
 	 */
-	public function getChildren() {
+	public function getChildren(): self {
 
-		return new static( $this->children );
+		return new self( $this->children );
 	}
 }

src/Record/Iterator/Timeline_Iterator.php

@@ -5,11 +5,12 @@ namespace Rarst\Laps\Record\Iterator;
 
 use Rarst\Laps\Record\Record;
 use Rarst\Laps\Record\Record_Interface;
-use Rarst\Laps\Record\Iterator\Recursive_Record_Iterator;
 
 /**
  * Processes records into sets for display by template.
  *
+ * @template-implements \Iterator<array>
+ *
  * @psalm-suppress PropertyNotSetInConstructor
  */
 class Timeline_Iterator implements \Iterator {
@@ -60,12 +61,14 @@ class Timeline_Iterator implements \Iterator {
 	}
 
 	/**
+	 * Key is unused and is only type hinted to possible `int` for PHP 8.1 `mixed` type compatibility.
+	 *
 	 * @codeCoverageIgnore
 	 *
-	 * @return void
+	 * @return null
 	 */
-	public function key(): void {
+	public function key(): ?int {
-
+		return null;
 	}
 
 	/**

tests/Manager/AssetTest.php

@@ -20,8 +20,8 @@ class AssetTest extends LapsTestCase {
 
 		$manager = new Asset_Manager();
 
-		$this->assertTrue( has_action( 'wp_enqueue_scripts', [ $manager, 'enqueue_scripts' ] ) );
+		$this->assertTrue( (bool) has_action( 'wp_enqueue_scripts', [ $manager, 'enqueue_scripts' ] ) );
-		$this->assertTrue( has_action( 'admin_enqueue_scripts', [ $manager, 'enqueue_scripts' ] ) );
+		$this->assertTrue( (bool) has_action( 'admin_enqueue_scripts', [ $manager, 'enqueue_scripts' ] ) );
 
 		return $manager;
 	}

tests/Manager/LoadOrderTest.php

@@ -20,8 +20,8 @@ class LoadOrderTest extends LapsTestCase {
 
 		$manager = new Load_Order_Manager();
 
-		$this->assertTrue( has_action( 'pre_update_option_active_plugins', [ $manager, 'pre_update_option_active_plugins' ] ) );
+		$this->assertTrue( (bool) has_action( 'pre_update_option_active_plugins', [ $manager, 'pre_update_option_active_plugins' ] ) );
-		$this->assertTrue( has_action( 'pre_update_site_option_active_sitewide_plugins', [ $manager, 'pre_update_option_active_plugins' ] ) );
+		$this->assertTrue( (bool) has_action( 'pre_update_site_option_active_sitewide_plugins', [ $manager, 'pre_update_option_active_plugins' ] ) );
 
 		return $manager;
 

tests/Manager/ToolbarTest.php

@@ -23,7 +23,7 @@ class ToolbarTest extends LapsTestCase {
 		$collector = new Lazy_Proxy_Collector( [] );
 		$manager   = new Toolbar_Manager( $collector, new \Mustache_Engine() );
 
-		$this->assertTrue( has_action( 'admin_bar_menu', [ $manager, 'admin_bar_menu' ] ) );
+		$this->assertTrue( (bool) has_action( 'admin_bar_menu', [ $manager, 'admin_bar_menu' ] ) );
 
 		return $manager;
 	}

tests/Record/HookTest.php

@@ -18,9 +18,9 @@ class HookTest extends LapsTestCase {
 		$stopwatch = new Stopwatch();
 		$collector = new Hook_Collector( $stopwatch, [ 'core' => new Core_Events() ] );
 
-		$this->assertTrue( has_action( 'after_setup_theme', [ $collector, 'after_setup_theme' ] ) );
+		$this->assertTrue( (bool) has_action( 'after_setup_theme', [ $collector, 'after_setup_theme' ] ) );
 
-		$this->assertTrue( has_action( 'plugins_loaded', 'function ($input)' ) );
+		$this->assertTrue( (bool) has_action( 'plugins_loaded', 'function ($input)' ) );
 
 		$collector->after_setup_theme();
 		$stopwatch->start( 'Toolbar' );

tests/Record/HttpTest.php

@@ -18,8 +18,8 @@ class HttpTest extends LapsTestCase {
 		$url       = 'https://example.com/';
 		$collector = new Http_Collector( $stopwatch );
 
-		$this->assertTrue( has_action( 'pre_http_request', [ $collector, 'pre_http_request' ] ) );
+		$this->assertTrue( (bool) has_action( 'pre_http_request', [ $collector, 'pre_http_request' ] ) );
-		$this->assertTrue( has_action( 'http_api_debug', [ $collector, 'http_api_debug' ] ) );
+		$this->assertTrue( (bool) has_action( 'http_api_debug', [ $collector, 'http_api_debug' ] ) );
 
 		$collector->pre_http_request( false, [], $url );
 

tests/Record/SqlTest.php

@@ -24,7 +24,7 @@ class SqlTest extends LapsTestCase {
 
 		$collector = new Sql_Collector();
 
-		$this->assertTrue( has_filter( 'query', [ $collector, 'query' ] ) );
+		$this->assertTrue( (bool) has_filter( 'query', [ $collector, 'query' ] ) );
 
 		$query = 'SELECT * FROM wp_posts';