PSR compliance (fixes #5)

icecave · Jan 12, 2013 · 92f165f · 92f165f
1 parent 2f35f04
commit 92f165f
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -39,7 +39,8 @@ class MyDocument
         $this->filename = $filename;
     }
 
-    public function getContents() {
+    public function getContents()
+    {
         return file_get_contents($this->filename);
     }
 
@@ -59,12 +60,14 @@ use Icecave\Isolator\Isolator;
 
 class MyDocument
 {
-    public function __construct($filename, Isolator $isolator = NULL) {
+    public function __construct($filename, Isolator $isolator = NULL)
+    {
         $this->filename = $filename;
         $this->isolator = Isolator::get($isolator);
     }
 
-    public function getContents() {
+    public function getContents()
+    {
         return $this->isolator->file_get_contents($this->filename);
     }
 

diff --git a/lib/Icecave/Isolator/Generator.php b/lib/Icecave/Isolator/Generator.php
@@ -3,7 +3,6 @@
 
 use ReflectionClass;
 use ReflectionFunction;
-use ReflectionParameter;
 
 /**
  * Generates an isolator that can accommodate calls to functions with reference parameters.
@@ -45,7 +44,7 @@ public function requiresIsolatorProxy(ReflectionFunction $reflector)
     {
         if ($reflector->isDisabled()) {
             return FALSE;
-        } else if ($reflector->returnsReference()) {
+        } elseif ($reflector->returnsReference()) {
             return TRUE;
         }
 
@@ -92,6 +91,7 @@ public function generateProxyMethod(ReflectionFunction $reflector)
         $code .= $this->generateReturn($name, $maxArity);
         $code .= '} // End function ' . $name . '.' . PHP_EOL;
         $code .= PHP_EOL;
+
         return $code;
     }
 

diff --git a/lib/Icecave/Isolator/Isolator.php b/lib/Icecave/Isolator/Isolator.php
@@ -18,8 +18,8 @@ class Isolator
      *    - require
      *    - require_once
      *
-     * @param string $name The name of the global function to call.
-     * @param array $arguments The arguments to the function.
+     * @param string $name      The name of the global function to call.
+     * @param array  $arguments The arguments to the function.
      *
      * @return mixed The result of the function call.
      */
@@ -33,20 +33,25 @@ public function __call($name, array $arguments)
                 // @codeCoverageIgnoreEnd
             case 'echo':
                 echo current($arguments);
+
                 return;
             case 'eval':
                 return eval(current($arguments));
             case 'include':
                 include current($arguments);
+
                 return;
             case 'include_once':
                 include_once current($arguments);
+
                 return;
             case 'require':
                 require current($arguments);
+
                 return;
             case 'require_once':
                 require_once current($arguments);
+
                 return;
             default:
 
@@ -76,9 +81,9 @@ public static function get(Isolator $instance = NULL)
     /**
      * Fetch the default isolator instance, constructing it if necessary.
      *
-     * @param boolean $handleReferences Indicates whether or not the isolator should account for functions with reference parameters and return types.
-     * @param Generator|NULL $generator The Generator instance to use to construct the concreate isolator class, or NULL to use the default.
-     * @param Isolator|NULL $isolator The isolator used to access the global list of functions, or NULL to use the default.
+     * @param boolean        $handleReferences Indicates whether or not the isolator should account for functions with reference parameters and return types.
+     * @param Generator|NULL $generator        The Generator instance to use to construct the concreate isolator class, or NULL to use the default.
+     * @param Isolator|NULL  $isolator         The isolator used to access the global list of functions, or NULL to use the default.
      */
     public static function getIsolator($handleReferences = TRUE, Generator $generator = NULL, Isolator $isolator = NULL)
     {
@@ -112,6 +117,7 @@ public static function getIsolator($handleReferences = TRUE, Generator $generato
 
         // Generate the concrete isolator class and install it as the global instance ...
         $classReflector = $generator->generateClass($functionReflectors);
+
         return self::$instance = $classReflector->newInstance();
     }
 

diff --git a/test/suite/Icecave/Isolator/GeneratorTest.php b/test/suite/Icecave/Isolator/GeneratorTest.php
@@ -1,15 +1,14 @@
 <?php
 namespace Icecave\Isolator;
 
-use ReflectionClass;
 use ReflectionFunction;
 use PHPUnit_Framework_TestCase;
 use Phake;
-use stdClass;
 
-class GeneratorTest extends PHPUnit_Framework_TestCase {
-
-  public function setUp() {
+class GeneratorTest extends PHPUnit_Framework_TestCase
+{
+  public function setUp()
+  {
     $this->_isolator = Phake::mock(__NAMESPACE__ . '\Isolator');
     $this->_generator = Phake::partialMock(
       __NAMESPACE__ . '\Generator'
@@ -18,7 +17,8 @@ public function setUp() {
     );
   }
 
-  public function testGenerateClass() {
+  public function testGenerateClass()
+  {
     $reflector = Phake::mock('ReflectionFunction');
     $reflectors = array($reflector);
 
@@ -50,7 +50,8 @@ public function testGenerateClass() {
     }
   }
 
-  public function testInspect() {
+  public function testInspect()
+  {
     $reflector = Phake::mock('ReflectionFunction');
     $parameter1 = Phake::mock('ReflectionParameter');
     $parameter2 = Phake::mock('ReflectionParameter');
@@ -94,7 +95,8 @@ public function testInspect() {
     );
   }
 
-  public function testInspectEllipsis() {
+  public function testInspectEllipsis()
+  {
     $reflector = Phake::mock('ReflectionFunction');
     $parameter1 = Phake::mock('ReflectionParameter');
     $parameter2 = Phake::mock('ReflectionParameter');
@@ -152,7 +154,8 @@ public function testInspectEllipsis() {
     );
   }
 
-  public function testInspectEllipsisOptional() {
+  public function testInspectEllipsisOptional()
+  {
     $reflector = Phake::mock('ReflectionFunction');
     $parameter1 = Phake::mock('ReflectionParameter');
     $parameter2 = Phake::mock('ReflectionParameter');
@@ -210,7 +213,8 @@ public function testInspectEllipsisOptional() {
     );
   }
 
-  public function testInspectEllipsisReference() {
+  public function testInspectEllipsisReference()
+  {
     $reflector = Phake::mock('ReflectionFunction');
     $parameter1 = Phake::mock('ReflectionParameter');
     $parameter2 = Phake::mock('ReflectionParameter');
@@ -268,7 +272,8 @@ public function testInspectEllipsisReference() {
     );
   }
 
-  public function testRequiresIsolatorProxyDisabled() {
+  public function testRequiresIsolatorProxyDisabled()
+  {
     $reflector = Phake::mock('ReflectionFunction');
     Phake::when($reflector)
       ->isDisabled()
@@ -279,7 +284,8 @@ public function testRequiresIsolatorProxyDisabled() {
     Phake::verify($reflector)->isDisabled();
   }
 
-  public function testRequiresIsolatorProxyReturnsReference() {
+  public function testRequiresIsolatorProxyReturnsReference()
+  {
     $reflector = Phake::mock('ReflectionFunction');
     Phake::when($reflector)
       ->isDisabled()
@@ -297,7 +303,8 @@ public function testRequiresIsolatorProxyReturnsReference() {
     );
   }
 
-  public function testRequiresIsolatorProxyReferenceParameter() {
+  public function testRequiresIsolatorProxyReferenceParameter()
+  {
     $reflector = Phake::mock('ReflectionFunction');
     $parameter1 = Phake::mock('ReflectionParameter');
     $parameter2 = Phake::mock('ReflectionParameter');
@@ -333,7 +340,8 @@ public function testRequiresIsolatorProxyReferenceParameter() {
     );
   }
 
-  public function testRequiresIsolatorProxyNoReferenceParameters() {
+  public function testRequiresIsolatorProxyNoReferenceParameters()
+  {
     $reflector = Phake::mock('ReflectionFunction');
     $parameter1 = Phake::mock('ReflectionParameter');
     $parameter2 = Phake::mock('ReflectionParameter');