update for version 1.0.2

This commit is contained in:
sujitprasad
2015-11-30 16:38:59 +05:30
parent d0a69a8df1
commit 7e17edab1e
425 changed files with 14241 additions and 3410 deletions

View File

@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
return ComposerAutoloaderInita3e1eb8c5f5824486bb891f89ddf311a::getLoader();
return ComposerAutoloaderInitbe2f9f1bc8232b95340714a19f4a3f05::getLoader();

View File

@@ -22,15 +22,21 @@ return array(
'Cellmap' => $vendorDir . '/dompdf/dompdf/include/cellmap.cls.php',
'CreateAccessTable' => $baseDir . '/database/migrations/2015_05_07_053704_create_access_table.php',
'CreateAlertNoticeTable' => $baseDir . '/database/migrations/2015_05_07_053318_create_alert_notice_table.php',
'CreateArticleRelationshipsTable' => $baseDir . '/database/migrations/2015_05_05_062244_create_article_relationships_table.php',
'CreateArticlesTable' => $baseDir . '/database/migrations/2015_05_01_114710_create_articles_table.php',
'CreateAutoResponseTable' => $baseDir . '/database/migrations/2015_05_07_052924_create_auto_response_table.php',
'CreateBanlistTable' => $baseDir . '/database/migrations/2015_05_07_052638_create_banlist_table.php',
'CreateCannedResponseTable' => $baseDir . '/database/migrations/2015_10_09_105525_create_canned_response_table.php',
'CreateCategoriesTable' => $baseDir . '/database/migrations/2015_05_01_100249_create_categories_table.php',
'CreateCommentsTable' => $baseDir . '/database/migrations/2015_05_07_102116_create_comments_table.php',
'CreateCompanyTable' => $baseDir . '/database/migrations/2015_05_07_045611_create_company_table.php',
'CreateContactsTable' => $baseDir . '/database/migrations/2015_05_06_060231_create_contacts_table.php',
'CreateDateFormatTable' => $baseDir . '/database/migrations/2015_05_07_045158_create_date_format_table.php',
'CreateDateTimeFormatTable' => $baseDir . '/database/migrations/2015_05_07_044521_create_date_time_format_table.php',
'CreateDepartmentTable' => $baseDir . '/database/migrations/2015_05_07_044229_create_department_table.php',
'CreateEmailTable' => $baseDir . '/database/migrations/2015_05_07_043904_create_email_table.php',
'CreateEmailsTable' => $baseDir . '/database/migrations/2015_05_07_043529_create_emails_table.php',
'CreateFaqsTable' => $baseDir . '/database/migrations/2015_05_05_112525_create_faqs_table.php',
'CreateFieldsTable' => $baseDir . '/database/migrations/2000_08_23_110830_create_fields_table.php',
'CreateFooter2sTable' => $baseDir . '/database/migrations/2015_05_06_082026_create_footer2s_table.php',
'CreateFooter3sTable' => $baseDir . '/database/migrations/2015_05_06_092125_create_footer3s_table.php',
@@ -47,11 +53,16 @@ return array(
'CreateLanguagesTable' => $baseDir . '/database/migrations/2015_05_06_131238_create_languages_table.php',
'CreateLogTable' => $baseDir . '/database/migrations/2015_05_06_130627_create_log_table.php',
'CreateMailboxProtocolTable' => $baseDir . '/database/migrations/2015_05_06_125817_create_mailbox_protocol_table.php',
'CreateOptionsTable' => $baseDir . '/database/migrations/2015_05_15_080512_create_options_table.php',
'CreateOrganizationTable' => $baseDir . '/database/migrations/2015_05_06_125328_create_organization_table.php',
'CreatePagesTable' => $baseDir . '/database/migrations/2015_05_14_072226_create_pages_table.php',
'CreatePasswordResetsTable' => $baseDir . '/database/migrations/2014_10_12_100000_create_password_resets_table.php',
'CreatePriorityTable' => $baseDir . '/database/migrations/2015_06_09_062121_create_priority_table.php',
'CreateSettingsTable' => $baseDir . '/database/migrations/2015_05_04_113843_create_settings_table.php',
'CreateSideTable' => $baseDir . '/database/migrations/2015_11_02_063848_create_side_table.php',
'CreateSlaTable' => $baseDir . '/database/migrations/2015_05_06_123928_create_sla_table.php',
'CreateSmtpTable' => $baseDir . '/database/migrations/2015_08_10_114142_create_smtp_table.php',
'CreateSocialsTable' => $baseDir . '/database/migrations/2015_05_15_080512_create_socials_table.php',
'CreateSystemTable' => $baseDir . '/database/migrations/2015_05_06_123624_create_system_table.php',
'CreateTeamAssignAgentTable' => $baseDir . '/database/migrations/2015_05_06_122830_create_team_assign_agent_table.php',
'CreateTeamTable' => $baseDir . '/database/migrations/2015_05_06_123154_create_team_table.php',
@@ -570,6 +581,7 @@ return array(
'SebastianBergmann\\Environment\\Runtime' => $vendorDir . '/sebastian/environment/src/Runtime.php',
'SebastianBergmann\\Exporter\\Exporter' => $vendorDir . '/sebastian/exporter/src/Exporter.php',
'SebastianBergmann\\GlobalState\\Blacklist' => $vendorDir . '/sebastian/global-state/src/Blacklist.php',
'SebastianBergmann\\GlobalState\\CodeExporter' => $vendorDir . '/sebastian/global-state/src/CodeExporter.php',
'SebastianBergmann\\GlobalState\\Exception' => $vendorDir . '/sebastian/global-state/src/Exception.php',
'SebastianBergmann\\GlobalState\\Restorer' => $vendorDir . '/sebastian/global-state/src/Restorer.php',
'SebastianBergmann\\GlobalState\\RuntimeException' => $vendorDir . '/sebastian/global-state/src/RuntimeException.php',

View File

@@ -10,7 +10,6 @@ return array(
'phpDocumentor' => array($vendorDir . '/phpdocumentor/reflection-docblock/src'),
'libphonenumber' => array($vendorDir . '/giggsey/libphonenumber-for-php/src'),
'Whoops' => array($vendorDir . '/filp/whoops/src'),
'Thomaswelton\\LaravelGravatar' => array($vendorDir . '/thomaswelton/laravel-gravatar/src'),
'Symfony\\Component\\VarDumper\\' => array($vendorDir . '/symfony/var-dumper'),
'Symfony\\Component\\Translation\\' => array($vendorDir . '/symfony/translation'),
'Symfony\\Component\\Security\\Core\\' => array($vendorDir . '/symfony/security-core'),
@@ -33,6 +32,7 @@ return array(
'Doctrine\\Common\\Inflector\\' => array($vendorDir . '/doctrine/inflector/lib'),
'Diff' => array($vendorDir . '/phpspec/php-diff/lib'),
'Cron' => array($vendorDir . '/mtdowling/cron-expression/src'),
'Chumper\\Datatable' => array($vendorDir . '/chumper/datatable/src'),
'Carbon' => array($vendorDir . '/nesbot/carbon/src'),
'Bugsnag_' => array($vendorDir . '/bugsnag/bugsnag/src'),
'Bugsnag\\BugsnagLaravel\\' => array($vendorDir . '/bugsnag/bugsnag-laravel/src'),

View File

@@ -8,6 +8,8 @@ $baseDir = dirname($vendorDir);
return array(
'XdgBaseDir\\' => array($vendorDir . '/dnoegel/php-xdg-base-dir/src'),
'Vsmoraes\\Pdf\\' => array($vendorDir . '/vsmoraes/laravel-pdf/src'),
'Thomaswelton\\Tests\\LaravelGravatar\\' => array($vendorDir . '/thomaswelton/laravel-gravatar/tests'),
'Thomaswelton\\LaravelGravatar\\' => array($vendorDir . '/thomaswelton/laravel-gravatar/src'),
'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
'Symfony\\Component\\Filesystem\\' => array($vendorDir . '/symfony/filesystem'),
'Symfony\\Component\\EventDispatcher\\' => array($vendorDir . '/symfony/event-dispatcher'),

View File

@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInita3e1eb8c5f5824486bb891f89ddf311a
class ComposerAutoloaderInitbe2f9f1bc8232b95340714a19f4a3f05
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInita3e1eb8c5f5824486bb891f89ddf311a
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInita3e1eb8c5f5824486bb891f89ddf311a', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitbe2f9f1bc8232b95340714a19f4a3f05', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInita3e1eb8c5f5824486bb891f89ddf311a', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitbe2f9f1bc8232b95340714a19f4a3f05', 'loadClassLoader'));
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -42,14 +42,14 @@ class ComposerAutoloaderInita3e1eb8c5f5824486bb891f89ddf311a
$includeFiles = require __DIR__ . '/autoload_files.php';
foreach ($includeFiles as $file) {
composerRequirea3e1eb8c5f5824486bb891f89ddf311a($file);
composerRequirebe2f9f1bc8232b95340714a19f4a3f05($file);
}
return $loader;
}
}
function composerRequirea3e1eb8c5f5824486bb891f89ddf311a($file)
function composerRequirebe2f9f1bc8232b95340714a19f4a3f05($file)
{
require $file;
}

File diff suppressed because it is too large Load Diff

View File

@@ -2,4 +2,4 @@
# It can be a commit, branch or tag of the https://github.com/googlei18n/libphonenumber project
#
# For more information, look at the phing tasks in build.xml
libphonenumber-7.0.11
libphonenumber-7.1.0

View File

@@ -5,6 +5,9 @@
*/
return array (
67850 => 'Digicel',
67851 => 'Digicel',
67852 => 'Digicel',
67853 => 'Digicel',
67854 => 'Digicel',
67855 => 'Digicel',
@@ -15,6 +18,7 @@ return array (
678575 => 'Digicel',
678576 => 'Digicel',
678577 => 'Digicel',
67858 => 'Digicel',
67859 => 'Digicel',
67870 => 'SMILE',
67871 => 'SMILE',

View File

@@ -7,7 +7,7 @@
return array (
88011 => 'Citycell',
88015 => 'TeleTalk',
88016 => 'Beeong3G',
88016 => 'Airtel',
88017 => 'Grameenphone',
88018 => 'Robi',
88019 => 'Banglalink',

View File

@@ -18,4 +18,5 @@ return array (
98937 => 'Irancell',
98938 => 'Irancell',
98939 => 'Irancell',
98990 => 'IR-MCI',
);

View File

@@ -32,19 +32,21 @@ return array (
'mobile' =>
array (
'NationalNumberPattern' => '
1[1-9](?:
(?:
1[1-9]|
2[12478]|
[89][1-9]
)(?:
7|
9\\d
)\\d{7}|
(?:
2[12478]|
[89][1-9]
3[1-578]|
7[13-579]
)9?[6-9]\\d{7}|
(?:
3[1-578]|
[46][1-9]|
5[1-5]|
7[13-579]
5[1-5]
)[6-9]\\d{7}
',
'PossibleNumberPattern' => '\\d{10,11}',
@@ -180,7 +182,9 @@ return array (
0 => '
(?:
[189][1-9]|
2[12478]
2[12478]|
3[1-578]|
7[13-579]
)9
',
),
@@ -232,7 +236,9 @@ return array (
0 => '
(?:
[189][1-9]|
2[12478]
2[12478]|
3[1-578]|
7[13-579]
)9
',
),

View File

@@ -27,7 +27,7 @@ return array (
461|
502|
6(?:
0[12]|
0[1-3]|
12|
7[67]|
8[78]|

View File

@@ -15,7 +15,7 @@ return array (
array (
'NationalNumberPattern' => '
2(?:
[24]\\d|
[248]\\d|
5[1-5]|
94
)\\d{5}

View File

@@ -38,8 +38,10 @@ return array (
array (
'NationalNumberPattern' => '
9(?:
0[12]|
[1-3]\\d
0[1-3]|
[13]\\d|
2[0-2]|
90
)\\d{7}
',
'PossibleNumberPattern' => '\\d{10}',

View File

@@ -39,26 +39,30 @@ return array (
'NationalNumberPattern' => '
(?:
5(?:
[05]\\d|
1[0-7]
[05]\\d{2}|
1[0-7]\\d|
2(?:
22|
55
)
)|
6(?:
0[034679]|
5[015-9]|
6\\d|
7[067]|
9[0369]
0[034679]\\d|
5[015-9]\\d|
6\\d{2}|
7[067]\\d|
9[0369]\\d
)|
9(?:
0[09]|
22|
4[01479]|
55|
6[0679]|
[79]\\d|
8[057-9]
0[09]\\d|
22\\d|
4[01479]\\d|
55\\d|
6[0679]\\d|
[79]\\d{2}|
8[057-9]\\d
)
)\\d{5}
)\\d{4}
',
'PossibleNumberPattern' => '\\d{8}',
'ExampleNumber' => '50012345',
@@ -142,7 +146,8 @@ return array (
array (
0 => '
[126]|
9[04-9]
9[04-9]|
52[25]
',
),
'nationalPrefixFormattingRule' => '',

View File

@@ -26,7 +26,7 @@ return array (
6\\d{8}|
4(?:
4\\d|
5[2-9]
5[1-9]
)\\d{5}
',
'PossibleNumberPattern' => '\\d{8,9}',

View File

@@ -16,16 +16,16 @@ return array (
'NationalNumberPattern' => '
(?:
1(?:
0[02-579]|
19|
0[0-8]|
1[49]|
2[37]|
3[03]|
4[479]|
57|
65|
7[016-8]|
3[0137]|
4[147]|
5[05]|
6[58]|
7[0167]|
8[58]|
9[1349]
9[139]
)|
2(?:
[0235679]\\d|
@@ -35,19 +35,19 @@ return array (
)|
3(?:
[09]\\d|
1[14-7]|
1[014-7]|
2[0-3]|
3[03]|
4[0457]|
5[56]|
4[03-57]|
55|
6[068]|
7[06-8]|
8[089]
8[06-9]
)|
4(?:
3[013-69]|
4\\d|
7[0-689]
7[0-589]
)|
5(?:
[01]\\d|
@@ -59,18 +59,19 @@ return array (
0[09]|
2[0-267]|
3[06]|
[49]0|
[469]0|
5[06-9]|
7[0-24-7]|
8[89]
7[0-24-79]|
8[7-9]
)|
8(?:
09|
[34]\\d|
5[0-4]|
5[0134]|
8[02]
)|
9(?:
0[6-8]|
0[6-9]|
1[016-8]|
2[036-8]|
3[3679]|
@@ -118,15 +119,12 @@ return array (
(?:
779|
8(?:
2[235]|
55|
60|
7[578]|
86|
95
7[78]
)|
9(?:
0[0-2]|
00|
81
)
)\\d{4}

View File

@@ -33,7 +33,7 @@ return array (
(?:
5(?:
7[2-5]|
[3-69]\\d
[0-689]\\d
)|
7[013-7]\\d
)\\d{4}

View File

@@ -271,6 +271,10 @@ class Util
*/
protected static function emulateObjectDirectories(array $object, array $directories, array $listedDirectories)
{
if ($object['type'] === 'dir') {
$listedDirectories[] = $object['path'];
}
if (empty($object['dirname'])) {
return [$directories, $listedDirectories];
}

View File

@@ -1,3 +1,10 @@
### 1.17.2 (2015-10-14)
* Fixed ErrorHandler compatibility with non-Monolog PSR-3 loggers
* Fixed SlackHandler handling to use slack functionalities better
* Fixed SwiftMailerHandler bug when sending multiple emails they all had the same id
* Fixed 5.3 compatibility regression
### 1.17.1 (2015-08-31)
* Fixed RollbarHandler triggering PHP notices

View File

@@ -19,14 +19,15 @@
"require-dev": {
"phpunit/phpunit": "~4.5",
"graylog2/gelf-php": "~1.0",
"raven/raven": "~0.11",
"raven/raven": "^0.13",
"ruflin/elastica": ">=0.90 <3.0",
"doctrine/couchdb": "~1.0@dev",
"aws/aws-sdk-php": "^2.4.9",
"videlalvaro/php-amqplib": "~2.4",
"swiftmailer/swiftmailer": "~5.3",
"php-console/php-console": "^3.1.3",
"phpunit/phpunit-mock-objects": "2.3.0"
"phpunit/phpunit-mock-objects": "2.3.0",
"jakub-onderka/php-parallel-lint": "0.9"
},
"_": "phpunit/phpunit-mock-objects required in 2.3.0 due to https://github.com/sebastianbergmann/phpunit-mock-objects/issues/223 - needs hhvm 3.8+ on travis",
"suggest": {
@@ -56,6 +57,9 @@
}
},
"scripts": {
"test": "phpunit"
"test": [
"parallel-lint . --exclude vendor",
"phpunit"
]
}
}

View File

@@ -174,9 +174,11 @@ class ErrorHandler
array('code' => $lastError['type'], 'message' => $lastError['message'], 'file' => $lastError['file'], 'line' => $lastError['line'])
);
foreach ($this->logger->getHandlers() as $handler) {
if ($handler instanceof AbstractHandler) {
$handler->close();
if ($this->logger instanceof Logger) {
foreach ($this->logger->getHandlers() as $handler) {
if ($handler instanceof AbstractHandler) {
$handler->close();
}
}
}
}

View File

@@ -33,13 +33,11 @@ class Util
{
while ($retries--) {
if (curl_exec($ch) === false) {
$curlErrno = curl_errno($ch);
if (false === in_array($curlErrno, self::$retriableErrorCodes, true) || !$retries) {
$curlError = curl_error($ch);
if ($closeAfterDone) {
curl_close($ch);
}

View File

@@ -20,8 +20,8 @@ use Monolog\Logger;
*/
class MandrillHandler extends MailHandler
{
protected $client;
protected $message;
protected $apiKey;
/**
* @param string $apiKey A valid Mandrill API key

View File

@@ -58,7 +58,7 @@ class RollbarHandler extends AbstractProcessingHandler
$exception = $context['exception'];
unset($context['exception']);
$payload = [];
$payload = array();
if (isset($context['payload'])) {
$payload = $context['payload'];
unset($context['payload']);

View File

@@ -145,29 +145,20 @@ class SlackHandler extends SocketHandler
if ($this->useAttachment) {
$attachment = array(
'fallback' => $record['message'],
'color' => $this->getAttachmentColor($record['level'])
'color' => $this->getAttachmentColor($record['level']),
'fields' => array()
);
if ($this->useShortAttachment) {
$attachment['fields'] = array(
array(
'title' => $record['level_name'],
'value' => $record['message'],
'short' => false
)
);
$attachment['title'] = $record['level_name'];
$attachment['text'] = $record['message'];
} else {
$attachment['fields'] = array(
array(
'title' => 'Message',
'value' => $record['message'],
'short' => false
),
array(
'title' => 'Level',
'value' => $record['level_name'],
'short' => true
)
$attachment['title'] = 'Message';
$attachment['text'] = $record['message'];
$attachment['fields'][] = array(
'title' => 'Level',
'value' => $record['level_name'],
'short' => true
);
}

View File

@@ -57,6 +57,7 @@ class SwiftMailerHandler extends MailHandler
$message = null;
if ($this->messageTemplate instanceof \Swift_Message) {
$message = clone $this->messageTemplate;
$message->generateId();
} elseif (is_callable($this->messageTemplate)) {
$message = call_user_func($this->messageTemplate, $content, $records);
}

View File

@@ -15,6 +15,10 @@ class UdpSocket
{
const DATAGRAM_MAX_LENGTH = 65023;
protected $ip;
protected $port;
protected $socket;
public function __construct($ip, $port = 514)
{
$this->ip = $ip;

View File

@@ -21,6 +21,8 @@ use Monolog\Handler\SyslogUdp\UdpSocket;
*/
class SyslogUdpHandler extends AbstractSyslogHandler
{
protected $socket;
/**
* @param string $host
* @param int $port

View File

@@ -91,7 +91,7 @@ class IntrospectionProcessor
return $record;
}
private function isTraceClassOrSkippedFunction (array $trace, $index)
private function isTraceClassOrSkippedFunction(array $trace, $index)
{
if (!isset($trace[$index])) {
return false;

View File

@@ -3,6 +3,8 @@ namespace Monolog\Formatter;
class ScalarFormatterTest extends \PHPUnit_Framework_TestCase
{
private $formatter;
public function setUp()
{
$this->formatter = new ScalarFormatter();

View File

@@ -15,6 +15,8 @@ use Monolog\TestCase;
class DynamoDbHandlerTest extends TestCase
{
private $client;
public function setUp()
{
if (!class_exists('Aws\DynamoDb\DynamoDbClient')) {

View File

@@ -233,12 +233,12 @@ class HipChatHandlerTest extends TestCase
*/
public function testCreateWithTooLongName()
{
$hipChatHandler = new \Monolog\Handler\HipChatHandler('token', 'room', 'SixteenCharsHere');
$hipChatHandler = new HipChatHandler('token', 'room', 'SixteenCharsHere');
}
public function testCreateWithTooLongNameV2()
{
// creating a handler with too long of a name but using the v2 api doesn't matter.
$hipChatHandler = new \Monolog\Handler\HipChatHandler('token', 'room', 'SixteenCharsHere', false, Logger::CRITICAL, true, true, 'test', 'api.hipchat.com', 'v2');
$hipChatHandler = new HipChatHandler('token', 'room', 'SixteenCharsHere', false, Logger::CRITICAL, true, true, 'test', 'api.hipchat.com', 'v2');
}
}

View File

@@ -117,7 +117,7 @@ class RavenHandlerTest extends TestCase
$ravenClient->user_context(array('id' => 'test_user_id'));
// handle context
$handler->handle($recordWithContext);
$this->assertEquals($user, $ravenClient->lastData['sentry.interfaces.User']);
$this->assertEquals($user, $ravenClient->lastData['user']);
// check to see if its reset
$handler->handle($recordWithNoContext);
@@ -127,7 +127,7 @@ class RavenHandlerTest extends TestCase
// handle with null context
$ravenClient->user_context(null);
$handler->handle($recordWithContext);
$this->assertEquals($user, $ravenClient->lastData['sentry.interfaces.User']);
$this->assertEquals($user, $ravenClient->lastData['user']);
// check to see if its reset
$handler->handle($recordWithNoContext);

View File

@@ -62,4 +62,18 @@ class SwiftMailerHandlerTest extends TestCase
);
$handler->handleBatch($records);
}
public function testMessageHaveUniqueId() {
$messageTemplate = \Swift_Message::newInstance();
$handler = new SwiftMailerHandler($this->mailer, $messageTemplate);
$method = new \ReflectionMethod('Monolog\Handler\SwiftMailerHandler', 'buildMessage');
$method->setAccessible(true);
$method->invokeArgs($handler, array($messageTemplate, array()));
$builtMessage1 = $method->invoke($handler, $messageTemplate, array());
$builtMessage2 = $method->invoke($handler, $messageTemplate, array());
$this->assertFalse($builtMessage1->getId() === $builtMessage2->getId(), 'Two different messages have the same id');
}
}

View File

@@ -130,7 +130,6 @@ class RegistryTest extends \PHPUnit_Framework_TestCase
$log1 = new Logger('test1');
$log2 = new Logger('test2');
Registry::addLogger($log1, 'log');
Registry::addLogger($log2, 'log', true);

View File

@@ -92,7 +92,7 @@ trait SearchableTrait
* @return array
*/
protected function getDatabaseDriver() {
$key = Config::get('database.default');
$key = $this->connection ?: Config::get('database.default');
return Config::get('database.connections.' . $key . '.driver');
}
@@ -137,9 +137,13 @@ trait SearchableTrait
*/
protected function makeJoins(Builder $query)
{
foreach ($this->getJoins() as $table => $keys)
{
$query->leftJoin($table, $keys[0], '=', $keys[1]);
foreach ($this->getJoins() as $table => $keys) {
$query->leftJoin($table, function ($join) use ($keys) {
$join->on($keys[0], '=', $keys[1]);
if (array_key_exists(2, $keys) && array_key_exists(3, $keys)) {
$join->where($keys[2], '=', $keys[3]);
}
});
}
}
@@ -287,7 +291,7 @@ trait SearchableTrait
* @param \Illuminate\Database\Eloquent\Builder $original
*/
protected function mergeQueries(Builder $clone, Builder $original) {
$original->from(DB::raw("({$clone->toSql()}) as `{$this->getTable()}`"));
$original->from(DB::connection($this->connection)->raw("({$clone->toSql()}) as `{$this->getTable()}`"));
$original->mergeBindings($clone->getQuery());
}
}

View File

@@ -2,6 +2,12 @@
All notable changes of the PHP_CodeCoverage 2.2 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
## [2.2.4] - 2015-10-06
### Fixed
* Fixed [#391](https://github.com/sebastianbergmann/php-code-coverage/pull/391): Missing `</abbr>` tag
## [2.2.3] - 2015-09-14
### Fixed
@@ -42,7 +48,8 @@ All notable changes of the PHP_CodeCoverage 2.2 release series are documented in
* The dedicated driver for HHVM, `PHP_CodeCoverage_Driver_HHVM` has been removed
[2.2.3]: https://github.com/sebastianbergmann/php-code-coverage/compare/2.2.3...2.2.3
[2.2.4]: https://github.com/sebastianbergmann/php-code-coverage/compare/2.2.3...2.2.4
[2.2.3]: https://github.com/sebastianbergmann/php-code-coverage/compare/2.2.2...2.2.3
[2.2.2]: https://github.com/sebastianbergmann/php-code-coverage/compare/2.2.1...2.2.2
[2.2.1]: https://github.com/sebastianbergmann/php-code-coverage/compare/2.2.0...2.2.1
[2.2.0]: https://github.com/sebastianbergmann/php-code-coverage/compare/2.1...2.2.0

View File

@@ -58,7 +58,7 @@ abstract class PHP_CodeCoverage_Report_HTML_Renderer
*/
public function __construct($templatePath, $generator, $date, $lowUpperBound, $highLowerBound)
{
$version = new SebastianBergmann\Version('2.2.3', dirname(dirname(dirname(dirname(__DIR__)))));
$version = new SebastianBergmann\Version('2.2.4', dirname(dirname(dirname(dirname(__DIR__)))));
$this->templatePath = $templatePath;
$this->generator = $generator;

View File

@@ -213,7 +213,7 @@ class PHP_CodeCoverage_Report_HTML_Renderer_Dashboard extends PHP_CodeCoverage_R
list($class, $method) = explode('::', $methodName);
$result['method'] .= sprintf(
' <tr><td><a href="%s"><abbr title="%s">%s</a></a></td><td class="text-right">%d%%</td></tr>' . "\n",
' <tr><td><a href="%s"><abbr title="%s">%s</abbr></a></td><td class="text-right">%d%%</td></tr>' . "\n",
str_replace($baseLink, '', $classes[$class]['methods'][$method]['link']),
$methodName,
$method,

View File

@@ -1110,7 +1110,7 @@ class PHPUnit_Framework_MockObject_Generator
$methods = array();
foreach ($class->getMethods() as $method) {
if ($method->isPublic() || $method->isAbstract()) {
if (($method->isPublic() || $method->isAbstract()) && !in_array($method->getName(), $methods)) {
$methods[] = $method->getName();
}
}

View File

@@ -183,4 +183,18 @@ class Framework_MockObject_GeneratorTest extends PHPUnit_Framework_TestCase
$mock = $this->generator->getMock('SingletonClass', array('doSomething'), array(), '', false);
}
/**
* ReflectionClass::getMethods for SoapClient on PHP 5.3 produces PHP Fatal Error
* @runInSeparateProcess
*/
public function testGetMockForSoapClientReflectionMethodsDuplication()
{
if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
$this->markTestSkipped('Only for PHP < 5.4.0');
}
$mock = $this->generator->getMock('SoapClient', array(), array(), '', false);
$this->assertInstanceOf('SoapClient', $mock);
}
}

View File

@@ -11,33 +11,58 @@ return Symfony\CS\Config\Config::create()
->level(\Symfony\CS\FixerInterface::NONE_LEVEL)
->fixers(
array(
'align_double_arrow',
'align_equals',
'braces',
'concat_with_spaces',
'duplicate_semicolon',
'elseif',
'empty_return',
'encoding',
'eof_ending',
'extra_empty_lines',
'function_call_space',
'function_declaration',
'indentation',
'join_function',
'line_after_namespace',
'linefeed',
'list_commas',
'long_array_syntax',
'lowercase_constants',
'lowercase_keywords',
'method_argument_space',
'multiple_use',
'namespace_no_leading_whitespace',
'no_blank_lines_after_class_opening',
'no_empty_lines_after_phpdocs',
'parenthesis',
'php_closing_tag',
'phpdoc_indent',
'phpdoc_no_access',
'phpdoc_no_empty_return',
'phpdoc_no_package',
'phpdoc_params',
'phpdoc_scalar',
'phpdoc_separation',
'phpdoc_to_comment',
'phpdoc_trim',
'phpdoc_types',
'phpdoc_var_without_name',
'remove_lines_between_uses',
'return',
'self_accessor',
'short_tag',
'single_line_after_imports',
'single_quote',
'spaces_before_semicolon',
'spaces_cast',
'ternary_spaces',
'trailing_spaces',
'trim_array_spaces',
'unused_use',
'whitespacy_lines',
'align_double_arrow',
'align_equals',
'concat_with_spaces'
'visibility',
'whitespacy_lines'
)
)
->finder($finder);

View File

@@ -24,7 +24,7 @@ install:
script:
- ./phpunit
- ./phpunit --configuration ./build/travis-ci-fail.xml > /dev/null; if [ $? -eq 0 ]; then echo "SHOULD FAIL"; exit 1; else echo "fail checked"; fi;
- ./phpunit --configuration ./build/travis-ci-fail.xml > /dev/null; if [ $? -eq 0 ]; then echo "SHOULD FAIL"; false; else echo "fail checked"; fi;
- xmllint --noout --schema phpunit.xsd phpunit.xml.dist
- xmllint --noout --schema phpunit.xsd tests/_files/configuration.xml
- xmllint --noout --schema phpunit.xsd tests/_files/configuration_empty.xml

View File

@@ -2,6 +2,57 @@
All notable changes of the PHPUnit 4.8 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
## [4.8.16] - 2015-10-23
### Added
* Implemented [#1925](https://github.com/sebastianbergmann/phpunit/issues/1925): Provide a library-only PHAR
## [4.8.15] - 2015-10-22
### Fixed
* The backup of global state is now properly restored when changes to global state are disallowed
* The `__PHPUNIT_PHAR__` constant is now properly set when the PHPUnit PHAR is used as a library
## [4.8.14] - 2015-10-17
### Fixed
* Fixed [#1892](https://github.com/sebastianbergmann/phpunit/issues/1892): `--coverage-text` does not honor color settings
## [4.8.13] - 2015-10-14
### Added
* Added the `--self-upgrade` commandline switch for upgrading a PHPUnit PHAR to the latest version
### Changed
* The `--self-update` commandline switch now updates a PHPUnit PHAR to the latest version within the same release series
## [4.8.12] - 2015-10-12
### Changed
* Merged [#1893](https://github.com/sebastianbergmann/phpunit/issues/1893): Removed workaround for phpab bug
## [4.8.11] - 2015-10-07
### Fixed
* Merged [#1885](https://github.com/sebastianbergmann/phpunit/issues/1885): Fixed handling of PHP configuration settings for process isolation
* Fixed [#1857](https://github.com/sebastianbergmann/phpunit/issues/1857): `@covers` and `@uses` should only take a single word
* Fixed [#1879](https://github.com/sebastianbergmann/phpunit/issues/1879): `assertEqualXMLStructure()` cannot compare nodes with an ID
* Fixed [#1898](https://github.com/sebastianbergmann/phpunit/issues/1898): `@covers` and `@uses` cannot be used for namespaced functions
* Fixed [#1901](https://github.com/sebastianbergmann/phpunit/issues/1901): `--self-update` updates to PHPUnit 5, even on PHP < 5.6
## [4.8.10] - 2015-10-01
### Fixed
* Merged [#1884](https://github.com/sebastianbergmann/phpunit/issues/1884): Avoid passing `Error` to `onNotSuccessfulTest()` on PHP 7
## [4.8.9] - 2015-09-20
### Fixed
@@ -69,6 +120,13 @@ New PHAR release due to updated dependencies
* Made the argument check of `assertContains()` and `assertNotContains()` more strict to prevent undefined behavior such as [#1808](https://github.com/sebastianbergmann/phpunit/issues/1808)
* Changed the name of the default group from `__nogroup__` to `default`
[4.8.16]: https://github.com/sebastianbergmann/phpunit/compare/4.8.15...4.8.16
[4.8.15]: https://github.com/sebastianbergmann/phpunit/compare/4.8.14...4.8.15
[4.8.14]: https://github.com/sebastianbergmann/phpunit/compare/4.8.13...4.8.14
[4.8.13]: https://github.com/sebastianbergmann/phpunit/compare/4.8.12...4.8.13
[4.8.12]: https://github.com/sebastianbergmann/phpunit/compare/4.8.11...4.8.12
[4.8.11]: https://github.com/sebastianbergmann/phpunit/compare/4.8.10...4.8.11
[4.8.10]: https://github.com/sebastianbergmann/phpunit/compare/4.8.9...4.8.10
[4.8.9]: https://github.com/sebastianbergmann/phpunit/compare/4.8.8...4.8.9
[4.8.8]: https://github.com/sebastianbergmann/phpunit/compare/4.8.7...4.8.8
[4.8.7]: https://github.com/sebastianbergmann/phpunit/compare/4.8.6...4.8.7

View File

@@ -42,6 +42,12 @@
<arg value="${basedir}/phpunit --version | awk 'BEGIN { ORS = &quot;&quot;; } {print $2}'" />
</exec>
<exec executable="gpg" failonerror="true">
<arg value="--armor" />
<arg value="--detach-sign" />
<arg path="${basedir}/build/phpunit-library-${version}.phar" />
</exec>
<exec executable="gpg" failonerror="true">
<arg value="--armor" />
<arg value="--detach-sign" />
@@ -248,14 +254,26 @@
<arg value="${version}" />
</exec>
<exec executable="phpab">
<exec executable="${basedir}/build/bin/phpab">
<arg value="--all" />
<arg value="--static" />
<arg value="--once" />
<arg value="--phar" />
<arg value="--output" />
<arg path="${basedir}/build/phpunit-library-${_version}.phar" />
<arg value="--template" />
<arg path="${basedir}/build/library-phar-autoload.php.in" />
<arg path="${basedir}/build/phar" />
</exec>
<exec executable="${basedir}/build/bin/phpab">
<arg value="--all" />
<arg value="--static" />
<arg value="--phar" />
<arg value="--output" />
<arg path="${basedir}/build/phpunit-${_version}.phar" />
<arg value="--template" />
<arg path="${basedir}/build/phar-autoload.php.in" />
<arg path="${basedir}/build/binary-phar-autoload.php.in" />
<arg path="${basedir}/build/phar" />
</exec>

View File

@@ -1,37 +0,0 @@
#!/usr/bin/env php
<?php
if (__FILE__ == realpath($GLOBALS['_SERVER']['SCRIPT_NAME'])) {
$phar = realpath($GLOBALS['_SERVER']['SCRIPT_NAME']);
$execute = true;
} else {
$files = get_included_files();
$phar = $files[0];
$execute = false;
}
define('__PHPUNIT_PHAR__', str_replace(DIRECTORY_SEPARATOR, '/', $phar));
define('__PHPUNIT_PHAR_ROOT__', 'phar://___PHAR___');
Phar::mapPhar('___PHAR___');
___FILELIST___
if ($execute) {
if (version_compare('5.3.3', PHP_VERSION, '>')) {
fwrite(
STDERR,
'This version of PHPUnit requires PHP 5.3.3; using the latest version of PHP is highly recommended.' . PHP_EOL
);
die(1);
}
if (isset($_SERVER['argv'][1]) && $_SERVER['argv'][1] == '--manifest') {
print file_get_contents(__PHPUNIT_PHAR_ROOT__ . '/phar/manifest.txt');
exit;
}
PHPUnit_TextUI_Command::main();
}
__HALT_COMPILER();

View File

@@ -14,6 +14,7 @@
* We want a TestSuite object B that contains TestSuite objects C, D, ...
* for the Tests tagged with @group C, @group D, ...
* Running the Tests from TestSuite object B results in Tests tagged with both
*
* @group C and @group D in TestSuite object A to be run twice .
*
* <code>

View File

@@ -50,7 +50,8 @@ class PHPUnit_Extensions_PhptTestCase implements PHPUnit_Framework_Test, PHPUnit
/**
* Constructs a test case with the given filename.
*
* @param string $filename
* @param string $filename
*
* @throws PHPUnit_Framework_Exception
*/
public function __construct($filename)
@@ -84,7 +85,8 @@ class PHPUnit_Extensions_PhptTestCase implements PHPUnit_Framework_Test, PHPUnit
/**
* Runs a test and collects its result in a TestResult instance.
*
* @param PHPUnit_Framework_TestResult $result
* @param PHPUnit_Framework_TestResult $result
*
* @return PHPUnit_Framework_TestResult
*/
public function run(PHPUnit_Framework_TestResult $result = null)
@@ -177,6 +179,7 @@ class PHPUnit_Extensions_PhptTestCase implements PHPUnit_Framework_Test, PHPUnit
/**
* @return array
*
* @throws PHPUnit_Framework_Exception
*/
private function parse()
@@ -205,7 +208,8 @@ class PHPUnit_Extensions_PhptTestCase implements PHPUnit_Framework_Test, PHPUnit
}
/**
* @param string $code
* @param string $code
*
* @return string
*/
private function render($code)
@@ -227,6 +231,7 @@ class PHPUnit_Extensions_PhptTestCase implements PHPUnit_Framework_Test, PHPUnit
* Parse --INI-- section key value pairs and return as array.
*
* @param string
*
* @return array
*/
protected function parseIniSection($content)

View File

@@ -18,7 +18,8 @@ class PHPUnit_Extensions_PhptTestSuite extends PHPUnit_Framework_TestSuite
/**
* Constructs a new TestSuite for .phpt test cases.
*
* @param string $directory
* @param string $directory
*
* @throws PHPUnit_Framework_Exception
*/
public function __construct($directory)

View File

@@ -26,9 +26,10 @@ class PHPUnit_Extensions_RepeatedTest extends PHPUnit_Extensions_TestDecorator
protected $timesRepeat = 1;
/**
* @param PHPUnit_Framework_Test $test
* @param int $timesRepeat
* @param bool $processIsolation
* @param PHPUnit_Framework_Test $test
* @param int $timesRepeat
* @param bool $processIsolation
*
* @throws PHPUnit_Framework_Exception
*/
public function __construct(PHPUnit_Framework_Test $test, $timesRepeat = 1, $processIsolation = false)
@@ -63,8 +64,10 @@ class PHPUnit_Extensions_RepeatedTest extends PHPUnit_Extensions_TestDecorator
* Runs the decorated test and collects the
* result in a TestResult.
*
* @param PHPUnit_Framework_TestResult $result
* @param PHPUnit_Framework_TestResult $result
*
* @return PHPUnit_Framework_TestResult
*
* @throws PHPUnit_Framework_Exception
*/
public function run(PHPUnit_Framework_TestResult $result = null)

View File

@@ -92,7 +92,8 @@ class PHPUnit_Extensions_TestDecorator extends PHPUnit_Framework_Assert implemen
* Runs the decorated test and collects the
* result in a TestResult.
*
* @param PHPUnit_Framework_TestResult $result
* @param PHPUnit_Framework_TestResult $result
*
* @return PHPUnit_Framework_TestResult
*/
public function run(PHPUnit_Framework_TestResult $result = null)

View File

@@ -64,6 +64,7 @@ abstract class PHPUnit_Extensions_TicketListener implements PHPUnit_Framework_Te
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param float $time
*
* @since Method available since Release 4.0.0
*/
public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
@@ -76,6 +77,7 @@ abstract class PHPUnit_Extensions_TicketListener implements PHPUnit_Framework_Te
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param float $time
*
* @since Method available since Release 3.0.0
*/
public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
@@ -86,6 +88,7 @@ abstract class PHPUnit_Extensions_TicketListener implements PHPUnit_Framework_Te
* A test suite started.
*
* @param PHPUnit_Framework_TestSuite $suite
*
* @since Method available since Release 2.2.0
*/
public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
@@ -96,6 +99,7 @@ abstract class PHPUnit_Extensions_TicketListener implements PHPUnit_Framework_Te
* A test suite ended.
*
* @param PHPUnit_Framework_TestSuite $suite
*
* @since Method available since Release 2.2.0
*/
public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
@@ -184,7 +188,8 @@ abstract class PHPUnit_Extensions_TicketListener implements PHPUnit_Framework_Te
}
/**
* @param mixed $ticketId
* @param mixed $ticketId
*
* @return mixed
*/
abstract protected function getTicketInfo($ticketId = null);

View File

@@ -26,6 +26,7 @@ abstract class PHPUnit_Framework_Assert
* @param mixed $key
* @param array|ArrayAccess $array
* @param string $message
*
* @since Method available since Release 3.0.0
*/
public static function assertArrayHasKey($key, $array, $message = '')
@@ -56,6 +57,7 @@ abstract class PHPUnit_Framework_Assert
* @param array|ArrayAccess $array
* @param bool $strict Check for object identity
* @param string $message
*
* @since Method available since Release 4.4.0
*/
public static function assertArraySubset($subset, $array, $strict = false, $message = '')
@@ -85,6 +87,7 @@ abstract class PHPUnit_Framework_Assert
* @param mixed $key
* @param array|ArrayAccess $array
* @param string $message
*
* @since Method available since Release 3.0.0
*/
public static function assertArrayNotHasKey($key, $array, $message = '')
@@ -119,6 +122,7 @@ abstract class PHPUnit_Framework_Assert
* @param bool $ignoreCase
* @param bool $checkForObjectIdentity
* @param bool $checkForNonObjectIdentity
*
* @since Method available since Release 2.1.0
*/
public static function assertContains($needle, $haystack, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
@@ -163,6 +167,7 @@ abstract class PHPUnit_Framework_Assert
* @param bool $ignoreCase
* @param bool $checkForObjectIdentity
* @param bool $checkForNonObjectIdentity
*
* @since Method available since Release 3.0.0
*/
public static function assertAttributeContains($needle, $haystackAttributeName, $haystackClassOrObject, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
@@ -186,6 +191,7 @@ abstract class PHPUnit_Framework_Assert
* @param bool $ignoreCase
* @param bool $checkForObjectIdentity
* @param bool $checkForNonObjectIdentity
*
* @since Method available since Release 2.1.0
*/
public static function assertNotContains($needle, $haystack, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
@@ -234,6 +240,7 @@ abstract class PHPUnit_Framework_Assert
* @param bool $ignoreCase
* @param bool $checkForObjectIdentity
* @param bool $checkForNonObjectIdentity
*
* @since Method available since Release 3.0.0
*/
public static function assertAttributeNotContains($needle, $haystackAttributeName, $haystackClassOrObject, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
@@ -255,6 +262,7 @@ abstract class PHPUnit_Framework_Assert
* @param mixed $haystack
* @param bool $isNativeType
* @param string $message
*
* @since Method available since Release 3.1.4
*/
public static function assertContainsOnly($type, $haystack, $isNativeType = null, $message = '')
@@ -317,6 +325,7 @@ abstract class PHPUnit_Framework_Assert
* @param mixed $haystackClassOrObject
* @param bool $isNativeType
* @param string $message
*
* @since Method available since Release 3.1.4
*/
public static function assertAttributeContainsOnly($type, $haystackAttributeName, $haystackClassOrObject, $isNativeType = null, $message = '')
@@ -336,6 +345,7 @@ abstract class PHPUnit_Framework_Assert
* @param mixed $haystack
* @param bool $isNativeType
* @param string $message
*
* @since Method available since Release 3.1.4
*/
public static function assertNotContainsOnly($type, $haystack, $isNativeType = null, $message = '')
@@ -374,6 +384,7 @@ abstract class PHPUnit_Framework_Assert
* @param mixed $haystackClassOrObject
* @param bool $isNativeType
* @param string $message
*
* @since Method available since Release 3.1.4
*/
public static function assertAttributeNotContainsOnly($type, $haystackAttributeName, $haystackClassOrObject, $isNativeType = null, $message = '')
@@ -420,6 +431,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $haystackAttributeName
* @param mixed $haystackClassOrObject
* @param string $message
*
* @since Method available since Release 3.6.0
*/
public static function assertAttributeCount($expectedCount, $haystackAttributeName, $haystackClassOrObject, $message = '')
@@ -465,6 +477,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $haystackAttributeName
* @param mixed $haystackClassOrObject
* @param string $message
*
* @since Method available since Release 3.6.0
*/
public static function assertAttributeNotCount($expectedCount, $haystackAttributeName, $haystackClassOrObject, $message = '')
@@ -535,6 +548,7 @@ abstract class PHPUnit_Framework_Assert
* @param int $maxDepth
* @param bool $canonicalize
* @param bool $ignoreCase
*
* @since Method available since Release 2.3.0
*/
public static function assertNotEquals($expected, $actual, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
@@ -580,8 +594,9 @@ abstract class PHPUnit_Framework_Assert
/**
* Asserts that a variable is empty.
*
* @param mixed $actual
* @param string $message
* @param mixed $actual
* @param string $message
*
* @throws PHPUnit_Framework_AssertionFailedError
*/
public static function assertEmpty($actual, $message = '')
@@ -596,6 +611,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $haystackAttributeName
* @param mixed $haystackClassOrObject
* @param string $message
*
* @since Method available since Release 3.5.0
*/
public static function assertAttributeEmpty($haystackAttributeName, $haystackClassOrObject, $message = '')
@@ -609,8 +625,9 @@ abstract class PHPUnit_Framework_Assert
/**
* Asserts that a variable is not empty.
*
* @param mixed $actual
* @param string $message
* @param mixed $actual
* @param string $message
*
* @throws PHPUnit_Framework_AssertionFailedError
*/
public static function assertNotEmpty($actual, $message = '')
@@ -625,6 +642,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $haystackAttributeName
* @param mixed $haystackClassOrObject
* @param string $message
*
* @since Method available since Release 3.5.0
*/
public static function assertAttributeNotEmpty($haystackAttributeName, $haystackClassOrObject, $message = '')
@@ -641,6 +659,7 @@ abstract class PHPUnit_Framework_Assert
* @param mixed $expected
* @param mixed $actual
* @param string $message
*
* @since Method available since Release 3.1.0
*/
public static function assertGreaterThan($expected, $actual, $message = '')
@@ -655,6 +674,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $actualAttributeName
* @param string $actualClassOrObject
* @param string $message
*
* @since Method available since Release 3.1.0
*/
public static function assertAttributeGreaterThan($expected, $actualAttributeName, $actualClassOrObject, $message = '')
@@ -672,6 +692,7 @@ abstract class PHPUnit_Framework_Assert
* @param mixed $expected
* @param mixed $actual
* @param string $message
*
* @since Method available since Release 3.1.0
*/
public static function assertGreaterThanOrEqual($expected, $actual, $message = '')
@@ -690,6 +711,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $actualAttributeName
* @param string $actualClassOrObject
* @param string $message
*
* @since Method available since Release 3.1.0
*/
public static function assertAttributeGreaterThanOrEqual($expected, $actualAttributeName, $actualClassOrObject, $message = '')
@@ -707,6 +729,7 @@ abstract class PHPUnit_Framework_Assert
* @param mixed $expected
* @param mixed $actual
* @param string $message
*
* @since Method available since Release 3.1.0
*/
public static function assertLessThan($expected, $actual, $message = '')
@@ -721,6 +744,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $actualAttributeName
* @param string $actualClassOrObject
* @param string $message
*
* @since Method available since Release 3.1.0
*/
public static function assertAttributeLessThan($expected, $actualAttributeName, $actualClassOrObject, $message = '')
@@ -738,6 +762,7 @@ abstract class PHPUnit_Framework_Assert
* @param mixed $expected
* @param mixed $actual
* @param string $message
*
* @since Method available since Release 3.1.0
*/
public static function assertLessThanOrEqual($expected, $actual, $message = '')
@@ -752,6 +777,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $actualAttributeName
* @param string $actualClassOrObject
* @param string $message
*
* @since Method available since Release 3.1.0
*/
public static function assertAttributeLessThanOrEqual($expected, $actualAttributeName, $actualClassOrObject, $message = '')
@@ -772,6 +798,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $message
* @param bool $canonicalize
* @param bool $ignoreCase
*
* @since Method available since Release 3.2.14
*/
public static function assertFileEquals($expected, $actual, $message = '', $canonicalize = false, $ignoreCase = false)
@@ -799,6 +826,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $message
* @param bool $canonicalize
* @param bool $ignoreCase
*
* @since Method available since Release 3.2.14
*/
public static function assertFileNotEquals($expected, $actual, $message = '', $canonicalize = false, $ignoreCase = false)
@@ -826,6 +854,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $message
* @param bool $canonicalize
* @param bool $ignoreCase
*
* @since Method available since Release 3.3.0
*/
public static function assertStringEqualsFile($expectedFile, $actualString, $message = '', $canonicalize = false, $ignoreCase = false)
@@ -852,6 +881,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $message
* @param bool $canonicalize
* @param bool $ignoreCase
*
* @since Method available since Release 3.3.0
*/
public static function assertStringNotEqualsFile($expectedFile, $actualString, $message = '', $canonicalize = false, $ignoreCase = false)
@@ -874,6 +904,7 @@ abstract class PHPUnit_Framework_Assert
*
* @param string $filename
* @param string $message
*
* @since Method available since Release 3.0.0
*/
public static function assertFileExists($filename, $message = '')
@@ -892,6 +923,7 @@ abstract class PHPUnit_Framework_Assert
*
* @param string $filename
* @param string $message
*
* @since Method available since Release 3.0.0
*/
public static function assertFileNotExists($filename, $message = '')
@@ -910,8 +942,9 @@ abstract class PHPUnit_Framework_Assert
/**
* Asserts that a condition is true.
*
* @param bool $condition
* @param string $message
* @param bool $condition
* @param string $message
*
* @throws PHPUnit_Framework_AssertionFailedError
*/
public static function assertTrue($condition, $message = '')
@@ -922,8 +955,9 @@ abstract class PHPUnit_Framework_Assert
/**
* Asserts that a condition is not true.
*
* @param bool $condition
* @param string $message
* @param bool $condition
* @param string $message
*
* @throws PHPUnit_Framework_AssertionFailedError
*/
public static function assertNotTrue($condition, $message = '')
@@ -934,8 +968,9 @@ abstract class PHPUnit_Framework_Assert
/**
* Asserts that a condition is false.
*
* @param bool $condition
* @param string $message
* @param bool $condition
* @param string $message
*
* @throws PHPUnit_Framework_AssertionFailedError
*/
public static function assertFalse($condition, $message = '')
@@ -946,8 +981,9 @@ abstract class PHPUnit_Framework_Assert
/**
* Asserts that a condition is not false.
*
* @param bool $condition
* @param string $message
* @param bool $condition
* @param string $message
*
* @throws PHPUnit_Framework_AssertionFailedError
*/
public static function assertNotFalse($condition, $message = '')
@@ -983,6 +1019,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $attributeName
* @param string $className
* @param string $message
*
* @since Method available since Release 3.1.0
*/
public static function assertClassHasAttribute($attributeName, $className, $message = '')
@@ -1012,6 +1049,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $attributeName
* @param string $className
* @param string $message
*
* @since Method available since Release 3.1.0
*/
public static function assertClassNotHasAttribute($attributeName, $className, $message = '')
@@ -1041,6 +1079,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $attributeName
* @param string $className
* @param string $message
*
* @since Method available since Release 3.1.0
*/
public static function assertClassHasStaticAttribute($attributeName, $className, $message = '')
@@ -1070,6 +1109,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $attributeName
* @param string $className
* @param string $message
*
* @since Method available since Release 3.1.0
*/
public static function assertClassNotHasStaticAttribute($attributeName, $className, $message = '')
@@ -1101,6 +1141,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $attributeName
* @param object $object
* @param string $message
*
* @since Method available since Release 3.0.0
*/
public static function assertObjectHasAttribute($attributeName, $object, $message = '')
@@ -1130,6 +1171,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $attributeName
* @param object $object
* @param string $message
*
* @since Method available since Release 3.0.0
*/
public static function assertObjectNotHasAttribute($attributeName, $object, $message = '')
@@ -1239,6 +1281,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $expected
* @param mixed $actual
* @param string $message
*
* @since Method available since Release 3.5.0
*/
public static function assertInstanceOf($expected, $actual, $message = '')
@@ -1261,6 +1304,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $attributeName
* @param mixed $classOrObject
* @param string $message
*
* @since Method available since Release 3.5.0
*/
public static function assertAttributeInstanceOf($expected, $attributeName, $classOrObject, $message = '')
@@ -1278,6 +1322,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $expected
* @param mixed $actual
* @param string $message
*
* @since Method available since Release 3.5.0
*/
public static function assertNotInstanceOf($expected, $actual, $message = '')
@@ -1300,6 +1345,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $attributeName
* @param mixed $classOrObject
* @param string $message
*
* @since Method available since Release 3.5.0
*/
public static function assertAttributeNotInstanceOf($expected, $attributeName, $classOrObject, $message = '')
@@ -1317,6 +1363,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $expected
* @param mixed $actual
* @param string $message
*
* @since Method available since Release 3.5.0
*/
public static function assertInternalType($expected, $actual, $message = '')
@@ -1339,6 +1386,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $attributeName
* @param mixed $classOrObject
* @param string $message
*
* @since Method available since Release 3.5.0
*/
public static function assertAttributeInternalType($expected, $attributeName, $classOrObject, $message = '')
@@ -1356,6 +1404,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $expected
* @param mixed $actual
* @param string $message
*
* @since Method available since Release 3.5.0
*/
public static function assertNotInternalType($expected, $actual, $message = '')
@@ -1378,6 +1427,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $attributeName
* @param mixed $classOrObject
* @param string $message
*
* @since Method available since Release 3.5.0
*/
public static function assertAttributeNotInternalType($expected, $attributeName, $classOrObject, $message = '')
@@ -1417,6 +1467,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $pattern
* @param string $string
* @param string $message
*
* @since Method available since Release 2.1.0
*/
public static function assertNotRegExp($pattern, $string, $message = '')
@@ -1500,6 +1551,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $format
* @param string $string
* @param string $message
*
* @since Method available since Release 3.5.0
*/
public static function assertStringMatchesFormat($format, $string, $message = '')
@@ -1523,6 +1575,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $format
* @param string $string
* @param string $message
*
* @since Method available since Release 3.5.0
*/
public static function assertStringNotMatchesFormat($format, $string, $message = '')
@@ -1548,6 +1601,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $formatFile
* @param string $string
* @param string $message
*
* @since Method available since Release 3.5.0
*/
public static function assertStringMatchesFormatFile($formatFile, $string, $message = '')
@@ -1571,6 +1625,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $formatFile
* @param string $string
* @param string $message
*
* @since Method available since Release 3.5.0
*/
public static function assertStringNotMatchesFormatFile($formatFile, $string, $message = '')
@@ -1596,6 +1651,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $prefix
* @param string $string
* @param string $message
*
* @since Method available since Release 3.4.0
*/
public static function assertStringStartsWith($prefix, $string, $message = '')
@@ -1621,6 +1677,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $prefix
* @param string $string
* @param string $message
*
* @since Method available since Release 3.4.0
*/
public static function assertStringStartsNotWith($prefix, $string, $message = '')
@@ -1646,6 +1703,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $suffix
* @param string $string
* @param string $message
*
* @since Method available since Release 3.4.0
*/
public static function assertStringEndsWith($suffix, $string, $message = '')
@@ -1669,6 +1727,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $suffix
* @param string $string
* @param string $message
*
* @since Method available since Release 3.4.0
*/
public static function assertStringEndsNotWith($suffix, $string, $message = '')
@@ -1694,6 +1753,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $expectedFile
* @param string $actualFile
* @param string $message
*
* @since Method available since Release 3.1.0
*/
public static function assertXmlFileEqualsXmlFile($expectedFile, $actualFile, $message = '')
@@ -1710,6 +1770,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $expectedFile
* @param string $actualFile
* @param string $message
*
* @since Method available since Release 3.1.0
*/
public static function assertXmlFileNotEqualsXmlFile($expectedFile, $actualFile, $message = '')
@@ -1726,6 +1787,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $expectedFile
* @param string $actualXml
* @param string $message
*
* @since Method available since Release 3.3.0
*/
public static function assertXmlStringEqualsXmlFile($expectedFile, $actualXml, $message = '')
@@ -1742,6 +1804,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $expectedFile
* @param string $actualXml
* @param string $message
*
* @since Method available since Release 3.3.0
*/
public static function assertXmlStringNotEqualsXmlFile($expectedFile, $actualXml, $message = '')
@@ -1758,6 +1821,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $expectedXml
* @param string $actualXml
* @param string $message
*
* @since Method available since Release 3.1.0
*/
public static function assertXmlStringEqualsXmlString($expectedXml, $actualXml, $message = '')
@@ -1774,6 +1838,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $expectedXml
* @param string $actualXml
* @param string $message
*
* @since Method available since Release 3.1.0
*/
public static function assertXmlStringNotEqualsXmlString($expectedXml, $actualXml, $message = '')
@@ -1791,12 +1856,18 @@ abstract class PHPUnit_Framework_Assert
* @param DOMElement $actualElement
* @param bool $checkAttributes
* @param string $message
*
* @since Method available since Release 3.3.0
*/
public static function assertEqualXMLStructure(DOMElement $expectedElement, DOMElement $actualElement, $checkAttributes = false, $message = '')
{
$expectedElement = clone $expectedElement;
$actualElement = clone $actualElement;
$tmp = new DOMDocument;
$expectedElement = $tmp->importNode($expectedElement, true);
$tmp = new DOMDocument;
$actualElement = $tmp->importNode($actualElement, true);
unset($tmp);
self::assertEquals(
$expectedElement->tagName,
@@ -1880,6 +1951,7 @@ abstract class PHPUnit_Framework_Assert
* @param mixed $actual
* @param string $message
* @param bool $isHtml
*
* @since Method available since Release 3.3.0
* @deprecated
* @codeCoverageIgnore
@@ -1908,6 +1980,7 @@ abstract class PHPUnit_Framework_Assert
* @param mixed $actual
* @param string $message
* @param bool $isHtml
*
* @since Method available since Release 3.3.0
* @deprecated
* @codeCoverageIgnore
@@ -1936,6 +2009,7 @@ abstract class PHPUnit_Framework_Assert
* @param mixed $actual
* @param string $message
* @param bool $isHtml
*
* @since Method available since Release 3.3.0
* @deprecated
* @codeCoverageIgnore
@@ -2123,6 +2197,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $actual
* @param string $message
* @param bool $isHtml
*
* @since Method available since Release 3.3.0
* @deprecated
* @codeCoverageIgnore
@@ -2148,6 +2223,7 @@ abstract class PHPUnit_Framework_Assert
* @param string $actual
* @param string $message
* @param bool $isHtml
*
* @since Method available since Release 3.3.0
* @deprecated
* @codeCoverageIgnore
@@ -2169,6 +2245,7 @@ abstract class PHPUnit_Framework_Assert
* @param mixed $value
* @param PHPUnit_Framework_Constraint $constraint
* @param string $message
*
* @since Method available since Release 3.0.0
*/
public static function assertThat($value, PHPUnit_Framework_Constraint $constraint, $message = '')
@@ -2183,6 +2260,7 @@ abstract class PHPUnit_Framework_Assert
*
* @param string $actualJson
* @param string $message
*
* @since Method available since Release 3.7.20
*/
public static function assertJson($actualJson, $message = '')
@@ -2338,6 +2416,7 @@ abstract class PHPUnit_Framework_Assert
* Returns a PHPUnit_Framework_Constraint_And matcher object.
*
* @return PHPUnit_Framework_Constraint_And
*
* @since Method available since Release 3.0.0
*/
public static function logicalAnd()
@@ -2354,6 +2433,7 @@ abstract class PHPUnit_Framework_Assert
* Returns a PHPUnit_Framework_Constraint_Or matcher object.
*
* @return PHPUnit_Framework_Constraint_Or
*
* @since Method available since Release 3.0.0
*/
public static function logicalOr()
@@ -2369,8 +2449,10 @@ abstract class PHPUnit_Framework_Assert
/**
* Returns a PHPUnit_Framework_Constraint_Not matcher object.
*
* @param PHPUnit_Framework_Constraint $constraint
* @param PHPUnit_Framework_Constraint $constraint
*
* @return PHPUnit_Framework_Constraint_Not
*
* @since Method available since Release 3.0.0
*/
public static function logicalNot(PHPUnit_Framework_Constraint $constraint)
@@ -2382,6 +2464,7 @@ abstract class PHPUnit_Framework_Assert
* Returns a PHPUnit_Framework_Constraint_Xor matcher object.
*
* @return PHPUnit_Framework_Constraint_Xor
*
* @since Method available since Release 3.0.0
*/
public static function logicalXor()
@@ -2398,6 +2481,7 @@ abstract class PHPUnit_Framework_Assert
* Returns a PHPUnit_Framework_Constraint_IsAnything matcher object.
*
* @return PHPUnit_Framework_Constraint_IsAnything
*
* @since Method available since Release 3.0.0
*/
public static function anything()
@@ -2409,6 +2493,7 @@ abstract class PHPUnit_Framework_Assert
* Returns a PHPUnit_Framework_Constraint_IsTrue matcher object.
*
* @return PHPUnit_Framework_Constraint_IsTrue
*
* @since Method available since Release 3.3.0
*/
public static function isTrue()
@@ -2419,7 +2504,8 @@ abstract class PHPUnit_Framework_Assert
/**
* Returns a PHPUnit_Framework_Constraint_Callback matcher object.
*
* @param callable $callback
* @param callable $callback
*
* @return PHPUnit_Framework_Constraint_Callback
*/
public static function callback($callback)
@@ -2431,6 +2517,7 @@ abstract class PHPUnit_Framework_Assert
* Returns a PHPUnit_Framework_Constraint_IsFalse matcher object.
*
* @return PHPUnit_Framework_Constraint_IsFalse
*
* @since Method available since Release 3.3.0
*/
public static function isFalse()
@@ -2442,6 +2529,7 @@ abstract class PHPUnit_Framework_Assert
* Returns a PHPUnit_Framework_Constraint_IsJson matcher object.
*
* @return PHPUnit_Framework_Constraint_IsJson
*
* @since Method available since Release 3.7.20
*/
public static function isJson()
@@ -2453,6 +2541,7 @@ abstract class PHPUnit_Framework_Assert
* Returns a PHPUnit_Framework_Constraint_IsNull matcher object.
*
* @return PHPUnit_Framework_Constraint_IsNull
*
* @since Method available since Release 3.3.0
*/
public static function isNull()
@@ -2463,9 +2552,11 @@ abstract class PHPUnit_Framework_Assert
/**
* Returns a PHPUnit_Framework_Constraint_Attribute matcher object.
*
* @param PHPUnit_Framework_Constraint $constraint
* @param string $attributeName
* @param PHPUnit_Framework_Constraint $constraint
* @param string $attributeName
*
* @return PHPUnit_Framework_Constraint_Attribute
*
* @since Method available since Release 3.1.0
*/
public static function attribute(PHPUnit_Framework_Constraint $constraint, $attributeName)
@@ -2480,10 +2571,12 @@ abstract class PHPUnit_Framework_Assert
* Returns a PHPUnit_Framework_Constraint_TraversableContains matcher
* object.
*
* @param mixed $value
* @param bool $checkForObjectIdentity
* @param bool $checkForNonObjectIdentity
* @param mixed $value
* @param bool $checkForObjectIdentity
* @param bool $checkForNonObjectIdentity
*
* @return PHPUnit_Framework_Constraint_TraversableContains
*
* @since Method available since Release 3.0.0
*/
public static function contains($value, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
@@ -2495,8 +2588,10 @@ abstract class PHPUnit_Framework_Assert
* Returns a PHPUnit_Framework_Constraint_TraversableContainsOnly matcher
* object.
*
* @param string $type
* @param string $type
*
* @return PHPUnit_Framework_Constraint_TraversableContainsOnly
*
* @since Method available since Release 3.1.4
*/
public static function containsOnly($type)
@@ -2508,7 +2603,8 @@ abstract class PHPUnit_Framework_Assert
* Returns a PHPUnit_Framework_Constraint_TraversableContainsOnly matcher
* object.
*
* @param string $classname
* @param string $classname
*
* @return PHPUnit_Framework_Constraint_TraversableContainsOnly
*/
public static function containsOnlyInstancesOf($classname)
@@ -2519,8 +2615,10 @@ abstract class PHPUnit_Framework_Assert
/**
* Returns a PHPUnit_Framework_Constraint_ArrayHasKey matcher object.
*
* @param mixed $key
* @param mixed $key
*
* @return PHPUnit_Framework_Constraint_ArrayHasKey
*
* @since Method available since Release 3.0.0
*/
public static function arrayHasKey($key)
@@ -2531,12 +2629,14 @@ abstract class PHPUnit_Framework_Assert
/**
* Returns a PHPUnit_Framework_Constraint_IsEqual matcher object.
*
* @param mixed $value
* @param float $delta
* @param int $maxDepth
* @param bool $canonicalize
* @param bool $ignoreCase
* @param mixed $value
* @param float $delta
* @param int $maxDepth
* @param bool $canonicalize
* @param bool $ignoreCase
*
* @return PHPUnit_Framework_Constraint_IsEqual
*
* @since Method available since Release 3.0.0
*/
public static function equalTo($value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
@@ -2555,13 +2655,15 @@ abstract class PHPUnit_Framework_Assert
* that is wrapped in a PHPUnit_Framework_Constraint_Attribute matcher
* object.
*
* @param string $attributeName
* @param mixed $value
* @param float $delta
* @param int $maxDepth
* @param bool $canonicalize
* @param bool $ignoreCase
* @param string $attributeName
* @param mixed $value
* @param float $delta
* @param int $maxDepth
* @param bool $canonicalize
* @param bool $ignoreCase
*
* @return PHPUnit_Framework_Constraint_Attribute
*
* @since Method available since Release 3.1.0
*/
public static function attributeEqualTo($attributeName, $value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
@@ -2582,6 +2684,7 @@ abstract class PHPUnit_Framework_Assert
* Returns a PHPUnit_Framework_Constraint_IsEmpty matcher object.
*
* @return PHPUnit_Framework_Constraint_IsEmpty
*
* @since Method available since Release 3.5.0
*/
public static function isEmpty()
@@ -2593,6 +2696,7 @@ abstract class PHPUnit_Framework_Assert
* Returns a PHPUnit_Framework_Constraint_FileExists matcher object.
*
* @return PHPUnit_Framework_Constraint_FileExists
*
* @since Method available since Release 3.0.0
*/
public static function fileExists()
@@ -2603,8 +2707,10 @@ abstract class PHPUnit_Framework_Assert
/**
* Returns a PHPUnit_Framework_Constraint_GreaterThan matcher object.
*
* @param mixed $value
* @param mixed $value
*
* @return PHPUnit_Framework_Constraint_GreaterThan
*
* @since Method available since Release 3.0.0
*/
public static function greaterThan($value)
@@ -2617,8 +2723,10 @@ abstract class PHPUnit_Framework_Assert
* a PHPUnit_Framework_Constraint_IsEqual and a
* PHPUnit_Framework_Constraint_GreaterThan matcher object.
*
* @param mixed $value
* @param mixed $value
*
* @return PHPUnit_Framework_Constraint_Or
*
* @since Method available since Release 3.1.0
*/
public static function greaterThanOrEqual($value)
@@ -2632,8 +2740,10 @@ abstract class PHPUnit_Framework_Assert
/**
* Returns a PHPUnit_Framework_Constraint_ClassHasAttribute matcher object.
*
* @param string $attributeName
* @param string $attributeName
*
* @return PHPUnit_Framework_Constraint_ClassHasAttribute
*
* @since Method available since Release 3.1.0
*/
public static function classHasAttribute($attributeName)
@@ -2647,8 +2757,10 @@ abstract class PHPUnit_Framework_Assert
* Returns a PHPUnit_Framework_Constraint_ClassHasStaticAttribute matcher
* object.
*
* @param string $attributeName
* @param string $attributeName
*
* @return PHPUnit_Framework_Constraint_ClassHasStaticAttribute
*
* @since Method available since Release 3.1.0
*/
public static function classHasStaticAttribute($attributeName)
@@ -2661,8 +2773,10 @@ abstract class PHPUnit_Framework_Assert
/**
* Returns a PHPUnit_Framework_Constraint_ObjectHasAttribute matcher object.
*
* @param string $attributeName
* @param string $attributeName
*
* @return PHPUnit_Framework_Constraint_ObjectHasAttribute
*
* @since Method available since Release 3.0.0
*/
public static function objectHasAttribute($attributeName)
@@ -2675,8 +2789,10 @@ abstract class PHPUnit_Framework_Assert
/**
* Returns a PHPUnit_Framework_Constraint_IsIdentical matcher object.
*
* @param mixed $value
* @param mixed $value
*
* @return PHPUnit_Framework_Constraint_IsIdentical
*
* @since Method available since Release 3.0.0
*/
public static function identicalTo($value)
@@ -2687,8 +2803,10 @@ abstract class PHPUnit_Framework_Assert
/**
* Returns a PHPUnit_Framework_Constraint_IsInstanceOf matcher object.
*
* @param string $className
* @param string $className
*
* @return PHPUnit_Framework_Constraint_IsInstanceOf
*
* @since Method available since Release 3.0.0
*/
public static function isInstanceOf($className)
@@ -2699,8 +2817,10 @@ abstract class PHPUnit_Framework_Assert
/**
* Returns a PHPUnit_Framework_Constraint_IsType matcher object.
*
* @param string $type
* @param string $type
*
* @return PHPUnit_Framework_Constraint_IsType
*
* @since Method available since Release 3.0.0
*/
public static function isType($type)
@@ -2711,8 +2831,10 @@ abstract class PHPUnit_Framework_Assert
/**
* Returns a PHPUnit_Framework_Constraint_LessThan matcher object.
*
* @param mixed $value
* @param mixed $value
*
* @return PHPUnit_Framework_Constraint_LessThan
*
* @since Method available since Release 3.0.0
*/
public static function lessThan($value)
@@ -2725,8 +2847,10 @@ abstract class PHPUnit_Framework_Assert
* a PHPUnit_Framework_Constraint_IsEqual and a
* PHPUnit_Framework_Constraint_LessThan matcher object.
*
* @param mixed $value
* @param mixed $value
*
* @return PHPUnit_Framework_Constraint_Or
*
* @since Method available since Release 3.1.0
*/
public static function lessThanOrEqual($value)
@@ -2740,8 +2864,10 @@ abstract class PHPUnit_Framework_Assert
/**
* Returns a PHPUnit_Framework_Constraint_PCREMatch matcher object.
*
* @param string $pattern
* @param string $pattern
*
* @return PHPUnit_Framework_Constraint_PCREMatch
*
* @since Method available since Release 3.0.0
*/
public static function matchesRegularExpression($pattern)
@@ -2752,8 +2878,10 @@ abstract class PHPUnit_Framework_Assert
/**
* Returns a PHPUnit_Framework_Constraint_StringMatches matcher object.
*
* @param string $string
* @param string $string
*
* @return PHPUnit_Framework_Constraint_StringMatches
*
* @since Method available since Release 3.5.0
*/
public static function matches($string)
@@ -2764,8 +2892,10 @@ abstract class PHPUnit_Framework_Assert
/**
* Returns a PHPUnit_Framework_Constraint_StringStartsWith matcher object.
*
* @param mixed $prefix
* @param mixed $prefix
*
* @return PHPUnit_Framework_Constraint_StringStartsWith
*
* @since Method available since Release 3.4.0
*/
public static function stringStartsWith($prefix)
@@ -2776,9 +2906,11 @@ abstract class PHPUnit_Framework_Assert
/**
* Returns a PHPUnit_Framework_Constraint_StringContains matcher object.
*
* @param string $string
* @param bool $case
* @param string $string
* @param bool $case
*
* @return PHPUnit_Framework_Constraint_StringContains
*
* @since Method available since Release 3.0.0
*/
public static function stringContains($string, $case = true)
@@ -2789,8 +2921,10 @@ abstract class PHPUnit_Framework_Assert
/**
* Returns a PHPUnit_Framework_Constraint_StringEndsWith matcher object.
*
* @param mixed $suffix
* @param mixed $suffix
*
* @return PHPUnit_Framework_Constraint_StringEndsWith
*
* @since Method available since Release 3.4.0
*/
public static function stringEndsWith($suffix)
@@ -2801,7 +2935,8 @@ abstract class PHPUnit_Framework_Assert
/**
* Returns a PHPUnit_Framework_Constraint_Count matcher object.
*
* @param int $count
* @param int $count
*
* @return PHPUnit_Framework_Constraint_Count
*/
public static function countOf($count)
@@ -2811,7 +2946,8 @@ abstract class PHPUnit_Framework_Assert
/**
* Fails a test with the given message.
*
* @param string $message
* @param string $message
*
* @throws PHPUnit_Framework_AssertionFailedError
*/
public static function fail($message = '')
@@ -2823,9 +2959,11 @@ abstract class PHPUnit_Framework_Assert
* Returns the value of an attribute of a class or an object.
* This also works for attributes that are declared protected or private.
*
* @param mixed $classOrObject
* @param string $attributeName
* @param mixed $classOrObject
* @param string $attributeName
*
* @return mixed
*
* @throws PHPUnit_Framework_Exception
*/
public static function readAttribute($classOrObject, $attributeName)
@@ -2867,10 +3005,13 @@ abstract class PHPUnit_Framework_Assert
* Returns the value of a static attribute.
* This also works for attributes that are declared protected or private.
*
* @param string $className
* @param string $attributeName
* @param string $className
* @param string $attributeName
*
* @return mixed
*
* @throws PHPUnit_Framework_Exception
*
* @since Method available since Release 4.0.0
*/
public static function getStaticAttribute($className, $attributeName)
@@ -2915,10 +3056,13 @@ abstract class PHPUnit_Framework_Assert
* Returns the value of an object's attribute.
* This also works for attributes that are declared protected or private.
*
* @param object $object
* @param string $attributeName
* @param object $object
* @param string $attributeName
*
* @return mixed
*
* @throws PHPUnit_Framework_Exception
*
* @since Method available since Release 4.0.0
*/
public static function getObjectAttribute($object, $attributeName)
@@ -2972,8 +3116,10 @@ abstract class PHPUnit_Framework_Assert
/**
* Mark the test as incomplete.
*
* @param string $message
* @param string $message
*
* @throws PHPUnit_Framework_IncompleteTestError
*
* @since Method available since Release 3.0.0
*/
public static function markTestIncomplete($message = '')
@@ -2984,8 +3130,10 @@ abstract class PHPUnit_Framework_Assert
/**
* Mark the test as skipped.
*
* @param string $message
* @param string $message
*
* @throws PHPUnit_Framework_SkippedTestError
*
* @since Method available since Release 3.0.0
*/
public static function markTestSkipped($message = '')
@@ -2997,6 +3145,7 @@ abstract class PHPUnit_Framework_Assert
* Return the current assertion count.
*
* @return int
*
* @since Method available since Release 3.3.3
*/
public static function getCount()

File diff suppressed because it is too large Load Diff

View File

@@ -11,8 +11,8 @@
/**
* An empty Listener that can be extended to implement TestListener
* with just a few lines of code.
* @see PHPUnit_Framework_TestListener for documentation on the API methods.
*
* @see PHPUnit_Framework_TestListener for documentation on the API methods.
* @since Class available since Release 4.0.0
*/
abstract class PHPUnit_Framework_BaseTestListener implements PHPUnit_Framework_TestListener

View File

@@ -34,10 +34,12 @@ abstract class PHPUnit_Framework_Constraint implements Countable, PHPUnit_Framew
* a boolean value instead: true in case of success, false in case of a
* failure.
*
* @param mixed $other Value or object to evaluate.
* @param string $description Additional information about the test
* @param bool $returnResult Whether to return a result or throw an exception
* @param mixed $other Value or object to evaluate.
* @param string $description Additional information about the test
* @param bool $returnResult Whether to return a result or throw an exception
*
* @return mixed
*
* @throws PHPUnit_Framework_ExpectationFailedException
*/
public function evaluate($other, $description = '', $returnResult = false)
@@ -63,7 +65,8 @@ abstract class PHPUnit_Framework_Constraint implements Countable, PHPUnit_Framew
*
* This method can be overridden to implement the evaluation algorithm.
*
* @param mixed $other Value or object to evaluate.
* @param mixed $other Value or object to evaluate.
*
* @return bool
*/
protected function matches($other)
@@ -75,6 +78,7 @@ abstract class PHPUnit_Framework_Constraint implements Countable, PHPUnit_Framew
* Counts the number of constraint elements.
*
* @return int
*
* @since Method available since Release 3.4.0
*/
public function count()
@@ -85,9 +89,10 @@ abstract class PHPUnit_Framework_Constraint implements Countable, PHPUnit_Framew
/**
* Throws an exception for the given compared value and test description
*
* @param mixed $other Evaluated value or object.
* @param string $description Additional information about the test
* @param SebastianBergmann\Comparator\ComparisonFailure $comparisonFailure
* @param mixed $other Evaluated value or object.
* @param string $description Additional information about the test
* @param SebastianBergmann\Comparator\ComparisonFailure $comparisonFailure
*
* @throws PHPUnit_Framework_ExpectationFailedException
*/
protected function fail($other, $description, SebastianBergmann\Comparator\ComparisonFailure $comparisonFailure = null)
@@ -119,7 +124,8 @@ abstract class PHPUnit_Framework_Constraint implements Countable, PHPUnit_Framew
* The function can be overridden to provide additional failure
* information like a diff
*
* @param mixed $other Evaluated value or object.
* @param mixed $other Evaluated value or object.
*
* @return string
*/
protected function additionalFailureDescription($other)
@@ -136,7 +142,8 @@ abstract class PHPUnit_Framework_Constraint implements Countable, PHPUnit_Framew
* To provide additional failure information additionalFailureDescription
* can be used.
*
* @param mixed $other Evaluated value or object.
* @param mixed $other Evaluated value or object.
*
* @return string
*/
protected function failureDescription($other)

View File

@@ -26,7 +26,8 @@ class PHPUnit_Framework_Constraint_And extends PHPUnit_Framework_Constraint
protected $lastConstraint = null;
/**
* @param PHPUnit_Framework_Constraint[] $constraints
* @param PHPUnit_Framework_Constraint[] $constraints
*
* @throws PHPUnit_Framework_Exception
*/
public function setConstraints(array $constraints)
@@ -55,10 +56,12 @@ class PHPUnit_Framework_Constraint_And extends PHPUnit_Framework_Constraint
* a boolean value instead: true in case of success, false in case of a
* failure.
*
* @param mixed $other Value or object to evaluate.
* @param string $description Additional information about the test
* @param bool $returnResult Whether to return a result or throw an exception
* @param mixed $other Value or object to evaluate.
* @param string $description Additional information about the test
* @param bool $returnResult Whether to return a result or throw an exception
*
* @return mixed
*
* @throws PHPUnit_Framework_ExpectationFailedException
*/
public function evaluate($other, $description = '', $returnResult = false)
@@ -106,6 +109,7 @@ class PHPUnit_Framework_Constraint_And extends PHPUnit_Framework_Constraint
* Counts the number of constraint elements.
*
* @return int
*
* @since Method available since Release 3.4.0
*/
public function count()

View File

@@ -38,7 +38,8 @@ class PHPUnit_Framework_Constraint_ArrayHasKey extends PHPUnit_Framework_Constra
* Evaluates the constraint for parameter $other. Returns true if the
* constraint is met, false otherwise.
*
* @param mixed $other Value or object to evaluate.
* @param mixed $other Value or object to evaluate.
*
* @return bool
*/
protected function matches($other)
@@ -70,7 +71,8 @@ class PHPUnit_Framework_Constraint_ArrayHasKey extends PHPUnit_Framework_Constra
* The beginning of failure messages is "Failed asserting that" in most
* cases. This method should return the second part of that sentence.
*
* @param mixed $other Evaluated value or object.
* @param mixed $other Evaluated value or object.
*
* @return string
*/
protected function failureDescription($other)

View File

@@ -43,7 +43,8 @@ class PHPUnit_Framework_Constraint_ArraySubset extends PHPUnit_Framework_Constra
* Evaluates the constraint for parameter $other. Returns true if the
* constraint is met, false otherwise.
*
* @param array|ArrayAccess $other Array or ArrayAccess object to evaluate.
* @param array|ArrayAccess $other Array or ArrayAccess object to evaluate.
*
* @return bool
*/
protected function matches($other)
@@ -73,7 +74,8 @@ class PHPUnit_Framework_Constraint_ArraySubset extends PHPUnit_Framework_Constra
* The beginning of failure messages is "Failed asserting that" in most
* cases. This method should return the second part of that sentence.
*
* @param mixed $other Evaluated value or object.
* @param mixed $other Evaluated value or object.
*
* @return string
*/
protected function failureDescription($other)

View File

@@ -39,10 +39,12 @@ class PHPUnit_Framework_Constraint_Attribute extends PHPUnit_Framework_Constrain
* a boolean value instead: true in case of success, false in case of a
* failure.
*
* @param mixed $other Value or object to evaluate.
* @param string $description Additional information about the test
* @param bool $returnResult Whether to return a result or throw an exception
* @param mixed $other Value or object to evaluate.
* @param string $description Additional information about the test
* @param bool $returnResult Whether to return a result or throw an exception
*
* @return mixed
*
* @throws PHPUnit_Framework_ExpectationFailedException
*/
public function evaluate($other, $description = '', $returnResult = false)
@@ -74,7 +76,8 @@ class PHPUnit_Framework_Constraint_Attribute extends PHPUnit_Framework_Constrain
* The beginning of failure messages is "Failed asserting that" in most
* cases. This method should return the second part of that sentence.
*
* @param mixed $other Evaluated value or object.
* @param mixed $other Evaluated value or object.
*
* @return string
*/
protected function failureDescription($other)

View File

@@ -16,7 +16,8 @@ class PHPUnit_Framework_Constraint_Callback extends PHPUnit_Framework_Constraint
private $callback;
/**
* @param callable $callback
* @param callable $callback
*
* @throws PHPUnit_Framework_Exception
*/
public function __construct($callback)
@@ -37,7 +38,8 @@ class PHPUnit_Framework_Constraint_Callback extends PHPUnit_Framework_Constraint
* Evaluates the constraint for parameter $value. Returns true if the
* constraint is met, false otherwise.
*
* @param mixed $other Value or object to evaluate.
* @param mixed $other Value or object to evaluate.
*
* @return bool
*/
protected function matches($other)

View File

@@ -36,7 +36,8 @@ class PHPUnit_Framework_Constraint_ClassHasAttribute extends PHPUnit_Framework_C
* Evaluates the constraint for parameter $other. Returns true if the
* constraint is met, false otherwise.
*
* @param mixed $other Value or object to evaluate.
* @param mixed $other Value or object to evaluate.
*
* @return bool
*/
protected function matches($other)
@@ -65,7 +66,8 @@ class PHPUnit_Framework_Constraint_ClassHasAttribute extends PHPUnit_Framework_C
* The beginning of failure messages is "Failed asserting that" in most
* cases. This method should return the second part of that sentence.
*
* @param mixed $other Evaluated value or object.
* @param mixed $other Evaluated value or object.
*
* @return string
*/
protected function failureDescription($other)

View File

@@ -22,7 +22,8 @@ class PHPUnit_Framework_Constraint_ClassHasStaticAttribute extends PHPUnit_Frame
* Evaluates the constraint for parameter $other. Returns true if the
* constraint is met, false otherwise.
*
* @param mixed $other Value or object to evaluate.
* @param mixed $other Value or object to evaluate.
*
* @return bool
*/
protected function matches($other)
@@ -42,6 +43,7 @@ class PHPUnit_Framework_Constraint_ClassHasStaticAttribute extends PHPUnit_Frame
* Returns a string representation of the constraint.
*
* @return string
*
* @since Method available since Release 3.3.0
*/
public function toString()

View File

@@ -37,10 +37,12 @@ abstract class PHPUnit_Framework_Constraint_Composite extends PHPUnit_Framework_
* a boolean value instead: true in case of success, false in case of a
* failure.
*
* @param mixed $other Value or object to evaluate.
* @param string $description Additional information about the test
* @param bool $returnResult Whether to return a result or throw an exception
* @param mixed $other Value or object to evaluate.
* @param string $description Additional information about the test
* @param bool $returnResult Whether to return a result or throw an exception
*
* @return mixed
*
* @throws PHPUnit_Framework_ExpectationFailedException
*/
public function evaluate($other, $description = '', $returnResult = false)

View File

@@ -31,7 +31,8 @@ class PHPUnit_Framework_Constraint_Count extends PHPUnit_Framework_Constraint
* Evaluates the constraint for parameter $other. Returns true if the
* constraint is met, false otherwise.
*
* @param mixed $other
* @param mixed $other
*
* @return bool
*/
protected function matches($other)
@@ -40,7 +41,8 @@ class PHPUnit_Framework_Constraint_Count extends PHPUnit_Framework_Constraint
}
/**
* @param mixed $other
* @param mixed $other
*
* @return bool
*/
protected function getCountOf($other)
@@ -76,7 +78,8 @@ class PHPUnit_Framework_Constraint_Count extends PHPUnit_Framework_Constraint
* The beginning of failure messages is "Failed asserting that" in most
* cases. This method should return the second part of that sentence.
*
* @param mixed $other Evaluated value or object.
* @param mixed $other Evaluated value or object.
*
* @return string
*/
protected function failureDescription($other)

View File

@@ -31,7 +31,8 @@ class PHPUnit_Framework_Constraint_Exception extends PHPUnit_Framework_Constrain
* Evaluates the constraint for parameter $other. Returns true if the
* constraint is met, false otherwise.
*
* @param mixed $other Value or object to evaluate.
* @param mixed $other Value or object to evaluate.
*
* @return bool
*/
protected function matches($other)
@@ -45,7 +46,8 @@ class PHPUnit_Framework_Constraint_Exception extends PHPUnit_Framework_Constrain
* The beginning of failure messages is "Failed asserting that" in most
* cases. This method should return the second part of that sentence.
*
* @param mixed $other Evaluated value or object.
* @param mixed $other Evaluated value or object.
*
* @return string
*/
protected function failureDescription($other)

View File

@@ -31,7 +31,8 @@ class PHPUnit_Framework_Constraint_ExceptionCode extends PHPUnit_Framework_Const
* Evaluates the constraint for parameter $other. Returns true if the
* constraint is met, false otherwise.
*
* @param Exception $other
* @param Exception $other
*
* @return bool
*/
protected function matches($other)
@@ -45,7 +46,8 @@ class PHPUnit_Framework_Constraint_ExceptionCode extends PHPUnit_Framework_Const
* The beginning of failure messages is "Failed asserting that" in most
* cases. This method should return the second part of that sentence.
*
* @param mixed $other Evaluated value or object.
* @param mixed $other Evaluated value or object.
*
* @return string
*/
protected function failureDescription($other)

View File

@@ -31,7 +31,8 @@ class PHPUnit_Framework_Constraint_ExceptionMessage extends PHPUnit_Framework_Co
* Evaluates the constraint for parameter $other. Returns true if the
* constraint is met, false otherwise.
*
* @param Exception $other
* @param Exception $other
*
* @return bool
*/
protected function matches($other)
@@ -45,7 +46,8 @@ class PHPUnit_Framework_Constraint_ExceptionMessage extends PHPUnit_Framework_Co
* The beginning of failure messages is "Failed asserting that" in most
* cases. This method should return the second part of that sentence.
*
* @param mixed $other Evaluated value or object.
* @param mixed $other Evaluated value or object.
*
* @return string
*/
protected function failureDescription($other)

View File

@@ -31,7 +31,8 @@ class PHPUnit_Framework_Constraint_ExceptionMessageRegExp extends PHPUnit_Framew
* Evaluates the constraint for parameter $other. Returns true if the
* constraint is met, false otherwise.
*
* @param Exception $other
* @param Exception $other
*
* @return bool
*/
protected function matches($other)
@@ -53,7 +54,8 @@ class PHPUnit_Framework_Constraint_ExceptionMessageRegExp extends PHPUnit_Framew
* The beginning of failure messages is "Failed asserting that" in most
* cases. This method should return the second part of that sentence.
*
* @param mixed $other Evaluated value or object.
* @param mixed $other Evaluated value or object.
*
* @return string
*/
protected function failureDescription($other)

View File

@@ -21,7 +21,8 @@ class PHPUnit_Framework_Constraint_FileExists extends PHPUnit_Framework_Constrai
* Evaluates the constraint for parameter $other. Returns true if the
* constraint is met, false otherwise.
*
* @param mixed $other Value or object to evaluate.
* @param mixed $other Value or object to evaluate.
*
* @return bool
*/
protected function matches($other)
@@ -35,7 +36,8 @@ class PHPUnit_Framework_Constraint_FileExists extends PHPUnit_Framework_Constrai
* The beginning of failure messages is "Failed asserting that" in most
* cases. This method should return the second part of that sentence.
*
* @param mixed $other Evaluated value or object.
* @param mixed $other Evaluated value or object.
*
* @return string
*/
protected function failureDescription($other)

View File

@@ -34,7 +34,8 @@ class PHPUnit_Framework_Constraint_GreaterThan extends PHPUnit_Framework_Constra
* Evaluates the constraint for parameter $other. Returns true if the
* constraint is met, false otherwise.
*
* @param mixed $other Value or object to evaluate.
* @param mixed $other Value or object to evaluate.
*
* @return bool
*/
protected function matches($other)

View File

@@ -25,10 +25,12 @@ class PHPUnit_Framework_Constraint_IsAnything extends PHPUnit_Framework_Constrai
* a boolean value instead: true in case of success, false in case of a
* failure.
*
* @param mixed $other Value or object to evaluate.
* @param string $description Additional information about the test
* @param bool $returnResult Whether to return a result or throw an exception
* @param mixed $other Value or object to evaluate.
* @param string $description Additional information about the test
* @param bool $returnResult Whether to return a result or throw an exception
*
* @return mixed
*
* @throws PHPUnit_Framework_ExpectationFailedException
*/
public function evaluate($other, $description = '', $returnResult = false)
@@ -50,6 +52,7 @@ class PHPUnit_Framework_Constraint_IsAnything extends PHPUnit_Framework_Constrai
* Counts the number of constraint elements.
*
* @return int
*
* @since Method available since Release 3.5.0
*/
public function count()

View File

@@ -19,7 +19,8 @@ class PHPUnit_Framework_Constraint_IsEmpty extends PHPUnit_Framework_Constraint
* Evaluates the constraint for parameter $other. Returns true if the
* constraint is met, false otherwise.
*
* @param mixed $other Value or object to evaluate.
* @param mixed $other Value or object to evaluate.
*
* @return bool
*/
protected function matches($other)
@@ -47,7 +48,8 @@ class PHPUnit_Framework_Constraint_IsEmpty extends PHPUnit_Framework_Constraint
* The beginning of failure messages is "Failed asserting that" in most
* cases. This method should return the second part of that sentence.
*
* @param mixed $other Evaluated value or object.
* @param mixed $other Evaluated value or object.
*
* @return string
*/
protected function failureDescription($other)

View File

@@ -52,11 +52,12 @@ class PHPUnit_Framework_Constraint_IsEqual extends PHPUnit_Framework_Constraint
protected $lastFailure;
/**
* @param mixed $value
* @param float $delta
* @param int $maxDepth
* @param bool $canonicalize
* @param bool $ignoreCase
* @param mixed $value
* @param float $delta
* @param int $maxDepth
* @param bool $canonicalize
* @param bool $ignoreCase
*
* @throws PHPUnit_Framework_Exception
*/
public function __construct($value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
@@ -96,10 +97,12 @@ class PHPUnit_Framework_Constraint_IsEqual extends PHPUnit_Framework_Constraint
* a boolean value instead: true in case of success, false in case of a
* failure.
*
* @param mixed $other Value or object to evaluate.
* @param string $description Additional information about the test
* @param bool $returnResult Whether to return a result or throw an exception
* @param mixed $other Value or object to evaluate.
* @param string $description Additional information about the test
* @param bool $returnResult Whether to return a result or throw an exception
*
* @return mixed
*
* @throws PHPUnit_Framework_ExpectationFailedException
*/
public function evaluate($other, $description = '', $returnResult = false)

View File

@@ -19,7 +19,8 @@ class PHPUnit_Framework_Constraint_IsFalse extends PHPUnit_Framework_Constraint
* Evaluates the constraint for parameter $other. Returns true if the
* constraint is met, false otherwise.
*
* @param mixed $other Value or object to evaluate.
* @param mixed $other Value or object to evaluate.
*
* @return bool
*/
protected function matches($other)

View File

@@ -52,10 +52,12 @@ class PHPUnit_Framework_Constraint_IsIdentical extends PHPUnit_Framework_Constra
* a boolean value instead: true in case of success, false in case of a
* failure.
*
* @param mixed $other Value or object to evaluate.
* @param string $description Additional information about the test
* @param bool $returnResult Whether to return a result or throw an exception
* @param mixed $other Value or object to evaluate.
* @param string $description Additional information about the test
* @param bool $returnResult Whether to return a result or throw an exception
*
* @return mixed
*
* @throws PHPUnit_Framework_ExpectationFailedException
*/
public function evaluate($other, $description = '', $returnResult = false)
@@ -95,7 +97,8 @@ class PHPUnit_Framework_Constraint_IsIdentical extends PHPUnit_Framework_Constra
* The beginning of failure messages is "Failed asserting that" in most
* cases. This method should return the second part of that sentence.
*
* @param mixed $other Evaluated value or object.
* @param mixed $other Evaluated value or object.
*
* @return string
*/
protected function failureDescription($other)

View File

@@ -36,7 +36,8 @@ class PHPUnit_Framework_Constraint_IsInstanceOf extends PHPUnit_Framework_Constr
* Evaluates the constraint for parameter $other. Returns true if the
* constraint is met, false otherwise.
*
* @param mixed $other Value or object to evaluate.
* @param mixed $other Value or object to evaluate.
*
* @return bool
*/
protected function matches($other)
@@ -50,7 +51,8 @@ class PHPUnit_Framework_Constraint_IsInstanceOf extends PHPUnit_Framework_Constr
* The beginning of failure messages is "Failed asserting that" in most
* cases. This method should return the second part of that sentence.
*
* @param mixed $other Evaluated value or object.
* @param mixed $other Evaluated value or object.
*
* @return string
*/
protected function failureDescription($other)

View File

@@ -19,7 +19,8 @@ class PHPUnit_Framework_Constraint_IsJson extends PHPUnit_Framework_Constraint
* Evaluates the constraint for parameter $other. Returns true if the
* constraint is met, false otherwise.
*
* @param mixed $other Value or object to evaluate.
* @param mixed $other Value or object to evaluate.
*
* @return bool
*/
protected function matches($other)
@@ -38,7 +39,8 @@ class PHPUnit_Framework_Constraint_IsJson extends PHPUnit_Framework_Constraint
* The beginning of failure messages is "Failed asserting that" in most
* cases. This method should return the second part of that sentence.
*
* @param mixed $other Evaluated value or object.
* @param mixed $other Evaluated value or object.
*
* @return string
*/
protected function failureDescription($other)

View File

@@ -19,7 +19,8 @@ class PHPUnit_Framework_Constraint_IsNull extends PHPUnit_Framework_Constraint
* Evaluates the constraint for parameter $other. Returns true if the
* constraint is met, false otherwise.
*
* @param mixed $other Value or object to evaluate.
* @param mixed $other Value or object to evaluate.
*
* @return bool
*/
protected function matches($other)

View File

@@ -19,7 +19,8 @@ class PHPUnit_Framework_Constraint_IsTrue extends PHPUnit_Framework_Constraint
* Evaluates the constraint for parameter $other. Returns true if the
* constraint is met, false otherwise.
*
* @param mixed $other Value or object to evaluate.
* @param mixed $other Value or object to evaluate.
*
* @return bool
*/
protected function matches($other)

View File

@@ -57,7 +57,8 @@ class PHPUnit_Framework_Constraint_IsType extends PHPUnit_Framework_Constraint
protected $type;
/**
* @param string $type
* @param string $type
*
* @throws PHPUnit_Framework_Exception
*/
public function __construct($type)
@@ -81,7 +82,8 @@ class PHPUnit_Framework_Constraint_IsType extends PHPUnit_Framework_Constraint
* Evaluates the constraint for parameter $other. Returns true if the
* constraint is met, false otherwise.
*
* @param mixed $other Value or object to evaluate.
* @param mixed $other Value or object to evaluate.
*
* @return bool
*/
protected function matches($other)

View File

@@ -37,7 +37,8 @@ class PHPUnit_Framework_Constraint_JsonMatches extends PHPUnit_Framework_Constra
*
* This method can be overridden to implement the evaluation algorithm.
*
* @param mixed $other Value or object to evaluate.
* @param mixed $other Value or object to evaluate.
*
* @return bool
*/
protected function matches($other)

View File

@@ -18,8 +18,9 @@ class PHPUnit_Framework_Constraint_JsonMatches_ErrorMessageProvider
/**
* Translates JSON error to a human readable string.
*
* @param string $error
* @param string $prefix
* @param string $error
* @param string $prefix
*
* @return string
*/
public static function determineJsonError($error, $prefix = '')
@@ -45,7 +46,8 @@ class PHPUnit_Framework_Constraint_JsonMatches_ErrorMessageProvider
/**
* Translates a given type to a human readable message prefix.
*
* @param string $type
* @param string $type
*
* @return string
*/
public static function translateTypeToPrefix($type)

View File

@@ -34,7 +34,8 @@ class PHPUnit_Framework_Constraint_LessThan extends PHPUnit_Framework_Constraint
* Evaluates the constraint for parameter $other. Returns true if the
* constraint is met, false otherwise.
*
* @param mixed $other Value or object to evaluate.
* @param mixed $other Value or object to evaluate.
*
* @return bool
*/
protected function matches($other)

View File

@@ -35,7 +35,8 @@ class PHPUnit_Framework_Constraint_Not extends PHPUnit_Framework_Constraint
}
/**
* @param string $string
* @param string $string
*
* @return string
*/
public static function negate($string)
@@ -79,10 +80,12 @@ class PHPUnit_Framework_Constraint_Not extends PHPUnit_Framework_Constraint
* a boolean value instead: true in case of success, false in case of a
* failure.
*
* @param mixed $other Value or object to evaluate.
* @param string $description Additional information about the test
* @param bool $returnResult Whether to return a result or throw an exception
* @param mixed $other Value or object to evaluate.
* @param string $description Additional information about the test
* @param bool $returnResult Whether to return a result or throw an exception
*
* @return mixed
*
* @throws PHPUnit_Framework_ExpectationFailedException
*/
public function evaluate($other, $description = '', $returnResult = false)
@@ -104,7 +107,8 @@ class PHPUnit_Framework_Constraint_Not extends PHPUnit_Framework_Constraint
* The beginning of failure messages is "Failed asserting that" in most
* cases. This method should return the second part of that sentence.
*
* @param mixed $other Evaluated value or object.
* @param mixed $other Evaluated value or object.
*
* @return string
*/
protected function failureDescription($other)
@@ -146,6 +150,7 @@ class PHPUnit_Framework_Constraint_Not extends PHPUnit_Framework_Constraint
* Counts the number of constraint elements.
*
* @return int
*
* @since Method available since Release 3.4.0
*/
public function count()

View File

@@ -22,7 +22,8 @@ class PHPUnit_Framework_Constraint_ObjectHasAttribute extends PHPUnit_Framework_
* Evaluates the constraint for parameter $other. Returns true if the
* constraint is met, false otherwise.
*
* @param mixed $other Value or object to evaluate.
* @param mixed $other Value or object to evaluate.
*
* @return bool
*/
protected function matches($other)

View File

@@ -48,10 +48,12 @@ class PHPUnit_Framework_Constraint_Or extends PHPUnit_Framework_Constraint
* a boolean value instead: true in case of success, false in case of a
* failure.
*
* @param mixed $other Value or object to evaluate.
* @param string $description Additional information about the test
* @param bool $returnResult Whether to return a result or throw an exception
* @param mixed $other Value or object to evaluate.
* @param string $description Additional information about the test
* @param bool $returnResult Whether to return a result or throw an exception
*
* @return mixed
*
* @throws PHPUnit_Framework_ExpectationFailedException
*/
public function evaluate($other, $description = '', $returnResult = false)
@@ -99,6 +101,7 @@ class PHPUnit_Framework_Constraint_Or extends PHPUnit_Framework_Constraint
* Counts the number of constraint elements.
*
* @return int
*
* @since Method available since Release 3.4.0
*/
public function count()

View File

@@ -39,7 +39,8 @@ class PHPUnit_Framework_Constraint_PCREMatch extends PHPUnit_Framework_Constrain
* Evaluates the constraint for parameter $other. Returns true if the
* constraint is met, false otherwise.
*
* @param mixed $other Value or object to evaluate.
* @param mixed $other Value or object to evaluate.
*
* @return bool
*/
protected function matches($other)

View File

@@ -47,7 +47,8 @@ class PHPUnit_Framework_Constraint_StringContains extends PHPUnit_Framework_Cons
* Evaluates the constraint for parameter $other. Returns true if the
* constraint is met, false otherwise.
*
* @param mixed $other Value or object to evaluate.
* @param mixed $other Value or object to evaluate.
*
* @return bool
*/
protected function matches($other)

View File

@@ -34,7 +34,8 @@ class PHPUnit_Framework_Constraint_StringEndsWith extends PHPUnit_Framework_Cons
* Evaluates the constraint for parameter $other. Returns true if the
* constraint is met, false otherwise.
*
* @param mixed $other Value or object to evaluate.
* @param mixed $other Value or object to evaluate.
*
* @return bool
*/
protected function matches($other)

View File

@@ -34,7 +34,8 @@ class PHPUnit_Framework_Constraint_StringStartsWith extends PHPUnit_Framework_Co
* Evaluates the constraint for parameter $other. Returns true if the
* constraint is met, false otherwise.
*
* @param mixed $other Value or object to evaluate.
* @param mixed $other Value or object to evaluate.
*
* @return bool
*/
protected function matches($other)

View File

@@ -32,9 +32,10 @@ class PHPUnit_Framework_Constraint_TraversableContains extends PHPUnit_Framework
protected $value;
/**
* @param mixed $value
* @param bool $checkForObjectIdentity
* @param bool $checkForNonObjectIdentity
* @param mixed $value
* @param bool $checkForObjectIdentity
* @param bool $checkForNonObjectIdentity
*
* @throws PHPUnit_Framework_Exception
*/
public function __construct($value, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
@@ -58,7 +59,8 @@ class PHPUnit_Framework_Constraint_TraversableContains extends PHPUnit_Framework
* Evaluates the constraint for parameter $other. Returns true if the
* constraint is met, false otherwise.
*
* @param mixed $other Value or object to evaluate.
* @param mixed $other Value or object to evaluate.
*
* @return bool
*/
protected function matches($other)
@@ -110,7 +112,8 @@ class PHPUnit_Framework_Constraint_TraversableContains extends PHPUnit_Framework
* The beginning of failure messages is "Failed asserting that" in most
* cases. This method should return the second part of that sentence.
*
* @param mixed $other Evaluated value or object.
* @param mixed $other Evaluated value or object.
*
* @return string
*/
protected function failureDescription($other)

View File

@@ -55,10 +55,12 @@ class PHPUnit_Framework_Constraint_TraversableContainsOnly extends PHPUnit_Frame
* a boolean value instead: true in case of success, false in case of a
* failure.
*
* @param mixed $other Value or object to evaluate.
* @param string $description Additional information about the test
* @param bool $returnResult Whether to return a result or throw an exception
* @param mixed $other Value or object to evaluate.
* @param string $description Additional information about the test
* @param bool $returnResult Whether to return a result or throw an exception
*
* @return mixed
*
* @throws PHPUnit_Framework_ExpectationFailedException
*/
public function evaluate($other, $description = '', $returnResult = false)

View File

@@ -48,10 +48,12 @@ class PHPUnit_Framework_Constraint_Xor extends PHPUnit_Framework_Constraint
* a boolean value instead: true in case of success, false in case of a
* failure.
*
* @param mixed $other Value or object to evaluate.
* @param string $description Additional information about the test
* @param bool $returnResult Whether to return a result or throw an exception
* @param mixed $other Value or object to evaluate.
* @param string $description Additional information about the test
* @param bool $returnResult Whether to return a result or throw an exception
*
* @return mixed
*
* @throws PHPUnit_Framework_ExpectationFailedException
*/
public function evaluate($other, $description = '', $returnResult = false)
@@ -104,6 +106,7 @@ class PHPUnit_Framework_Constraint_Xor extends PHPUnit_Framework_Constraint
* Counts the number of constraint elements.
*
* @return int
*
* @since Method available since Release 3.4.0
*/
public function count()

View File

@@ -27,7 +27,6 @@
* the parent would break the intended encapsulation of process isolation.
*
* @see http://fabien.potencier.org/article/9/php-serialization-stack-traces-and-exceptions
*
* @since Class available since Release 3.4.0
*/
class PHPUnit_Framework_Exception extends RuntimeException implements PHPUnit_Exception

View File

@@ -18,7 +18,8 @@ interface PHPUnit_Framework_Test extends Countable
/**
* Runs a test and collects its result in a TestResult instance.
*
* @param PHPUnit_Framework_TestResult $result
* @param PHPUnit_Framework_TestResult $result
*
* @return PHPUnit_Framework_TestResult
*/
public function run(PHPUnit_Framework_TestResult $result = null);

View File

@@ -313,6 +313,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
* Returns the annotations for this test.
*
* @return array
*
* @since Method available since Release 3.4.0
*/
public function getAnnotations()
@@ -326,7 +327,8 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
/**
* Gets the name of a TestCase.
*
* @param bool $withDataSet
* @param bool $withDataSet
*
* @return string
*/
public function getName($withDataSet = true)
@@ -342,6 +344,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
* Returns the size of the test.
*
* @return int
*
* @since Method available since Release 3.6.0
*/
public function getSize()
@@ -354,6 +357,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
/**
* @return string
*
* @since Method available since Release 3.6.0
*/
public function getActualOutput()
@@ -367,6 +371,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
/**
* @return bool
*
* @since Method available since Release 3.6.0
*/
public function hasOutput()
@@ -384,7 +389,9 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
/**
* @param string $expectedRegex
*
* @since Method available since Release 3.6.0
*
* @throws PHPUnit_Framework_Exception
*/
public function expectOutputRegex($expectedRegex)
@@ -400,6 +407,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
/**
* @param string $expectedString
*
* @since Method available since Release 3.6.0
*/
public function expectOutputString($expectedString)
@@ -415,6 +423,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
/**
* @return bool
*
* @since Method available since Release 3.6.5
* @deprecated
*/
@@ -425,6 +434,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
/**
* @return bool
*
* @since Method available since Release 4.3.3
*/
public function hasExpectationOnOutput()
@@ -434,6 +444,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
/**
* @return string
*
* @since Method available since Release 3.2.0
*/
public function getExpectedException()
@@ -445,6 +456,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
* @param mixed $exceptionName
* @param string $exceptionMessage
* @param int $exceptionCode
*
* @since Method available since Release 3.2.0
*/
public function setExpectedException($exceptionName, $exceptionMessage = '', $exceptionCode = null)
@@ -458,6 +470,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
* @param mixed $exceptionName
* @param string $exceptionMessageRegExp
* @param int $exceptionCode
*
* @since Method available since Release 4.3.0
*/
public function setExpectedExceptionRegExp($exceptionName, $exceptionMessageRegExp = '', $exceptionCode = null)
@@ -499,6 +512,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
/**
* @param bool $useErrorHandler
*
* @since Method available since Release 3.4.0
*/
public function setUseErrorHandler($useErrorHandler)
@@ -547,6 +561,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
* Returns the status of this test.
*
* @return int
*
* @since Method available since Release 3.1.0
*/
public function getStatus()
@@ -558,6 +573,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
* Returns the status message of this test.
*
* @return string
*
* @since Method available since Release 3.3.0
*/
public function getStatusMessage()
@@ -569,6 +585,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
* Returns whether or not this test has failed.
*
* @return bool
*
* @since Method available since Release 3.0.0
*/
public function hasFailed()
@@ -583,8 +600,10 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
* Runs the test case and collects the results in a TestResult object.
* If no TestResult object is passed a new one will be created.
*
* @param PHPUnit_Framework_TestResult $result
* @param PHPUnit_Framework_TestResult $result
*
* @return PHPUnit_Framework_TestResult
*
* @throws PHPUnit_Framework_Exception
*/
public function run(PHPUnit_Framework_TestResult $result = null)
@@ -670,6 +689,8 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
$includePath = "'." . $includePath . ".'";
$codeCoverageFilter = "'." . $codeCoverageFilter . ".'";
$configurationFilePath = (isset($GLOBALS['__PHPUNIT_CONFIGURATION_FILE']) ? $GLOBALS['__PHPUNIT_CONFIGURATION_FILE'] : '');
$template->setVar(
array(
'composerAutoload' => $composerAutoload,
@@ -690,7 +711,8 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
'isStrictAboutOutputDuringTests' => $isStrictAboutOutputDuringTests,
'isStrictAboutTestSize' => $isStrictAboutTestSize,
'isStrictAboutTodoAnnotatedTests' => $isStrictAboutTodoAnnotatedTests,
'codeCoverageFilter' => $codeCoverageFilter
'codeCoverageFilter' => $codeCoverageFilter,
'configurationFilePath' => $configurationFilePath
)
);
@@ -848,6 +870,11 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
$e = new PHPUnit_Framework_AssertionFailedError($e->getMessage());
}
if (!$e instanceof Exception) {
// Rethrow Error directly on PHP 7 as onNotSuccessfulTest does not support it
throw $e;
}
$this->onNotSuccessfulTest($e);
}
}
@@ -856,6 +883,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
* Override to run the test and assert its state.
*
* @return mixed
*
* @throws Exception|PHPUnit_Framework_Exception
* @throws PHPUnit_Framework_Exception
*/
@@ -1010,6 +1038,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
* Sets the dependencies of a TestCase.
*
* @param array $dependencies
*
* @since Method available since Release 3.4.0
*/
public function setDependencies(array $dependencies)
@@ -1021,6 +1050,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
* Returns true if the tests has dependencies
*
* @return bool
*
* @since Method available since Release 4.0.0
*/
public function hasDependencies()
@@ -1032,6 +1062,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
* Sets
*
* @param array $dependencyInput
*
* @since Method available since Release 3.4.0
*/
public function setDependencyInput(array $dependencyInput)
@@ -1041,6 +1072,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
/**
* @param bool $disallowChangesToGlobalState
*
* @since Method available since Release 4.6.0
*/
public function setDisallowChangesToGlobalState($disallowChangesToGlobalState)
@@ -1052,6 +1084,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
* Calling this method in setUp() has no effect!
*
* @param bool $backupGlobals
*
* @since Method available since Release 3.3.0
*/
public function setBackupGlobals($backupGlobals)
@@ -1065,6 +1098,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
* Calling this method in setUp() has no effect!
*
* @param bool $backupStaticAttributes
*
* @since Method available since Release 3.4.0
*/
public function setBackupStaticAttributes($backupStaticAttributes)
@@ -1076,8 +1110,10 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
}
/**
* @param bool $runTestInSeparateProcess
* @param bool $runTestInSeparateProcess
*
* @throws PHPUnit_Framework_Exception
*
* @since Method available since Release 3.4.0
*/
public function setRunTestInSeparateProcess($runTestInSeparateProcess)
@@ -1092,8 +1128,10 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
}
/**
* @param bool $preserveGlobalState
* @param bool $preserveGlobalState
*
* @throws PHPUnit_Framework_Exception
*
* @since Method available since Release 3.4.0
*/
public function setPreserveGlobalState($preserveGlobalState)
@@ -1106,8 +1144,10 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
}
/**
* @param bool $inIsolation
* @param bool $inIsolation
*
* @throws PHPUnit_Framework_Exception
*
* @since Method available since Release 3.4.0
*/
public function setInIsolation($inIsolation)
@@ -1121,6 +1161,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
/**
* @return bool
*
* @since Method available since Release 4.3.0
*/
public function isInIsolation()
@@ -1130,6 +1171,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
/**
* @return mixed
*
* @since Method available since Release 3.4.0
*/
public function getResult()
@@ -1139,6 +1181,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
/**
* @param mixed $result
*
* @since Method available since Release 3.4.0
*/
public function setResult($result)
@@ -1147,8 +1190,10 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
}
/**
* @param callable $callback
* @param callable $callback
*
* @throws PHPUnit_Framework_Exception
*
* @since Method available since Release 3.6.0
*/
public function setOutputCallback($callback)
@@ -1162,6 +1207,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
/**
* @return PHPUnit_Framework_TestResult
*
* @since Method available since Release 3.5.7
*/
public function getTestResultObject()
@@ -1171,6 +1217,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
/**
* @param PHPUnit_Framework_TestResult $result
*
* @since Method available since Release 3.6.0
*/
public function setTestResultObject(PHPUnit_Framework_TestResult $result)
@@ -1183,9 +1230,11 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
* resets the modified php.ini setting to its original value after the
* test is run.
*
* @param string $varName
* @param string $newValue
* @param string $varName
* @param string $newValue
*
* @throws PHPUnit_Framework_Exception
*
* @since Method available since Release 3.0.0
*/
protected function iniSet($varName, $newValue)
@@ -1213,9 +1262,11 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
* This method is a wrapper for the setlocale() function that automatically
* resets the locale to its original value after the test is run.
*
* @param int $category
* @param string $locale
* @param int $category
* @param string $locale
*
* @throws PHPUnit_Framework_Exception
*
* @since Method available since Release 3.1.0
*/
protected function setLocale()
@@ -1261,20 +1312,23 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
/**
* Returns a mock object for the specified class.
*
* @param string $originalClassName Name of the class to mock.
* @param array|null $methods When provided, only methods whose names are in the array
* are replaced with a configurable test double. The behavior
* of the other methods is not changed.
* Providing null means that no methods will be replaced.
* @param array $arguments Parameters to pass to the original class' constructor.
* @param string $mockClassName Class name for the generated test double class.
* @param bool $callOriginalConstructor Can be used to disable the call to the original class' constructor.
* @param bool $callOriginalClone Can be used to disable the call to the original class' clone constructor.
* @param bool $callAutoload Can be used to disable __autoload() during the generation of the test double class.
* @param bool $cloneArguments
* @param bool $callOriginalMethods
* @param string $originalClassName Name of the class to mock.
* @param array|null $methods When provided, only methods whose names are in the array
* are replaced with a configurable test double. The behavior
* of the other methods is not changed.
* Providing null means that no methods will be replaced.
* @param array $arguments Parameters to pass to the original class' constructor.
* @param string $mockClassName Class name for the generated test double class.
* @param bool $callOriginalConstructor Can be used to disable the call to the original class' constructor.
* @param bool $callOriginalClone Can be used to disable the call to the original class' clone constructor.
* @param bool $callAutoload Can be used to disable __autoload() during the generation of the test double class.
* @param bool $cloneArguments
* @param bool $callOriginalMethods
*
* @return PHPUnit_Framework_MockObject_MockObject
*
* @throws PHPUnit_Framework_Exception
*
* @since Method available since Release 3.0.0
*/
public function getMock($originalClassName, $methods = array(), array $arguments = array(), $mockClassName = '', $callOriginalConstructor = true, $callOriginalClone = true, $callAutoload = true, $cloneArguments = false, $callOriginalMethods = false)
@@ -1299,8 +1353,10 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
/**
* Returns a builder object to create mock objects using a fluent interface.
*
* @param string $className
* @param string $className
*
* @return PHPUnit_Framework_MockObject_MockBuilder
*
* @since Method available since Release 3.5.0
*/
public function getMockBuilder($className)
@@ -1311,16 +1367,19 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
/**
* Mocks the specified class and returns the name of the mocked class.
*
* @param string $originalClassName
* @param array $methods
* @param array $arguments
* @param string $mockClassName
* @param bool $callOriginalConstructor
* @param bool $callOriginalClone
* @param bool $callAutoload
* @param bool $cloneArguments
* @param string $originalClassName
* @param array $methods
* @param array $arguments
* @param string $mockClassName
* @param bool $callOriginalConstructor
* @param bool $callOriginalClone
* @param bool $callAutoload
* @param bool $cloneArguments
*
* @return string
*
* @throws PHPUnit_Framework_Exception
*
* @since Method available since Release 3.5.0
*/
protected function getMockClass($originalClassName, $methods = array(), array $arguments = array(), $mockClassName = '', $callOriginalConstructor = false, $callOriginalClone = true, $callAutoload = true, $cloneArguments = false)
@@ -1344,16 +1403,19 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
* methods of the class mocked. Concrete methods are not mocked by default.
* To mock concrete methods, use the 7th parameter ($mockedMethods).
*
* @param string $originalClassName
* @param array $arguments
* @param string $mockClassName
* @param bool $callOriginalConstructor
* @param bool $callOriginalClone
* @param bool $callAutoload
* @param array $mockedMethods
* @param bool $cloneArguments
* @param string $originalClassName
* @param array $arguments
* @param string $mockClassName
* @param bool $callOriginalConstructor
* @param bool $callOriginalClone
* @param bool $callAutoload
* @param array $mockedMethods
* @param bool $cloneArguments
*
* @return PHPUnit_Framework_MockObject_MockObject
*
* @since Method available since Release 3.4.0
*
* @throws PHPUnit_Framework_Exception
*/
public function getMockForAbstractClass($originalClassName, array $arguments = array(), $mockClassName = '', $callOriginalConstructor = true, $callOriginalClone = true, $callAutoload = true, $mockedMethods = array(), $cloneArguments = false)
@@ -1377,13 +1439,15 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
/**
* Returns a mock object based on the given WSDL file.
*
* @param string $wsdlFile
* @param string $originalClassName
* @param string $mockClassName
* @param array $methods
* @param bool $callOriginalConstructor
* @param array $options An array of options passed to SOAPClient::_construct
* @param string $wsdlFile
* @param string $originalClassName
* @param string $mockClassName
* @param array $methods
* @param bool $callOriginalConstructor
* @param array $options An array of options passed to SOAPClient::_construct
*
* @return PHPUnit_Framework_MockObject_MockObject
*
* @since Method available since Release 3.4.0
*/
protected function getMockFromWsdl($wsdlFile, $originalClassName = '', $mockClassName = '', array $methods = array(), $callOriginalConstructor = true, array $options = array())
@@ -1419,16 +1483,19 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
* of the trait mocked. Concrete methods to mock can be specified with the
* `$mockedMethods` parameter.
*
* @param string $traitName
* @param array $arguments
* @param string $mockClassName
* @param bool $callOriginalConstructor
* @param bool $callOriginalClone
* @param bool $callAutoload
* @param array $mockedMethods
* @param bool $cloneArguments
* @param string $traitName
* @param array $arguments
* @param string $mockClassName
* @param bool $callOriginalConstructor
* @param bool $callOriginalClone
* @param bool $callAutoload
* @param array $mockedMethods
* @param bool $cloneArguments
*
* @return PHPUnit_Framework_MockObject_MockObject
*
* @since Method available since Release 4.0.0
*
* @throws PHPUnit_Framework_Exception
*/
public function getMockForTrait($traitName, array $arguments = array(), $mockClassName = '', $callOriginalConstructor = true, $callOriginalClone = true, $callAutoload = true, $mockedMethods = array(), $cloneArguments = false)
@@ -1452,15 +1519,18 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
/**
* Returns an object for the specified trait.
*
* @param string $traitName
* @param array $arguments
* @param string $traitClassName
* @param bool $callOriginalConstructor
* @param bool $callOriginalClone
* @param bool $callAutoload
* @param bool $cloneArguments
* @param string $traitName
* @param array $arguments
* @param string $traitClassName
* @param bool $callOriginalConstructor
* @param bool $callOriginalClone
* @param bool $callAutoload
* @param bool $cloneArguments
*
* @return object
*
* @since Method available since Release 3.6.0
*
* @throws PHPUnit_Framework_Exception
*/
protected function getObjectForTrait($traitName, array $arguments = array(), $traitClassName = '', $callOriginalConstructor = true, $callOriginalClone = true, $callAutoload = true, $cloneArguments = false)
@@ -1477,9 +1547,12 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
}
/**
* @param string|null $classOrInterface
* @param string|null $classOrInterface
*
* @return \Prophecy\Prophecy\ObjectProphecy
*
* @throws \LogicException
*
* @since Method available since Release 4.5.0
*/
protected function prophesize($classOrInterface = null)
@@ -1491,6 +1564,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
* Adds a value to the assertion counter.
*
* @param int $count
*
* @since Method available since Release 3.3.3
*/
public function addToAssertionCount($count)
@@ -1502,6 +1576,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
* Returns the number of assertions performed by this test.
*
* @return int
*
* @since Method available since Release 3.3.0
*/
public function getNumAssertions()
@@ -1514,6 +1589,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
* zero or more times.
*
* @return PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount
*
* @since Method available since Release 3.0.0
*/
public static function any()
@@ -1525,6 +1601,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
* Returns a matcher that matches when the method is never executed.
*
* @return PHPUnit_Framework_MockObject_Matcher_InvokedCount
*
* @since Method available since Release 3.0.0
*/
public static function never()
@@ -1536,8 +1613,10 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
* Returns a matcher that matches when the method is executed
* at least N times.
*
* @param int $requiredInvocations
* @param int $requiredInvocations
*
* @return PHPUnit_Framework_MockObject_Matcher_InvokedAtLeastCount
*
* @since Method available since Release 4.2.0
*/
public static function atLeast($requiredInvocations)
@@ -1551,6 +1630,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
* Returns a matcher that matches when the method is executed at least once.
*
* @return PHPUnit_Framework_MockObject_Matcher_InvokedAtLeastOnce
*
* @since Method available since Release 3.0.0
*/
public static function atLeastOnce()
@@ -1562,6 +1642,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
* Returns a matcher that matches when the method is executed exactly once.
*
* @return PHPUnit_Framework_MockObject_Matcher_InvokedCount
*
* @since Method available since Release 3.0.0
*/
public static function once()
@@ -1573,8 +1654,10 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
* Returns a matcher that matches when the method is executed
* exactly $count times.
*
* @param int $count
* @param int $count
*
* @return PHPUnit_Framework_MockObject_Matcher_InvokedCount
*
* @since Method available since Release 3.0.0
*/
public static function exactly($count)
@@ -1586,8 +1669,10 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
* Returns a matcher that matches when the method is executed
* at most N times.
*
* @param int $allowedInvocations
* @param int $allowedInvocations
*
* @return PHPUnit_Framework_MockObject_Matcher_InvokedAtMostCount
*
* @since Method available since Release 4.2.0
*/
public static function atMost($allowedInvocations)
@@ -1601,8 +1686,10 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
* Returns a matcher that matches when the method is executed
* at the given index.
*
* @param int $index
* @param int $index
*
* @return PHPUnit_Framework_MockObject_Matcher_InvokedAtIndex
*
* @since Method available since Release 3.0.0
*/
public static function at($index)
@@ -1611,8 +1698,10 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
}
/**
* @param mixed $value
* @param mixed $value
*
* @return PHPUnit_Framework_MockObject_Stub_Return
*
* @since Method available since Release 3.0.0
*/
public static function returnValue($value)
@@ -1621,8 +1710,10 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
}
/**
* @param array $valueMap
* @param array $valueMap
*
* @return PHPUnit_Framework_MockObject_Stub_ReturnValueMap
*
* @since Method available since Release 3.6.0
*/
public static function returnValueMap(array $valueMap)
@@ -1631,8 +1722,10 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
}
/**
* @param int $argumentIndex
* @param int $argumentIndex
*
* @return PHPUnit_Framework_MockObject_Stub_ReturnArgument
*
* @since Method available since Release 3.3.0
*/
public static function returnArgument($argumentIndex)
@@ -1643,8 +1736,10 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
}
/**
* @param mixed $callback
* @param mixed $callback
*
* @return PHPUnit_Framework_MockObject_Stub_ReturnCallback
*
* @since Method available since Release 3.3.0
*/
public static function returnCallback($callback)
@@ -1658,6 +1753,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
* This method is useful when mocking a fluent interface.
*
* @return PHPUnit_Framework_MockObject_Stub_ReturnSelf
*
* @since Method available since Release 3.6.0
*/
public static function returnSelf()
@@ -1666,8 +1762,10 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
}
/**
* @param Exception $exception
* @param Exception $exception
*
* @return PHPUnit_Framework_MockObject_Stub_Exception
*
* @since Method available since Release 3.1.0
*/
public static function throwException(Exception $exception)
@@ -1676,8 +1774,10 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
}
/**
* @param mixed $value, ...
* @param mixed $value, ...
*
* @return PHPUnit_Framework_MockObject_Stub_ConsecutiveCalls
*
* @since Method available since Release 3.0.0
*/
public static function onConsecutiveCalls()
@@ -1690,8 +1790,10 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
/**
* Gets the data set description of a TestCase.
*
* @param bool $includeData
* @param bool $includeData
*
* @return string
*
* @since Method available since Release 3.3.0
*/
protected function getDataSetAsString($includeData = true)
@@ -1853,7 +1955,9 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
* This method is called when a test method did not execute successfully.
*
* @param Exception $e
*
* @since Method available since Release 3.4.0
*
* @throws Exception
*/
protected function onNotSuccessfulTest(Exception $e)
@@ -1865,6 +1969,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
* Performs custom preparations on the process isolation template.
*
* @param Text_Template $template
*
* @since Method available since Release 3.4.0
*/
protected function prepareTemplate(Text_Template $template)
@@ -1953,10 +2058,16 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
$backupGlobals = $this->backupGlobals === null || $this->backupGlobals === true;
if ($this->disallowChangesToGlobalState) {
$this->compareGlobalStateSnapshots(
$this->snapshot,
$this->createGlobalStateSnapshot($backupGlobals)
);
try {
$this->compareGlobalStateSnapshots(
$this->snapshot,
$this->createGlobalStateSnapshot($backupGlobals)
);
}
catch (PHPUnit_Framework_RiskyTestError $rte) {
// Intentionally left empty
}
}
$restorer = new Restorer;
@@ -1970,10 +2081,15 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
}
$this->snapshot = null;
if (isset($rte)) {
throw $rte;
}
}
/**
* @param bool $backupGlobals
* @param bool $backupGlobals
*
* @return Snapshot
*/
private function createGlobalStateSnapshot($backupGlobals)
@@ -2017,8 +2133,9 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
}
/**
* @param Snapshot $before
* @param Snapshot $after
* @param Snapshot $before
* @param Snapshot $after
*
* @throws PHPUnit_Framework_RiskyTestError
*/
private function compareGlobalStateSnapshots(Snapshot $before, Snapshot $after)
@@ -2049,9 +2166,10 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
}
/**
* @param array $before
* @param array $after
* @param string $header
* @param array $before
* @param array $after
* @param string $header
*
* @throws PHPUnit_Framework_RiskyTestError
*/
private function compareGlobalStateSnapshotPart(array $before, array $after, $header)
@@ -2073,6 +2191,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
/**
* @return Prophecy\Prophet
*
* @since Method available since Release 4.5.0
*/
private function getProphet()

View File

@@ -67,6 +67,7 @@ class PHPUnit_Framework_TestFailure
* Returns a description for the thrown exception.
*
* @return string
*
* @since Method available since Release 3.4.0
*/
public function getExceptionAsString()
@@ -77,8 +78,10 @@ class PHPUnit_Framework_TestFailure
/**
* Returns a description for an exception.
*
* @param Exception $e
* @param Exception $e
*
* @return string
*
* @since Method available since Release 3.2.0
*/
public static function exceptionToString(Exception $e)
@@ -108,6 +111,7 @@ class PHPUnit_Framework_TestFailure
* Returns the name of the failing test (including data set, if any).
*
* @return string
*
* @since Method available since Release 4.3.0
*/
public function getTestName()

View File

@@ -48,6 +48,7 @@ interface PHPUnit_Framework_TestListener
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param float $time
*
* @since Method available since Release 4.0.0
*/
public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time);
@@ -58,6 +59,7 @@ interface PHPUnit_Framework_TestListener
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param float $time
*
* @since Method available since Release 3.0.0
*/
public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time);
@@ -66,6 +68,7 @@ interface PHPUnit_Framework_TestListener
* A test suite started.
*
* @param PHPUnit_Framework_TestSuite $suite
*
* @since Method available since Release 2.2.0
*/
public function startTestSuite(PHPUnit_Framework_TestSuite $suite);
@@ -74,6 +77,7 @@ interface PHPUnit_Framework_TestListener
* A test suite ended.
*
* @param PHPUnit_Framework_TestSuite $suite
*
* @since Method available since Release 2.2.0
*/
public function endTestSuite(PHPUnit_Framework_TestSuite $suite);

Some files were not shown because too many files have changed in this diff Show More