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,7 +6,21 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
-## 3.3.5 - 2021-09-21
+## 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) 

README.md

@@ -4,9 +4,7 @@
 
 _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)
@@ -39,11 +37,11 @@ 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
 
-Tests require [Brain Monkey](https://github.com/Brain-WP/BrainMonkey) (included in dependencies) and PHPUnit 9 (not included).
+Tests require [Brain Monkey](https://github.com/Brain-WP/BrainMonkey) (included in dependencies) and PHPUnit 8 (not included).
 
 ```bash
 phpunit

RoboFile.php

@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 require __DIR__ . '/vendor/autoload.php';
 
@@ -15,13 +16,13 @@ class RoboFile extends \Robo\Tasks {
 	public function watch() {
 
 		$this->taskWatch()
-			 ->monitor( [ 'public/css/variables.less', 'public/css/laps.less' ], function () {
+		     ->monitor( [ 'public/css/variables.less', 'public/css/laps.less' ], function () {
-				 $this->makeCss();
+			     $this->makeCss();
-			 } )
+		     } )
-			 ->monitor( 'public/js/source.js', function () {
+		     ->monitor( 'public/js/source.js', function () {
-				 $this->makeJs();
+			     $this->makeJs();
-			 } )
+		     } )
-			 ->run();
+		     ->run();
 	}
 
 	/**
@@ -42,7 +43,7 @@ class RoboFile extends \Robo\Tasks {
 		$this->taskExec( 'lessc public/css/laps.less public/css/laps.css --source-map=public/css/laps.css.map' )->run();
 
 		$this->taskMinify( 'public/css/laps.css' )
-			 ->run();
+		     ->run();
 	}
 
 	/**
@@ -54,11 +55,11 @@ class RoboFile extends \Robo\Tasks {
 			'vendor/twbs/bootstrap/js/tooltip.js',
 			'public/js/source.js',
 		] )
-			 ->to( 'public/js/laps.js' )
+		     ->to( 'public/js/laps.js' )
-			 ->run();
+		     ->run();
 
 		$this->taskMinify( 'public/js/laps.js' )
-			 ->run();
+		     ->run();
 	}
 
 	/**
@@ -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 || ^8",
+		"php"                : "^7.2.5 || ^8",
 		"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,20 +4,20 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "56d31c242653d4e375949ef0356705dc",
+    "content-hash": "1bf4582190f9dfcabf70f1a29f7f15e8",
     "packages": [
         {
             "name": "composer/installers",
-            "version": "v2.0.1",
+            "version": "v2.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/installers.git",
-                "reference": "a241e78aaeb09781f5f5b92ac01ffd13ab43e5e8"
+                "reference": "af93ba6e52236418f07a278033eba6959ee5b983"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/installers/zipball/a241e78aaeb09781f5f5b92ac01ffd13ab43e5e8",
+                "url": "https://api.github.com/repos/composer/installers/zipball/af93ba6e52236418f07a278033eba6959ee5b983",
-                "reference": "a241e78aaeb09781f5f5b92ac01ffd13ab43e5e8",
+                "reference": "af93ba6e52236418f07a278033eba6959ee5b983",
                 "shasum": ""
             },
             "require": {
@@ -37,7 +37,8 @@
                 "class": "Composer\\Installers\\Plugin",
                 "branch-alias": {
                     "dev-main": "2.x-dev"
-                }
+                },
+                "plugin-modifies-install-path": true
             },
             "autoload": {
                 "psr-4": {
@@ -131,7 +132,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/installers/issues",
-                "source": "https://github.com/composer/installers/tree/v2.0.1"
+                "source": "https://github.com/composer/installers/tree/v2.1.1"
             },
             "funding": [
                 {
@@ -147,20 +148,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-13T08:21:20+00:00"
+            "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": {
@@ -195,30 +196,30 @@
             ],
             "support": {
                 "issues": "https://github.com/bobthecow/mustache.php/issues",
-                "source": "https://github.com/bobthecow/mustache.php/tree/master"
+                "source": "https://github.com/bobthecow/mustache.php/tree/v2.14.1"
             },
-            "time": "2019-11-23T21:40:31+00:00"
+            "time": "2022-01-21T06:08:36+00:00"
         },
         {
             "name": "pimple/pimple",
-            "version": "v3.4.0",
+            "version": "v3.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/silexphp/Pimple.git",
-                "reference": "86406047271859ffc13424a048541f4531f53601"
+                "reference": "a94b3a4db7fb774b3d78dad2315ddc07629e1bed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/silexphp/Pimple/zipball/86406047271859ffc13424a048541f4531f53601",
+                "url": "https://api.github.com/repos/silexphp/Pimple/zipball/a94b3a4db7fb774b3d78dad2315ddc07629e1bed",
-                "reference": "86406047271859ffc13424a048541f4531f53601",
+                "reference": "a94b3a4db7fb774b3d78dad2315ddc07629e1bed",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
-                "psr/container": "^1.1"
+                "psr/container": "^1.1 || ^2.0"
             },
             "require-dev": {
-                "symfony/phpunit-bridge": "^5.0"
+                "symfony/phpunit-bridge": "^5.4@dev"
             },
             "type": "library",
             "extra": {
@@ -248,9 +249,9 @@
                 "dependency injection"
             ],
             "support": {
-                "source": "https://github.com/silexphp/Pimple/tree/v3.4.0"
+                "source": "https://github.com/silexphp/Pimple/tree/v3.5.0"
             },
-            "time": "2021-03-06T08:28:00+00:00"
+            "time": "2021-10-28T11:13:42+00:00"
         },
         {
             "name": "psr/container",
@@ -301,22 +302,93 @@
             "time": "2021-03-05T17:36:06+00:00"
         },
         {
-            "name": "symfony/service-contracts",
+            "name": "symfony/deprecation-contracts",
-            "version": "v2.4.0",
+            "version": "v2.5.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/service-contracts.git",
+                "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb"
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
-                "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb",
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "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"
+                "psr/container": "^1.1",
+                "symfony/deprecation-contracts": "^2.1|^3"
+            },
+            "conflict": {
+                "ext-psr": "<1.1|>=2"
             },
             "suggest": {
                 "symfony/service-implementation": ""
@@ -324,7 +396,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.4-dev"
+                    "dev-main": "2.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -361,7 +433,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v2.4.0"
+                "source": "https://github.com/symfony/service-contracts/tree/v2.5.1"
             },
             "funding": [
                 {
@@ -377,20 +449,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-04-01T10:43:52+00:00"
+            "time": "2022-03-13T20:07:29+00:00"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v4.4.27",
+            "version": "v4.4.38",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "c85d997af06a58ba83e2d2538e335b894c24523d"
+                "reference": "7f4f5a8122f7530d688cc9edf2f8c9261552fa2d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/c85d997af06a58ba83e2d2538e335b894c24523d",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/7f4f5a8122f7530d688cc9edf2f8c9261552fa2d",
-                "reference": "c85d997af06a58ba83e2d2538e335b894c24523d",
+                "reference": "7f4f5a8122f7530d688cc9edf2f8c9261552fa2d",
                 "shasum": ""
             },
             "require": {
@@ -423,7 +495,7 @@
             "description": "Provides a way to profile code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/stopwatch/tree/v4.4.27"
+                "source": "https://github.com/symfony/stopwatch/tree/v4.4.38"
             },
             "funding": [
                 {
@@ -439,22 +511,22 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-10T08:41:57+00:00"
+            "time": "2022-02-18T15:34:20+00:00"
         }
     ],
     "packages-dev": [
         {
             "name": "antecedent/patchwork",
-            "version": "2.1.15",
+            "version": "2.1.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/antecedent/patchwork.git",
-                "reference": "0430ceaac7f447f1778c199ec19d7e4362a6f961"
+                "reference": "25c1fa0cd9a6e6d0d13863d8df8f050b6733f16d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/antecedent/patchwork/zipball/0430ceaac7f447f1778c199ec19d7e4362a6f961",
+                "url": "https://api.github.com/repos/antecedent/patchwork/zipball/25c1fa0cd9a6e6d0d13863d8df8f050b6733f16d",
-                "reference": "0430ceaac7f447f1778c199ec19d7e4362a6f961",
+                "reference": "25c1fa0cd9a6e6d0d13863d8df8f050b6733f16d",
                 "shasum": ""
             },
             "require": {
@@ -487,33 +559,33 @@
             ],
             "support": {
                 "issues": "https://github.com/antecedent/patchwork/issues",
-                "source": "https://github.com/antecedent/patchwork/tree/2.1.15"
+                "source": "https://github.com/antecedent/patchwork/tree/2.1.21"
             },
-            "time": "2021-08-22T08:00:13+00:00"
+            "time": "2022-02-07T07:28:34+00:00"
         },
         {
             "name": "brain/monkey",
-            "version": "2.6.0",
+            "version": "2.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Brain-WP/BrainMonkey.git",
-                "reference": "7042140000b4b18034c0c0010d86274a00f25442"
+                "reference": "a31c84515bb0d49be9310f52ef1733980ea8ffbb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Brain-WP/BrainMonkey/zipball/7042140000b4b18034c0c0010d86274a00f25442",
+                "url": "https://api.github.com/repos/Brain-WP/BrainMonkey/zipball/a31c84515bb0d49be9310f52ef1733980ea8ffbb",
-                "reference": "7042140000b4b18034c0c0010d86274a00f25442",
+                "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.6 || ^0.7",
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
                 "phpcompatibility/php-compatibility": "^9.3.0",
-                "phpunit/phpunit": "^5.7.9 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
+                "phpunit/phpunit": "^5.7.26 || ^6.0 || ^7.0 || >=8.0 <8.5.12 || ^8.5.14 || ^9.0"
             },
             "type": "library",
             "extra": {
@@ -523,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": [
@@ -559,7 +631,7 @@
                 "issues": "https://github.com/Brain-WP/BrainMonkey/issues",
                 "source": "https://github.com/Brain-WP/BrainMonkey"
             },
-            "time": "2020-10-13T17:56:14+00:00"
+            "time": "2021-11-11T15:53:55+00:00"
         },
         {
             "name": "hamcrest/hamcrest-php",
@@ -614,33 +686,30 @@
         },
         {
             "name": "mockery/mockery",
-            "version": "1.4.4",
+            "version": "1.3.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mockery/mockery.git",
-                "reference": "e01123a0e847d52d186c5eb4b9bf58b0c6d00346"
+                "reference": "472fa8ca4e55483d55ee1e73c963718c4393791d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mockery/mockery/zipball/e01123a0e847d52d186c5eb4b9bf58b0c6d00346",
+                "url": "https://api.github.com/repos/mockery/mockery/zipball/472fa8ca4e55483d55ee1e73c963718c4393791d",
-                "reference": "e01123a0e847d52d186c5eb4b9bf58b0c6d00346",
+                "reference": "472fa8ca4e55483d55ee1e73c963718c4393791d",
                 "shasum": ""
             },
             "require": {
                 "hamcrest/hamcrest-php": "^2.0.1",
                 "lib-pcre": ">=7.0",
-                "php": "^7.3 || ^8.0"
+                "php": ">=5.6.0"
-            },
-            "conflict": {
-                "phpunit/phpunit": "<8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5 || ^9.3"
+                "phpunit/phpunit": "^5.7.10|^6.5|^7.5|^8.5|^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4.x-dev"
+                    "dev-master": "1.3.x-dev"
                 }
             },
             "autoload": {
@@ -680,9 +749,9 @@
             ],
             "support": {
                 "issues": "https://github.com/mockery/mockery/issues",
-                "source": "https://github.com/mockery/mockery/tree/1.4.4"
+                "source": "https://github.com/mockery/mockery/tree/1.3.5"
             },
-            "time": "2021-09-13T15:28:59+00:00"
+            "time": "2021-09-13T15:33:03+00:00"
         },
         {
             "name": "pds/skeleton",
@@ -781,8 +850,11 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "^7.1.3 || ^8"
+        "php": "^7.2.5 || ^8"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.1.0"
+    "platform-overrides": {
+        "php": "7.2.5"
+    },
+    "plugin-api-version": "2.3.0"
 }

laps.php

@@ -5,7 +5,7 @@ Plugin Name: Laps
 Plugin URI: https://github.com/Rarst/laps
 Description: Light WordPress profiler.
 Author: Andrey “Rarst” Savchenko
-Version: 3.3.5
+Version: 3.3.7
 Author URI: https://www.rarst.net/
 Requires PHP: 7.1.3
 Update URI: false

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/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;
 	}
 
 	/**