Skip to content

Commit c85fcdc

Browse files
whatthejeffwhatthejeff
committed
1 parent 64efc1d commit c85fcdc

File tree

5 files changed

+55
-55
lines changed

5 files changed

+55
-55
lines changed

‎src/Framework/Constraint/ExceptionMessageRegExp.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
* @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
4141
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
4242
* @link http://www.phpunit.de/
43-
* @since File available since Release 3.6.6
43+
* @since File available since Release 4.3
4444
*/
4545

4646
/**
@@ -52,7 +52,7 @@
5252
* @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
5353
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
5454
* @link http://www.phpunit.de/
55-
* @since Class available since Release 4.0.20
55+
* @since Class available since Release 4.3
5656
*/
5757
class PHPUnit_Framework_Constraint_ExceptionMessageRegExp extends PHPUnit_Framework_Constraint
5858
{
@@ -80,10 +80,10 @@ public function __construct($expected)
8080
protected function matches($other)
8181
{
8282
$match = PHPUnit_Util_Regex::pregMatchSafe($this->expectedMessageRegExp, $other->getMessage());
83-
83+
8484
if(false === $match) {
8585
throw new PHPUnit_Framework_Exception (
86-
"Invalid expected exception message regex given: '{$this->expectedMessageRegExp}'"
86+
"Invalid expected exception message regex given: '{$this->expectedMessageRegExp}'"
8787
);
8888
}
8989

‎src/Framework/TestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ protected function setExpectedExceptionFromAnnotation()
498498
$expectedException['code']
499499
);
500500

501-
if(isset($expectedException['message_regex']) && ! empty($expectedException['message_regex'])) {
501+
if(!empty($expectedException['message_regex'])) {
502502
$this->setExpectedExceptionRegExp(
503503
$expectedException['class'],
504504
$expectedException['message_regex'],

‎src/Util/Test.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -151,19 +151,19 @@ public static function getLinesToBeUsed($className, $methodName)
151151
private static function getLinesToBeCoveredOrUsed($className, $methodName, $mode)
152152
{
153153
$annotations = self::parseTestMethodAnnotations(
154-
$className, $methodName
154+
$className, $methodName
155155
);
156156

157157
$classShortcut = null;
158158

159159
if (!empty($annotations['class'][$mode . 'DefaultClass'])) {
160160
if (count($annotations['class'][$mode . 'DefaultClass']) > 1) {
161161
throw new PHPUnit_Framework_CodeCoverageException(
162-
sprintf(
163-
'More than one @%sClass annotation in class or interface "%s".',
164-
$mode,
165-
$className
166-
)
162+
sprintf(
163+
'More than one @%sClass annotation in class or interface "%s".',
164+
$mode,
165+
$className
166+
)
167167
);
168168
}
169169

@@ -190,8 +190,8 @@ private static function getLinesToBeCoveredOrUsed($className, $methodName, $mode
190190
$element = preg_replace('/[\s()]+$/', '', $element);
191191

192192
$codeList = array_merge(
193-
$codeList,
194-
self::resolveElementToReflectionObjects($element)
193+
$codeList,
194+
self::resolveElementToReflectionObjects($element)
195195
);
196196
}
197197

@@ -322,21 +322,21 @@ public static function getExpectedException($className, $methodName)
322322
$message = trim($matches[2]);
323323
} elseif (isset($annotations['method']['expectedExceptionMessage'])) {
324324
$message = self::parseAnnotationContent(
325-
$annotations['method']['expectedExceptionMessage'][0]
325+
$annotations['method']['expectedExceptionMessage'][0]
326326
);
327327
}
328328

329329
if (isset($annotations['method']['expectedExceptionMessageRegExp'])) {
330330
$messageRegExp = self::parseAnnotationContent(
331-
$annotations['method']['expectedExceptionMessageRegExp'][0]
331+
$annotations['method']['expectedExceptionMessageRegExp'][0]
332332
);
333333
}
334334

335335
if (isset($matches[3])) {
336336
$code = $matches[3];
337337
} elseif (isset($annotations['method']['expectedExceptionCode'])) {
338338
$code = self::parseAnnotationContent(
339-
$annotations['method']['expectedExceptionCode'][0]
339+
$annotations['method']['expectedExceptionCode'][0]
340340
);
341341
}
342342

‎tests/Framework/Constraint/ExceptionMessageRegExpTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
* @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
4141
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
4242
* @link http://www.phpunit.de/
43-
* @since File available since Release 3.7.30
43+
* @since File available since Release 4.3
4444
*/
4545

4646
/**
@@ -51,7 +51,7 @@
5151
* @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
5252
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
5353
* @link http://www.phpunit.de/
54-
* @since Class available since Release 4.0.20
54+
* @since Class available since Release 4.3
5555
* @covers PHPUnit_Framework_Constraint_ExceptionMessageRegExp
5656
*/
5757
class ExceptionMessageRegExpTest extends PHPUnit_Framework_TestCase
@@ -88,7 +88,7 @@ public function testMessageXdebugScreamCompatibility()
8888
}
8989

9090
/**
91-
* @coversNothing
91+
* @coversNothing
9292
* @expectedException \Exception variadic
9393
* @expectedExceptionMessageRegExp /^A variadic \w+ message/
9494
*/

‎tests/Util/TestTest.php

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -119,34 +119,34 @@ public function testGetExpectedException()
119119
);
120120

121121
$this->assertSame(
122-
array('class' => 'Class', 'code' => My\Space\ExceptionNamespaceTest::ERROR_CODE, 'message' => My\Space\ExceptionNamespaceTest::ERROR_MESSAGE, 'message_regex' => ''),
123-
PHPUnit_Util_Test::getExpectedException('My\Space\ExceptionNamespaceTest', 'testConstants')
122+
array('class' => 'Class', 'code' => My\Space\ExceptionNamespaceTest::ERROR_CODE, 'message' => My\Space\ExceptionNamespaceTest::ERROR_MESSAGE, 'message_regex' => ''),
123+
PHPUnit_Util_Test::getExpectedException('My\Space\ExceptionNamespaceTest', 'testConstants')
124124
);
125125

126126
$this->assertSame(
127-
array('class' => 'Class', 'code' => 1234, 'message' => 'Message', 'message_regex' => '#regex#'),
128-
PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testWithRegexMessage')
127+
array('class' => 'Class', 'code' => 1234, 'message' => 'Message', 'message_regex' => '#regex#'),
128+
PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testWithRegexMessage')
129129
);
130130

131131
$this->assertSame(
132-
array('class' => 'Class', 'code' => 1234, 'message' => 'Message', 'message_regex' => '#regex#'),
133-
PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testWithRegexMessageFromClassConstant')
134-
);
132+
array('class' => 'Class', 'code' => 1234, 'message' => 'Message', 'message_regex' => '#regex#'),
133+
PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testWithRegexMessageFromClassConstant')
134+
);
135135

136136
$this->assertSame(
137-
array('class' => 'Class', 'code' => 1234, 'message' => 'Message', 'message_regex' => 'ExceptionTest::UNKNOWN_MESSAGE_REGEX_CONSTANT'),
138-
PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testWithUnknowRegexMessageFromClassConstant')
139-
);
137+
array('class' => 'Class', 'code' => 1234, 'message' => 'Message', 'message_regex' => 'ExceptionTest::UNKNOWN_MESSAGE_REGEX_CONSTANT'),
138+
PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testWithUnknowRegexMessageFromClassConstant')
139+
);
140140

141141
// Ensure the Class::CONST expression is only evaluated when the constant really exists
142142
$this->assertSame(
143-
array('class' => 'Class', 'code' => 'ExceptionTest::UNKNOWN_CODE_CONSTANT', 'message' => 'ExceptionTest::UNKNOWN_MESSAGE_CONSTANT', 'message_regex' => ''),
144-
PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testUnknownConstants')
143+
array('class' => 'Class', 'code' => 'ExceptionTest::UNKNOWN_CODE_CONSTANT', 'message' => 'ExceptionTest::UNKNOWN_MESSAGE_CONSTANT', 'message_regex' => ''),
144+
PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testUnknownConstants')
145145
);
146146

147147
$this->assertSame(
148-
array('class' => 'Class', 'code' => 'My\Space\ExceptionNamespaceTest::UNKNOWN_CODE_CONSTANT', 'message' => 'My\Space\ExceptionNamespaceTest::UNKNOWN_MESSAGE_CONSTANT', 'message_regex' => ''),
149-
PHPUnit_Util_Test::getExpectedException('My\Space\ExceptionNamespaceTest', 'testUnknownConstants')
148+
array('class' => 'Class', 'code' => 'My\Space\ExceptionNamespaceTest::UNKNOWN_CODE_CONSTANT', 'message' => 'My\Space\ExceptionNamespaceTest::UNKNOWN_MESSAGE_CONSTANT', 'message_regex' => ''),
149+
PHPUnit_Util_Test::getExpectedException('My\Space\ExceptionNamespaceTest', 'testUnknownConstants')
150150
);
151151
}
152152

