File tree Expand file tree Collapse file tree 4 files changed +17
-9
lines changed Expand file tree Collapse file tree 4 files changed +17
-9
lines changed Original file line number Diff line number Diff line change @@ -37,7 +37,7 @@ class Test
37
37
const REGEX_REQUIRES_VERSION = '/@requires\s+(?P<name>PHP(?:Unit)?)\s+(?P<operator>[<>=!]{0,2})\s*(?P<version>[\d\.-]+(dev|(RC|alpha|beta)[\d\.])?)[ \t]*\r?$/m ' ;
38
38
const REGEX_REQUIRES_VERSION_CONSTRAINT = '/@requires\s+(?P<name>PHP(?:Unit)?)\s+(?P<constraint>[\d\t -.|~^]+)[ \t]*\r?$/m ' ;
39
39
const REGEX_REQUIRES_OS = '/@requires\s+(?P<name>OS(?:FAMILY)?)\s+(?P<value>.+?)[ \t]*\r?$/m ' ;
40
- const REGEX_REQUIRES = '/@requires\s+(?P<name>function|extension)\s+(?P<value>([^ ]+? ))\s*(?P<operator>[<>=!]{0,2})\s*(?P<version>[\d\.-]+[\d\.]?)?[ \t]*\r?$/m ' ;
40
+ const REGEX_REQUIRES = '/@requires\s+(?P<name>function|extension)\s+(?P<value>([^\s<>=!]+ ))\s*(?P<operator>[<>=!]{0,2})\s*(?P<version>[\d\.-]+[\d\.]?)?[ \t]*\r?$/m ' ;
41
41
42
42
const UNKNOWN = -1 ;
43
43
const SMALL = 0 ;
Original file line number Diff line number Diff line change @@ -79,6 +79,14 @@ public function testTen()
79
79
{
80
80
}
81
81
82
+ /**
83
+ * @requires function testFunc2
84
+ * @see https://github.com/sebastianbergmann/phpunit/issues/3459
85
+ */
86
+ public function testRequiresFunctionWithDigit ()
87
+ {
88
+ }
89
+
82
90
/**
83
91
* @requires OS SunOS
84
92
* @requires OSFAMILY Solaris
@@ -92,9 +100,9 @@ public function testEleven()
92
100
* @requires PHPUnit 9-dev
93
101
* @requires OS DOESNOTEXIST
94
102
* @requires function testFuncOne
95
- * @requires function testFuncTwo
103
+ * @requires function testFunc2
96
104
* @requires extension testExtOne
97
- * @requires extension testExtTwo
105
+ * @requires extension testExt2
98
106
* @requires extension testExtThree 2.0
99
107
*/
100
108
public function testAllPossibleRequirements ()
Original file line number Diff line number Diff line change @@ -556,9 +556,9 @@ public function testSkipsProvidesMessagesForAllSkippingReasons()
556
556
'PHPUnit >= 9-dev is required. ' . PHP_EOL .
557
557
'Operating system matching /DOESNOTEXIST/i is required. ' . PHP_EOL .
558
558
'Function testFuncOne is required. ' . PHP_EOL .
559
- 'Function testFuncTwo is required. ' . PHP_EOL .
559
+ 'Function testFunc2 is required. ' . PHP_EOL .
560
560
'Extension testExtOne is required. ' . PHP_EOL .
561
- 'Extension testExtTwo is required. ' . PHP_EOL .
561
+ 'Extension testExt2 is required. ' . PHP_EOL .
562
562
'Extension testExtThree >= 2.0 is required. ' ,
563
563
$ test ->getStatusMessage ()
564
564
);
Original file line number Diff line number Diff line change @@ -154,11 +154,11 @@ public function requirementsProvider()
154
154
'OS ' => 'DOESNOTEXIST ' ,
155
155
'functions ' => [
156
156
'testFuncOne ' ,
157
- 'testFuncTwo ' ,
157
+ 'testFunc2 ' ,
158
158
],
159
159
'extensions ' => [
160
160
'testExtOne ' ,
161
- 'testExtTwo ' ,
161
+ 'testExt2 ' ,
162
162
'testExtThree ' ,
163
163
],
164
164
'extension_versions ' => [
@@ -508,9 +508,9 @@ public function missingRequirementsProvider()
508
508
'PHPUnit >= 9-dev is required. ' ,
509
509
'Operating system matching /DOESNOTEXIST/i is required. ' ,
510
510
'Function testFuncOne is required. ' ,
511
- 'Function testFuncTwo is required. ' ,
511
+ 'Function testFunc2 is required. ' ,
512
512
'Extension testExtOne is required. ' ,
513
- 'Extension testExtTwo is required. ' ,
513
+ 'Extension testExt2 is required. ' ,
514
514
'Extension testExtThree >= 2.0 is required. ' ,
515
515
]],
516
516
['testPHPVersionOperatorLessThan ' , ['PHP < 5.4 is required. ' ]],
You can’t perform that action at this time.
0 commit comments