cs fix

tonicospinelli · tonicospinelli · commit fc3b6a160825 · 2014-04-16T17:59:03.000-03:00
diff --git a/Behavioral/ChainOfResponsibilities/ChainTest.php b/Behavioral/ChainOfResponsibilities/ChainTest.php
@@ -45,7 +45,8 @@ public function testFastStorage($request)
         $this->assertObjectHasAttribute('response', $request);
         $this->assertEquals('baz', $request->response);
         // despite both handle owns the 'bar' key, the FastStorage is responding first
-        $this->assertEquals('DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible\FastStorage', $request->forDebugOnly);
+        $className = 'DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible\FastStorage';
+        $this->assertEquals($className, $request->forDebugOnly);
     }
 
     /**
@@ -60,7 +61,8 @@ public function testSlowStorage($request)
         $this->assertObjectHasAttribute('response', $request);
         $this->assertEquals('bar', $request->response);
         // FastStorage has no 'foo' key, the SlowStorage is responding
-        $this->assertEquals('DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible\SlowStorage', $request->forDebugOnly);
+        $className = 'DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible\SlowStorage';
+        $this->assertEquals($className, $request->forDebugOnly);
     }
 
     /**
@@ -73,6 +75,7 @@ public function testFailure($request)
 
         $this->assertFalse($ret);
         // the last responsible :
-        $this->assertEquals('DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible\SlowStorage', $request->forDebugOnly);
+        $className = 'DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible\SlowStorage';
+        $this->assertEquals($className, $request->forDebugOnly);
     }
 }
diff --git a/Behavioral/Iterator/BookList.php b/Behavioral/Iterator/BookList.php
@@ -13,7 +13,7 @@ public function getBook($bookNumberToGet)
             return $this->books[$bookNumberToGet];
         }
 
-        return NULL;
+        return null;
     }
 
     public function addBook(Book $book)
diff --git a/Behavioral/Iterator/BookListIterator.php b/Behavioral/Iterator/BookListIterator.php
@@ -74,4 +74,4 @@ public function rewind()
     {
         $this->currentBook = 0;
     }
-}
+}
diff --git a/Behavioral/Iterator/BookListReverseIterator.php b/Behavioral/Iterator/BookListReverseIterator.php
@@ -20,4 +20,4 @@ public function valid()
     {
         return 0 <= $this->currentBook;
     }
-}
+}
diff --git a/Behavioral/Iterator/IteratorTest.php b/Behavioral/Iterator/IteratorTest.php
@@ -63,4 +63,4 @@ public function testUseAReverseIteratorAndValidateAuthors($expected)
             $iterator->next();
         }
     }
-}
+}
diff --git a/Behavioral/Observer/ObserverTest.php b/Behavioral/Observer/ObserverTest.php
@@ -53,10 +53,9 @@ public function testUpdateCalling()
         $subject->attach($observer);
 
         $observer->expects($this->once())
-                ->method('update')
-                ->with($subject);
+            ->method('update')
+            ->with($subject);
 
         $subject->notify();
     }
-
-}
+}
diff --git a/Behavioral/Specification/AbstractSpecification.php b/Behavioral/Specification/AbstractSpecification.php
@@ -8,18 +8,18 @@ abstract class AbstractSpecification implements SpecificationInterface
 {
     /**
      * Checks if given item meets all criteria
-     * 
+     *
      * @param Item $item
-     * 
+     *
      * @return bool
      */
     abstract public function isSatisfiedBy(Item $item);
 
     /**
      * Creates a new logical AND specification
-     * 
+     *
      * @param SpecificationInterface $spec
-     * 
+     *
      * @return SpecificationInterface
      */
     public function plus(SpecificationInterface $spec)
@@ -29,9 +29,9 @@ public function plus(SpecificationInterface $spec)
 
     /**
      * Creates a new logical OR composite specification
-     * 
+     *
      * @param SpecificationInterface $spec
-     * 
+     *
      * @return SpecificationInterface
      */
     public function either(SpecificationInterface $spec)