@@ -177,27 +177,27 @@ public function requirementsProvider()
177177
array('testTen', array('extensions' => array('testExt'))),
178178
array('testEleven', array('OS' => '/Linux/i')),
179179
array(
180-
'testSpace',
181-
array(
182-
'extensions' => array('spl'),
183-
'OS' => '/.*/i'
184-
)
180+
'testSpace',
181+
array(
182+
'extensions' => array('spl'),
183+
'OS' => '/.*/i'
184+
)
185185
),
186186
array(
187-
'testAllPossibleRequirements',
188-
array(
189-
'PHP' => '99-dev',
190-
'PHPUnit' => '9-dev',
191-
'OS' => '/DOESNOTEXIST/i',
192-
'functions' => array(
193-
'testFuncOne',
194-
'testFuncTwo',
195-
),
196-
'extensions' => array(
197-
'testExtOne',
198-
'testExtTwo',
199-
)
187+
'testAllPossibleRequirements',
188+
array(
189+
'PHP' => '99-dev',
190+
'PHPUnit' => '9-dev',
191+
'OS' => '/DOESNOTEXIST/i',
192+
'functions' => array(
193+
'testFuncOne',
194+
'testFuncTwo',
195+
),
196+
'extensions' => array(
197+
'testExtOne',
198+
'testExtTwo',
200199
)
200+
)
201201
)
202202
);
203203
}
@@ -212,12 +212,12 @@ public function testGetRequirementsMergesClassAndMethodDocBlocks()
212212
'PHPUnit' => '3.7',
213213
'OS' => '/WINNT/i',
214214
'functions' => array(
215-
'testFuncClass',
216-
'testFuncMethod',
215+
'testFuncClass',
216+
'testFuncMethod',
217217
),
218218
'extensions' => array(
219-
'testExtClass',
220-
'testExtMethod',
219+
'testExtClass',
220+
'testExtMethod',
221221
)
222222
);
223223

0 commit comments

Comments
 (0)