Merge branch 'cs/psr-2' of https://github.com/Maks3w/zf2

src/Reader/Collection/AbstractCollection.php

@@ -25,6 +25,6 @@ abstract class AbstractCollection extends \ArrayObject
      *
      * @return array
      */
-    public abstract function getValues();
+    abstract public function getValues();
 
 }

src/Reader/Extension/AbstractEntry.php

@@ -190,5 +190,5 @@ public function setXpathPrefix($prefix)
      *
      * @return void
      */
-    protected abstract function _registerNamespaces();
+    abstract protected function _registerNamespaces();
 }

src/Writer/Feed.php

@@ -161,7 +161,7 @@ public function count()
         return count($this->_entries);
     }
 
-	/**
+    /**
      * Return the current entry
      *
      * @return Zend_Feed_Reader_Entry_Interface
@@ -181,7 +181,7 @@ public function key()
         return $this->_entriesKey;
     }
 
-	/**
+    /**
      * Move the feed pointer forward
      *
      * @return void

src/Writer/Writer.php

@@ -21,20 +21,20 @@
 */
 class Writer
 {
-	/**
-	 * Namespace constants
-	 */
-	const NAMESPACE_ATOM_03  = 'http://purl.org/atom/ns#';
+    /**
+     * Namespace constants
+     */
+    const NAMESPACE_ATOM_03  = 'http://purl.org/atom/ns#';
     const NAMESPACE_ATOM_10  = 'http://www.w3.org/2005/Atom';
     const NAMESPACE_RDF      = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#';
     const NAMESPACE_RSS_090  = 'http://my.netscape.com/rdf/simple/0.9/';
     const NAMESPACE_RSS_10   = 'http://purl.org/rss/1.0/';
 
     /**
-	 * Feed type constants
-	 */
-	const TYPE_ANY              = 'any';
-	const TYPE_ATOM_03          = 'atom-03';
+     * Feed type constants
+     */
+    const TYPE_ANY              = 'any';
+    const TYPE_ATOM_03          = 'atom-03';
     const TYPE_ATOM_10          = 'atom-10';
     const TYPE_ATOM_ANY         = 'atom';
     const TYPE_RSS_090          = 'rss-090';

test/PubSubHubbub/SubscriberTest.php

@@ -278,7 +278,7 @@ public function testPreferredVerificationModeDefaultsToSync()
 
     public function testCanSetStorageImplementation()
     {
-	$storage = new Subscription($this->_tableGateway);
+        $storage = new Subscription($this->_tableGateway);
         $this->_subscriber->setStorage($storage);
         $this->assertThat($this->_subscriber->getStorage(), $this->identicalTo($storage));
     }

test/Reader/Entry/CommonTest.php

@@ -140,7 +140,7 @@ public function testFeedEntryCanDetectFeedType()
     /**
     * When passing a newly created DOMElement without any DOMDocument assigned
     */
-    public  function testFeedEntryCanSetAnyType()
+    public function testFeedEntryCanSetAnyType()
     {
         $feed = Reader\Reader::importString(
             file_get_contents($this->_feedSamplePath.'/atom.xml')