@@ -41,11 +41,11 @@ public function either(SpecificationInterface $spec)
 
     /**
      * Creates a new logical NOT specification
-     * 
+     *
      * @return SpecificationInterface
      */
     public function not()
     {
         return new Not($this);
     }
-}
+}
diff --git a/Behavioral/Specification/Not.php b/Behavioral/Specification/Not.php
@@ -31,4 +31,4 @@ public function isSatisfiedBy(Item $item)
     {
         return !$this->spec->isSatisfiedBy($item);
     }
-}
+}
diff --git a/Behavioral/Specification/Plus.php b/Behavioral/Specification/Plus.php
@@ -12,10 +12,9 @@ class Plus extends AbstractSpecification
 
     /**
      * Creation of a locical AND of two specifications
-     * 
+     *
      * @param SpecificationInterface $left
      * @param SpecificationInterface $right
-
      */
     public function __construct(SpecificationInterface $left, SpecificationInterface $right)
     {
@@ -25,13 +24,13 @@ public function __construct(SpecificationInterface $left, SpecificationInterface
 
     /**
      * Checks if the composite AND of specifications passes
-     * 
+     *
      * @param Item $item
-     * 
+     *
      * @return bool
      */
     public function isSatisfiedBy(Item $item)
     {
         return $this->left->isSatisfiedBy($item) && $this->right->isSatisfiedBy($item);
     }
-}
+}
diff --git a/Behavioral/Specification/PriceSpecification.php b/Behavioral/Specification/PriceSpecification.php
@@ -31,17 +31,17 @@ public function setMinPrice($minPrice)
 
     /**
      * Checks if Item price falls between bounds
-     * 
+     *
      * @param Item $item
-     * 
+     *
      * @return bool
      */
     public function isSatisfiedBy(Item $item)
     {
-        if ( !empty($this->maxPrice) && $item->getPrice() > $this->maxPrice) {
+        if (!empty($this->maxPrice) && $item->getPrice() > $this->maxPrice) {
             return false;
         }
-        if ( !empty($this->minPrice) && $item->getPrice() < $this->minPrice) {
+        if (!empty($this->minPrice) && $item->getPrice() < $this->minPrice) {
             return false;
         }
 
diff --git a/Behavioral/Specification/SpecificationInterface.php b/Behavioral/Specification/SpecificationInterface.php
@@ -8,31 +8,29 @@ interface SpecificationInterface
 {
     /**
      * A boolean evaluation indicating if the object meets the specification
-     * 
+     *
      * @param Item $item
-     * 
+     *
      * @return bool
      */
     public function isSatisfiedBy(Item $item);
 
     /**
      * Creates a logical AND specification
-     * 
+     *
      * @param SpecificationInterface $spec
-
      */
     public function plus(SpecificationInterface $spec);
 
     /**
      * Creates a logical OR specification
-     * 
+     *
      * @param SpecificationInterface $spec
-
      */
     public function either(SpecificationInterface $spec);
 
     /**
      * Creates a logical not specification
      */
     public function not();
-}
+}
diff --git a/Behavioral/Strategy/ObjectCollection.php b/Behavioral/Strategy/ObjectCollection.php
@@ -30,10 +30,10 @@ public function __construct(array $elements = array())
      */
     public function sort()
     {
-        if (!$this->comparator){ 
-            throw new \LogicException("Comparator is not set");    
+        if (!$this->comparator) {
+            throw new \LogicException("Comparator is not set");
         }
-        
+
         $callback = array($this->comparator, 'compare');
         uasort($this->elements, $callback);
 
diff --git a/Behavioral/TemplateMethod/JourneyTest.php b/Behavioral/TemplateMethod/JourneyTest.php
@@ -31,8 +31,8 @@ public function testLasVegas()
     {
         $journey = $this->getMockForAbstractClass('DesignPatterns\Behavioral\TemplateMethod\Journey');
         $journey->expects($this->once())
-                ->method('enjoyVacation')
-                ->will($this->returnCallback(array($this, 'mockUpVacation')));
+            ->method('enjoyVacation')
+            ->will($this->returnCallback(array($this, 'mockUpVacation')));
         $this->expectOutputRegex('#Las Vegas#');
         $journey->takeATrip();
     }
@@ -41,5 +41,4 @@ public function mockUpVacation()
     {
         echo "Fear and loathing in Las Vegas\n";
     }
-
-}
+}
diff --git a/Behavioral/Visitor/VisitorTest.php b/Behavioral/Visitor/VisitorTest.php
@@ -43,5 +43,4 @@ public function testUnknownObject()
         $mock = $this->getMockForAbstractClass('DesignPatterns\Behavioral\Visitor\Role');
         $mock->accept($this->visitor);
     }
-
-}
+}
diff --git a/Creational/Pool/Pool.php b/Creational/Pool/Pool.php
@@ -7,7 +7,7 @@ class Pool
 
     private $instances = array();
     private $class;
