updated packages

This commit is contained in:
2019-05-18 09:06:43 +00:00
parent 901d16349e
commit e9487fa58a
2025 changed files with 30366 additions and 49653 deletions

View File

@@ -1,4 +1,4 @@
<?php
<?php declare(strict_types=1);
$header = <<<'EOF'
This file is part of phpunit/php-timer.
@@ -12,27 +12,46 @@ return PhpCsFixer\Config::create()
->setRiskyAllowed(true)
->setRules(
[
'align_multiline_comment' => true,
'array_indentation' => true,
'array_syntax' => ['syntax' => 'short'],
'binary_operator_spaces' => [
'align_double_arrow' => true,
'align_equals' => true
'operators' => [
'=' => 'align',
'=>' => 'align',
],
],
'blank_line_after_namespace' => true,
'blank_line_before_statement' => [
'statements' => [
'break',
'continue',
'declare',
'do',
'for',
'foreach',
'if',
'include',
'include_once',
'require',
'require_once',
'return',
'switch',
'throw',
'try',
'while',
'yield',
],
],
'braces' => true,
'cast_spaces' => true,
'class_attributes_separation' => ['elements' => ['method']],
'class_attributes_separation' => ['elements' => ['const', 'method', 'property']],
'combine_consecutive_issets' => true,
'combine_consecutive_unsets' => true,
'compact_nullable_typehint' => true,
'concat_space' => ['spacing' => 'one'],
'declare_equal_normalize' => ['space' => 'none'],
'declare_strict_types' => true,
'dir_constant' => true,
'elseif' => true,
'encoding' => true,
@@ -40,35 +59,47 @@ return PhpCsFixer\Config::create()
'function_declaration' => true,
'header_comment' => ['header' => $header, 'separate' => 'none'],
'indentation_type' => true,
'is_null' => true,
'line_ending' => true,
'list_syntax' => ['syntax' => 'short'],
'logical_operators' => true,
'lowercase_cast' => true,
'lowercase_constants' => true,
'lowercase_keywords' => true,
'lowercase_static_reference' => true,
'magic_constant_casing' => true,
'method_argument_space' => ['ensure_fully_multiline' => true],
'modernize_types_casting' => true,
'multiline_comment_opening_closing' => true,
'multiline_whitespace_before_semicolons' => true,
'native_constant_invocation' => true,
'native_function_casing' => true,
'native_function_invocation' => true,
'new_with_braces' => false,
'no_alias_functions' => true,
'no_alternative_syntax' => true,
'no_blank_lines_after_class_opening' => true,
'no_blank_lines_after_phpdoc' => true,
'no_blank_lines_before_namespace' => true,
'no_closing_tag' => true,
'no_empty_comment' => true,
'no_empty_phpdoc' => true,
'no_empty_statement' => true,
'no_extra_consecutive_blank_lines' => true,
'no_extra_blank_lines' => true,
'no_homoglyph_names' => true,
'no_leading_import_slash' => true,
'no_leading_namespace_whitespace' => true,
'no_mixed_echo_print' => ['use' => 'print'],
'no_multiline_whitespace_around_double_arrow' => true,
'no_null_property_initialization' => true,
'no_php4_constructor' => true,
'no_short_bool_cast' => true,
'no_short_echo_tag' => true,
'no_singleline_whitespace_before_semicolons' => true,
'no_spaces_after_function_name' => true,
'no_spaces_inside_parenthesis' => true,
'no_superfluous_elseif' => true,
'no_superfluous_phpdoc_tags' => true,
'no_trailing_comma_in_list_call' => true,
'no_trailing_comma_in_singleline_array' => true,
'no_trailing_whitespace' => true,
@@ -77,8 +108,10 @@ return PhpCsFixer\Config::create()
'no_unneeded_curly_braces' => true,
'no_unneeded_final_method' => true,
'no_unreachable_default_argument_value' => true,
'no_unset_on_property' => true,
'no_unused_imports' => true,
'no_useless_else' => true,
'no_useless_return' => true,
'no_whitespace_before_comma_in_array' => true,
'no_whitespace_in_blank_line' => true,
'non_printable_character' => true,
@@ -90,9 +123,13 @@ return PhpCsFixer\Config::create()
'constant_public',
'constant_protected',
'constant_private',
'property_public_static',
'property_protected_static',
'property_private_static',
'property_public',
'property_protected',
'property_private',
'method_public_static',
'construct',
'destruct',
'magic',
@@ -100,6 +137,8 @@ return PhpCsFixer\Config::create()
'method_public',
'method_protected',
'method_private',
'method_protected_static',
'method_private_static',
],
],
'ordered_imports' => true,
@@ -117,13 +156,17 @@ return PhpCsFixer\Config::create()
'phpdoc_single_line_var_spacing' => true,
'phpdoc_to_comment' => true,
'phpdoc_trim' => true,
'phpdoc_types' => true,
'phpdoc_trim_consecutive_blank_line_separation' => true,
'phpdoc_types' => ['groups' => ['simple', 'meta']],
'phpdoc_types_order' => true,
'phpdoc_var_without_name' => true,
'pow_to_exponentiation' => true,
'protected_to_private' => true,
'return_assignment' => true,
'return_type_declaration' => ['space_before' => 'none'],
'self_accessor' => true,
'semicolon_after_instruction' => true,
'set_type_to_cast' => true,
'short_scalar_cast' => true,
'simplified_null_return' => true,
'single_blank_line_at_eof' => true,
@@ -132,9 +175,16 @@ return PhpCsFixer\Config::create()
'single_quote' => true,
'standardize_not_equals' => true,
'ternary_to_null_coalescing' => true,
'trailing_comma_in_multiline_array' => true,
'trim_array_spaces' => true,
'unary_operator_spaces' => true,
'visibility_required' => true,
'visibility_required' => [
'elements' => [
'const',
'method',
'property',
],
],
'void_return' => true,
'whitespace_after_comma_in_array' => true,
]
@@ -144,5 +194,4 @@ return PhpCsFixer\Config::create()
->files()
->in(__DIR__ . '/src')
->in(__DIR__ . '/tests')
->name('*.php')
);

