From 23dedb3e10f42958f3565c70fd44902713bd71b2 Mon Sep 17 00:00:00 2001
From: Vasil Rangelov <boen.robot@gmail.com>
Date: Tue, 27 Nov 2012 19:52:28 +0200
Subject: [PATCH] CS fixes.

---
 src/phpDocumentor/Reflection/DocBlock.php                 | 6 +++---
 src/phpDocumentor/Reflection/DocBlock/Context.php         | 2 +-
 .../Reflection/DocBlock/Tag/ExampleTagTest.php            | 8 +++++++-
 tests/phpDocumentor/Reflection/DocBlock/TagTest.php       | 6 +++++-
 tests/phpDocumentor/Reflection/DocBlockTest.php           | 4 +++-
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/phpDocumentor/Reflection/DocBlock.php b/src/phpDocumentor/Reflection/DocBlock.php
index 9b12363..ff517a0 100644
--- a/src/phpDocumentor/Reflection/DocBlock.php
+++ b/src/phpDocumentor/Reflection/DocBlock.php
@@ -136,7 +136,7 @@ class DocBlock implements \Reflector
         } else {
             // clears all extra horizontal whitespace from the line endings
             // to prevent parsing issues
-            $comment = preg_replace('~(?m)\h*$~u', '', $comment);
+            $comment = preg_replace('/\h*$/Sum', '', $comment);
 
             /*
              * Splits the docblock into a short description, long description and
@@ -153,7 +153,7 @@ class DocBlock implements \Reflector
              * Big thanks to RichardJ for contributing this Regular Expression
              */
             preg_match(
-                '/(?x)
+                '/
         \A (
           [^\n.]+
           (?:
@@ -176,7 +176,7 @@ class DocBlock implements \Reflector
           )
         )?
         (\s+ [\s\S]*)? # everything that follows
-        /u',
+        /ux',
                 $comment,
                 $matches
             );
diff --git a/src/phpDocumentor/Reflection/DocBlock/Context.php b/src/phpDocumentor/Reflection/DocBlock/Context.php
index 4b74943..81aa83c 100644
--- a/src/phpDocumentor/Reflection/DocBlock/Context.php
+++ b/src/phpDocumentor/Reflection/DocBlock/Context.php
@@ -31,7 +31,7 @@ class Context
     protected $lsen = '';
     
     /**
-     * 
+     * Cteates a new context.
      * @param string $namespace         The namespace where this DocBlock
      *     resides in.
      * @param array  $namespace_aliases List of namespace aliases => Fully
diff --git a/tests/phpDocumentor/Reflection/DocBlock/Tag/ExampleTagTest.php b/tests/phpDocumentor/Reflection/DocBlock/Tag/ExampleTagTest.php
index 5d20100..52b7a71 100644
--- a/tests/phpDocumentor/Reflection/DocBlock/Tag/ExampleTagTest.php
+++ b/tests/phpDocumentor/Reflection/DocBlock/Tag/ExampleTagTest.php
@@ -65,7 +65,13 @@ class ExampleTagTest extends \PHPUnit_Framework_TestCase
      */
     public function provideDataForConstuctor()
     {
-        // $type, $content, $exContent, $exDescription, $exStartingLine, $exLineCount, $exFilePath
+        // $type,
+        // $content,
+        // $exContent,
+        // $exDescription,
+        // $exStartingLine,
+        // $exLineCount,
+        // $exFilePath
         return array(
             array(
                 'example',
diff --git a/tests/phpDocumentor/Reflection/DocBlock/TagTest.php b/tests/phpDocumentor/Reflection/DocBlock/TagTest.php
index 4b6b570..ef2ab56 100644
--- a/tests/phpDocumentor/Reflection/DocBlock/TagTest.php
+++ b/tests/phpDocumentor/Reflection/DocBlock/TagTest.php
@@ -90,7 +90,7 @@ class TagTest extends \PHPUnit_Framework_TestCase
             $tagPreReg
         );
 
-        require 'data:text/plain;base64,'. base64_encode(
+        include 'data:text/plain;base64,'. base64_encode(
 <<<TAG_HANDLER
 <?php
     class MyTagHandler extends \phpDocumentor\Reflection\DocBlock\Tag {}
@@ -120,6 +120,8 @@ TAG_HANDLER
      * @depends testTagHandlerCorrectRegistration
      * @covers \phpDocumentor\Reflection\DocBlock\Tag::registerTagHandler
      * @covers \phpDocumentor\Reflection\DocBlock\Tag::createInstance
+     * 
+     * @return void
      */
     public function testNamespacedTagHandlerCorrectRegistration()
     {
@@ -162,6 +164,8 @@ TAG_HANDLER
      * @depends testTagHandlerCorrectRegistration
      * @covers \phpDocumentor\Reflection\DocBlock\Tag::registerTagHandler
      * @covers \phpDocumentor\Reflection\DocBlock\Tag::createInstance
+     * 
+     * @return void
      */
     public function testNamespacedTagHandlerIncorrectRegistration()
     {
diff --git a/tests/phpDocumentor/Reflection/DocBlockTest.php b/tests/phpDocumentor/Reflection/DocBlockTest.php
index 351ace4..e87e3b9 100644
--- a/tests/phpDocumentor/Reflection/DocBlockTest.php
+++ b/tests/phpDocumentor/Reflection/DocBlockTest.php
@@ -27,6 +27,8 @@ class DocBlockTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @covers \phpDocumentor\Reflection\DocBlock
+     * 
+     * @return void
      */
     public function testConstruct()
     {
@@ -168,7 +170,7 @@ DOCBLOCK;
             $this->markTestSkipped('"data" URIs for includes are required.');
         }
 
-        require 'data:text/plain;base64,'. base64_encode(
+        include 'data:text/plain;base64,'. base64_encode(
             <<<DOCBLOCK_EXTENSION
 <?php
 class MyReflectionDocBlock extends \phpDocumentor\Reflection\DocBlock {