-    
+
     public function __construct($class)
     {
         $this->class = $class;
@@ -26,5 +26,4 @@ public function dispose($instance)
     {
         $this->instances[] = $instance;
     }
-
 }
diff --git a/Creational/Pool/PoolTest.php b/Creational/Pool/PoolTest.php
@@ -2,8 +2,6 @@
 
 namespace DesignPatterns\Creational\Pool;
 
-use DesignPatterns\Creational\Pool\Pool;
-
 class TestWorker
 {
 
@@ -27,4 +25,3 @@ public function testPool()
         $this->assertEquals(1, $pool->get()->id);
     }
 }
-
diff --git a/Creational/Pool/Processor.php b/Creational/Pool/Processor.php
@@ -49,5 +49,4 @@ private function popFromWaitingQueue()
     {
         return array_pop($this->waitingQueue);
     }
-
 }
diff --git a/Creational/Pool/Worker.php b/Creational/Pool/Worker.php
@@ -17,5 +17,4 @@ public function run($image, array $callback)
         // and when it's done, execute callback
         call_user_func($callback, $this);
     }
-
 }
diff --git a/Creational/SimpleFactory/SimpleFactoryTest.php b/Creational/SimpleFactory/SimpleFactoryTest.php
@@ -41,5 +41,4 @@ public function testBadType()
     {
         $this->factory->createVehicle('car');
     }
-
-}
+}
diff --git a/Structural/Adapter/AdapterTest.php b/Structural/Adapter/AdapterTest.php
@@ -33,7 +33,7 @@ public function getBook()
      *
      * @dataProvider getBook
      */
-    public function test_I_am_an_old_Client(PaperBookInterface $book)
+    public function testIAmAnOldClient(PaperBookInterface $book)
     {
         $book->open();
         $book->turnPage();
diff --git a/Structural/Composite/CompositeTest.php b/Structural/Composite/CompositeTest.php
@@ -29,6 +29,8 @@ public function testRender()
      */
     public function testFormImplementsFormEelement()
     {
-        $this->assertTrue(is_subclass_of('DesignPatterns\Structural\Composite\Form', 'DesignPatterns\Structural\Composite\FormElement'));
+        $className = 'DesignPatterns\Structural\Composite\Form';
+        $abstractName = 'DesignPatterns\Structural\Composite\FormElement';
+        $this->assertTrue(is_subclass_of($className, $abstractName));
     }
 }
