Skip to content

Commit 8418970

Browse files
committed
CS fixes.
1 parent 0d38c84 commit 8418970

File tree

5 files changed

+19
-7
lines changed

5 files changed

+19
-7
lines changed

src/phpDocumentor/Reflection/DocBlock.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ protected function splitDocBlock($comment)
136136
} else {
137137
// clears all extra horizontal whitespace from the line endings
138138
// to prevent parsing issues
139-
$comment = preg_replace('~(?m)\h*$~u', '', $comment);
139+
$comment = preg_replace('/\h*$/Sum', '', $comment);
140140

141141
/*
142142
* Splits the docblock into a short description, long description and
@@ -153,7 +153,7 @@ protected function splitDocBlock($comment)
153153
* Big thanks to RichardJ for contributing this Regular Expression
154154
*/
155155
preg_match(
156-
'/(?x)
156+
'/
157157
\A (
158158
[^\n.]+
159159
(?:
@@ -176,7 +176,7 @@ protected function splitDocBlock($comment)
176176
)
177177
)?
178178
(\s+ [\s\S]*)? # everything that follows
179-
/u',
179+
/ux',
180180
$comment,
181181
$matches
182182
);

src/phpDocumentor/Reflection/DocBlock/Context.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class Context
3131
protected $lsen = '';
3232

3333
/**
34-
*
34+
* Cteates a new context.
3535
* @param string $namespace The namespace where this DocBlock
3636
* resides in.
3737
* @param array $namespace_aliases List of namespace aliases => Fully

tests/phpDocumentor/Reflection/DocBlock/Tag/ExampleTagTest.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,13 @@ public function testConstructorParesInputsIntoCorrectFields(
6565
*/
6666
public function provideDataForConstuctor()
6767
{
68-
// $type, $content, $exContent, $exDescription, $exStartingLine, $exLineCount, $exFilePath
68+
// $type,
69+
// $content,
70+
// $exContent,
71+
// $exDescription,
72+
// $exStartingLine,
73+
// $exLineCount,
74+
// $exFilePath
6975
return array(
7076
array(
7177
'example',

tests/phpDocumentor/Reflection/DocBlock/TagTest.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public function testTagHandlerCorrectRegistration()
9090
$tagPreReg
9191
);
9292

93-
require 'data:text/plain;base64,'. base64_encode(
93+
include 'data:text/plain;base64,'. base64_encode(
9494
<<<TAG_HANDLER
9595
<?php
9696
class MyTagHandler extends \phpDocumentor\Reflection\DocBlock\Tag {}
@@ -120,6 +120,8 @@ class MyTagHandler extends \phpDocumentor\Reflection\DocBlock\Tag {}
120120
* @depends testTagHandlerCorrectRegistration
121121
* @covers \phpDocumentor\Reflection\DocBlock\Tag::registerTagHandler
122122
* @covers \phpDocumentor\Reflection\DocBlock\Tag::createInstance
123+
*
124+
* @return void
123125
*/
124126
public function testNamespacedTagHandlerCorrectRegistration()
125127
{
@@ -162,6 +164,8 @@ public function testNamespacedTagHandlerCorrectRegistration()
162164
* @depends testTagHandlerCorrectRegistration
163165
* @covers \phpDocumentor\Reflection\DocBlock\Tag::registerTagHandler
164166
* @covers \phpDocumentor\Reflection\DocBlock\Tag::createInstance
167+
*
168+
* @return void
165169
*/
166170
public function testNamespacedTagHandlerIncorrectRegistration()
167171
{

tests/phpDocumentor/Reflection/DocBlockTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ class DocBlockTest extends \PHPUnit_Framework_TestCase
2727
{
2828
/**
2929
* @covers \phpDocumentor\Reflection\DocBlock
30+
*
31+
* @return void
3032
*/
3133
public function testConstruct()
3234
{
@@ -168,7 +170,7 @@ public function testInvalidTagBlock()
168170
$this->markTestSkipped('"data" URIs for includes are required.');
169171
}
170172

171-
require 'data:text/plain;base64,'. base64_encode(
173+
include 'data:text/plain;base64,'. base64_encode(
172174
<<<DOCBLOCK_EXTENSION
173175
<?php
174176
class MyReflectionDocBlock extends \phpDocumentor\Reflection\DocBlock {

0 commit comments

Comments
 (0)