View File

@@ -3,7 +3,8 @@ language: php
php:
- 7.1
- 7.2
- master
- 7.3
- 7.4snapshot
sudo: false

View File

@@ -2,6 +2,18 @@
All notable changes are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
## [2.1.1] - 2019-02-20
### Changed
* Improved formatting of memory consumption for `resourceUsage()`
## [2.1.0] - 2019-02-20
### Changed
* Improved formatting of memory consumption for `resourceUsage()`
## [2.0.0] - 2018-02-01
### Changed
@@ -12,4 +24,6 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt
* This component is no longer supported on PHP 5.3, PHP 5.4, PHP 5.5, PHP 5.6, and PHP 7.0
[2.1.1]: https://github.com/sebastianbergmann/diff/compare/2.1.0...2.1.1
[2.1.0]: https://github.com/sebastianbergmann/diff/compare/2.0.0...2.1.0
[2.0.0]: https://github.com/sebastianbergmann/diff/compare/1.0.9...2.0.0

View File

@@ -1,6 +1,6 @@
phpunit/php-timer
Copyright (c) 2010-2018, Sebastian Bergmann <sebastian@phpunit.de>.
Copyright (c) 2010-2019, Sebastian Bergmann <sebastian@phpunit.de>.
All rights reserved.
Redistribution and use in source and binary forms, with or without

View File

@@ -35,7 +35,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.0-dev"
"dev-master": "2.1-dev"
}
}
}

View File

@@ -7,7 +7,6 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace SebastianBergmann\Timer;
interface Exception

View File

@@ -7,7 +7,6 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace SebastianBergmann\Timer;
final class RuntimeException extends \RuntimeException implements Exception

View File

@@ -1,4 +1,4 @@
<?php
<?php declare(strict_types=1);
/*
* This file is part of phpunit/php-timer.
*
@@ -7,22 +7,30 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace SebastianBergmann\Timer;
final class Timer
{
/**
* @var array
* @var int[]
*/
private static $sizes = [
'GB' => 1073741824,
'MB' => 1048576,
'KB' => 1024,
];
/**
* @var int[]
*/
private static $times = [
'hour' => 3600000,
'minute' => 60000,
'second' => 1000
'second' => 1000,
];
/**
* @var array
* @var float[]
*/
private static $startTimes = [];
@@ -36,6 +44,19 @@ final class Timer
return \microtime(true) - \array_pop(self::$startTimes);
}
public static function bytesToString(int $bytes): string
{
foreach (self::$sizes as $unit => $value) {
if ($bytes >= $value) {
$size = \sprintf('%.2f', $bytes >= 1024 ? $bytes / $value : $bytes);
return $size . ' ' . $unit;
}
}
return $bytes . ' byte' . ($bytes !== 1 ? 's' : '');
}
public static function secondsToTimeString(float $time): string
{
$ms = \round($time * 1000);
@@ -73,9 +94,9 @@ final class Timer
public static function resourceUsage(): string
{
return \sprintf(
'Time: %s, Memory: %4.2fMB',
'Time: %s, Memory: %s',
self::timeSinceStartOfRequest(),
\memory_get_peak_usage(true) / 1048576
self::bytesToString(\memory_get_peak_usage(true))
);
}
}