diff --git a/Structural/DataMapper/DataMapperTest.php b/Structural/DataMapper/DataMapperTest.php
@@ -65,7 +65,12 @@ public function testPersistExisting(User $user)
      */
     public function testRestoreOne(User $existing)
     {
-        $rows = new \ArrayIterator(array(array('userid' => 1, 'username' => 'Odysseus', 'email' => 'Odysseus@ithaca.gr')));
+        $row = array(
+            'userid'   => 1,
+            'username' => 'Odysseus',
+            'email'    => 'Odysseus@ithaca.gr'
+        );
+        $rows = new \ArrayIterator(array($row));
         $this->dbal->expects($this->once())
                 ->method('find')
                 ->with(1)
diff --git a/Structural/Decorator/DecoratorTest.php b/Structural/Decorator/DecoratorTest.php
@@ -30,15 +30,18 @@ public function testXmlDecorator()
         // Wrap service with a JSON decorator for renderers
         $service = new Decorator\RenderInXml($this->service);
         // Our Renderer will now output XML instead of an array
-        $this->assertXmlStringEqualsXmlString('<?xml version="1.0"?><foo>bar</foo>', $service->renderData());
+        $xml = '<?xml version="1.0"?><foo>bar</foo>';
+        $this->assertXmlStringEqualsXmlString($xml, $service->renderData());
     }
 
     /**
      * The first key-point of this pattern :
      */
     public function testDecoratorMustImplementsRenderer()
     {
-        $this->assertTrue(is_subclass_of('DesignPatterns\Structural\Decorator\Decorator', 'DesignPatterns\Structural\Decorator\RendererInterface'));
+        $className = 'DesignPatterns\Structural\Decorator\Decorator';
+        $interfaceName = 'DesignPatterns\Structural\Decorator\RendererInterface';
+        $this->assertTrue(is_subclass_of($className, $interfaceName));
     }
 
     /**
diff --git a/Structural/DependencyInjection/ArrayConfig.php b/Structural/DependencyInjection/ArrayConfig.php
@@ -13,10 +13,11 @@ class ArrayConfig extends AbstractConfig implements Parameters
      * Get parameter
      *
      * @param string|int $key
-     * 
+     * @param null $default
      * @return mixed
      */
-    public function get($key, $default = null) {
+    public function get($key, $default = null)
+    {
         if (isset($this->storage[$key])) {
             return $this->storage[$key];
         }
@@ -27,7 +28,7 @@ public function get($key, $default = null) {
      * Set parameter
      *
      * @param string|int $key
-     * @param mixed      $value
+     * @param mixed $value
      */
     public function set($key, $value)
     {
diff --git a/Structural/DependencyInjection/Parameters.php b/Structural/DependencyInjection/Parameters.php

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,8 @@ public function testFastStorage($request)`
`45`	`45`	`$this->assertObjectHasAttribute('response', $request);`
`46`	`46`	`$this->assertEquals('baz', $request->response);`
`47`	`47`	`// despite both handle owns the 'bar' key, the FastStorage is responding first`
`48`		`- $this->assertEquals('DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible\FastStorage', $request->forDebugOnly);`
	`48`	`+ $className = 'DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible\FastStorage';`
	`49`	`+ $this->assertEquals($className, $request->forDebugOnly);`
`49`	`50`	`}`
`50`	`51`
`51`	`52`	`/**`
`@@ -60,7 +61,8 @@ public function testSlowStorage($request)`
`60`	`61`	`$this->assertObjectHasAttribute('response', $request);`
`61`	`62`	`$this->assertEquals('bar', $request->response);`
`62`	`63`	`// FastStorage has no 'foo' key, the SlowStorage is responding`
`63`		`- $this->assertEquals('DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible\SlowStorage', $request->forDebugOnly);`
	`64`	`+ $className = 'DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible\SlowStorage';`
	`65`	`+ $this->assertEquals($className, $request->forDebugOnly);`
`64`	`66`	`}`
`65`	`67`
`66`	`68`	`/**`
`@@ -73,6 +75,7 @@ public function testFailure($request)`
`73`	`75`
`74`	`76`	`$this->assertFalse($ret);`
`75`	`77`	`// the last responsible :`
`76`		`- $this->assertEquals('DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible\SlowStorage', $request->forDebugOnly);`
	`78`	`+ $className = 'DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible\SlowStorage';`
	`79`	`+ $this->assertEquals($className, $request->forDebugOnly);`
`77`	`80`	`}`
`78`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public function getBook($bookNumberToGet)`
`13`	`13`	`return $this->books[$bookNumberToGet];`
`14`	`14`	`}`
`15`	`15`
`16`		`- return NULL;`
	`16`	`+ return null;`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`public function addBook(Book $book)`
Original file line number	Diff line number	Diff line change
`@@ -74,4 +74,4 @@ public function rewind()`
`74`	`74`	`{`
`75`	`75`	`$this->currentBook = 0;`
`76`	`76`	`}`
`77`		`-}`
	`77`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,4 @@ public function valid()`
`20`	`20`	`{`
`21`	`21`	`return 0 <= $this->currentBook;`
`22`	`22`	`}`
`23`		`-}`
	`23`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -63,4 +63,4 @@ public function testUseAReverseIteratorAndValidateAuthors($expected)`
`63`	`63`	`$iterator->next();`
`64`	`64`	`}`
`65`	`65`	`}`
`66`		`-}`
	`66`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -31,4 +31,4 @@ public function isSatisfiedBy(Item $item)`
`31`	`31`	`{`
`32`	`32`	`return !$this->spec->isSatisfiedBy($item);`
`33`	`33`	`}`
`34`		`-}`
	`34`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -30,10 +30,10 @@ public function __construct(array $elements = array())`
`30`	`30`	`*/`
`31`	`31`	`public function sort()`
`32`	`32`	`{`
`33`		`- if (!$this->comparator){`
`34`		`- throw new \LogicException("Comparator is not set");`
	`33`	`+ if (!$this->comparator) {`
	`34`	`+ throw new \LogicException("Comparator is not set");`
`35`	`35`	`}`
`36`		`-`
	`36`	`+`
`37`	`37`	`$callback = array($this->comparator, 'compare');`
`38`	`38`	`uasort($this->elements, $callback);`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ public function testLasVegas()`
`31`	`31`	`{`
`32`	`32`	`$journey = $this->getMockForAbstractClass('DesignPatterns\Behavioral\TemplateMethod\Journey');`
`33`	`33`	`$journey->expects($this->once())`
`34`		`- ->method('enjoyVacation')`
`35`		`- ->will($this->returnCallback(array($this, 'mockUpVacation')));`
	`34`	`+ ->method('enjoyVacation')`
	`35`	`+ ->will($this->returnCallback(array($this, 'mockUpVacation')));`
`36`	`36`	`$this->expectOutputRegex('#Las Vegas#');`
`37`	`37`	`$journey->takeATrip();`
`38`	`38`	`}`
`@@ -41,5 +41,4 @@ public function mockUpVacation()`
`41`	`41`	`{`
`42`	`42`	`echo "Fear and loathing in Las Vegas\n";`
`43`	`43`	`}`
`44`		`-`
`45`		`-}`
	`44`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -43,5 +43,4 @@ public function testUnknownObject()`
`43`	`43`	`$mock = $this->getMockForAbstractClass('DesignPatterns\Behavioral\Visitor\Role');`
`44`	`44`	`$mock->accept($this->visitor);`
`45`	`45`	`}`
`46`		`-`
`47`		`-}`
	`46`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ class Pool`
`7`	`7`
`8`	`8`	`private $instances = array();`
`9`	`9`	`private $class;`
`10`		`-`
	`10`	`+`
`11`	`11`	`public function __construct($class)`
`12`	`12`	`{`
`13`	`13`	`$this->class = $class;`
`@@ -26,5 +26,4 @@ public function dispose($instance)`
`26`	`26`	`{`
`27`	`27`	`$this->instances[] = $instance;`
`28`	`28`	`}`
`29`		`-`
`30`	`29`	`}`