View File

@@ -1,4 +1,4 @@
<?php
<?php declare(strict_types=1);
/*
* This file is part of phpunit/php-timer.
*
@@ -7,7 +7,6 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace SebastianBergmann\Timer;
use PHPUnit\Framework\TestCase;
@@ -15,48 +14,34 @@ use PHPUnit\Framework\TestCase;
/**
* @covers \SebastianBergmann\Timer\Timer
*/
class TimerTest extends TestCase
final class TimerTest extends TestCase
{
public function testStartStop(): void
public function testCanBeStartedAndStopped(): void
{
$this->assertInternalType('float', Timer::stop());
$this->assertIsFloat(Timer::stop());
}
public function testCanFormatTimeSinceStartOfRequest(): void
{
$this->assertStringMatchesFormat('%f %s', Timer::timeSinceStartOfRequest());
}
/**
* @dataProvider secondsProvider
* @backupGlobals enabled
*/
public function testSecondsToTimeString(string $string, string $seconds): void
{
$this->assertEquals(
$string,
Timer::secondsToTimeString($seconds)
);
}
public function testTimeSinceStartOfRequest(): void
{
$this->assertStringMatchesFormat(
'%f %s',
Timer::timeSinceStartOfRequest()
);
}
public function testTimeSinceStartOfRequest2(): void
public function testCanFormatSinceStartOfRequestWhenRequestTimeIsNotAvailableAsFloat(): void
{
if (isset($_SERVER['REQUEST_TIME_FLOAT'])) {
unset($_SERVER['REQUEST_TIME_FLOAT']);
}
$this->assertStringMatchesFormat(
'%f %s',
Timer::timeSinceStartOfRequest()
);
$this->assertStringMatchesFormat('%f %s', Timer::timeSinceStartOfRequest());
}
/**
* @backupGlobals enabled
* @backupGlobals enabled
*/
public function testTimeSinceStartOfRequest3(): void
public function testCannotFormatTimeSinceStartOfRequestWhenRequestTimeIsNotAvailable(): void
{
if (isset($_SERVER['REQUEST_TIME_FLOAT'])) {
unset($_SERVER['REQUEST_TIME_FLOAT']);
@@ -71,15 +56,20 @@ class TimerTest extends TestCase
Timer::timeSinceStartOfRequest();
}
public function testResourceUsage(): void
public function testCanFormatResourceUsage(): void
{
$this->assertStringMatchesFormat(
'Time: %s, Memory: %fMB',
Timer::resourceUsage()
);
$this->assertStringMatchesFormat('Time: %s, Memory: %f %s', Timer::resourceUsage());
}
public function secondsProvider()
/**
* @dataProvider secondsProvider
*/
public function testCanFormatSecondsAsString(string $string, float $seconds): void
{
$this->assertEquals($string, Timer::secondsToTimeString($seconds));
}
public function secondsProvider(): array
{
return [
['0 ms', 0],
@@ -118,4 +108,27 @@ class TimerTest extends TestCase
['2 hours', 7199.9999],
];
}
/**
* @dataProvider bytesProvider
*/
public function testCanFormatBytesAsString(string $string, int $bytes): void
{
$this->assertEquals($string, Timer::bytesToString($bytes));
}
public function bytesProvider(): array
{
return [
['0 bytes', 0],
['1 byte', 1],
['1023 bytes', 1023],
['1.00 KB', 1024],
['1.50 KB', 1.5 * 1024],
['2.00 MB', 2 * 1048576],
['2.50 MB', 2.5 * 1048576],
['3.00 GB', 3 * 1073741824],
['3.50 GB', 3.5 * 1073741824],
];
}
}