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

src/Helper/Escaper/AbstractHelper.php

@@ -133,6 +133,6 @@ public function __invoke($value, $recurse = self::RECURSE_NONE)
      * @param string $value
      * @return string
      */
-    protected abstract function escape($value);
+    abstract protected function escape($value);
 
 }

src/Helper/HeadMeta.php

@@ -162,14 +162,14 @@ public function __call($method, $args)
         return parent::__call($method, $args);
     }
 
-	/**
-	 * Create an HTML5-style meta charset tag. Something like <meta charset="utf-8">
-	 *
-	 * Not valid in a non-HTML5 doctype
-	 *
-	 * @param string $charset
-	 * @return \Zend\View\Helper\HeadMeta Provides a fluent interface
-	 */
+    /**
+     * Create an HTML5-style meta charset tag. Something like <meta charset="utf-8">
+     *
+     * Not valid in a non-HTML5 doctype
+     *
+     * @param string $charset
+     * @return \Zend\View\Helper\HeadMeta Provides a fluent interface
+     */
     public function setCharset($charset)
     {
         $item = new \stdClass;
@@ -344,9 +344,9 @@ public function itemToString(\stdClass $item)
             if ($this->view->plugin('doctype')->isHtml5()
                 && $type == 'charset'
             ) {
-				$tpl = ($this->view->plugin('doctype')->isXhtml())
-					? '<meta %s="%s"/>'
-					: '<meta %s="%s">';
+                $tpl = ($this->view->plugin('doctype')->isXhtml())
+                    ? '<meta %s="%s"/>'
+                    : '<meta %s="%s">';
             } elseif ($this->view->plugin('doctype')->isXhtml()) {
                 $tpl = '<meta %s="%s" content="%s" %s/>';
             } else {

src/Model/ModelInterface.php

@@ -147,7 +147,7 @@ public function setTerminal($terminate);
     public function terminate();
 
 
-	/**
+    /**
      * Set flag indicating whether or not append to child  with the same capture
      *
      * @param  bool $append

src/Model/ViewModel.php

@@ -65,7 +65,7 @@ class ViewModel implements ModelInterface
     protected $variables = array();
 
 
-	/**
+    /**
      * Is this append to child  with the same capture?
      *
      * @var bool
@@ -288,9 +288,9 @@ public function addChild(ModelInterface $child, $captureTo = null, $append = nul
         if (null !== $captureTo) {
             $child->setCaptureTo($captureTo);
         }
-		if (null !== $captureTo) {
-			$child->setAppend($append);
-		}
+        if (null !== $captureTo) {
+            $child->setAppend($append);
+        }
 
         return $this;
     }
@@ -361,7 +361,7 @@ public function terminate()
         return $this->terminate;
     }
 
-	/**
+    /**
      * Set flag indicating whether or not append to child  with the same capture
      *
      * @param  bool $append

src/Renderer/JsonRenderer.php

@@ -85,7 +85,7 @@ public function setMergeUnnamedChildren($mergeUnnamedChildren)
         return $this;
     }
 
-	/**
+    /**
      * Set the JSONP callback function name
      *
      * @param  string $callback

test/Helper/HeadMetaTest.php

@@ -389,37 +389,37 @@ public function testContainerMaintainsCorrectOrderOfItems()
         $this->assertEquals($expected, $test);
     }
 
-	/**
-	 * @issue ZF-7722
-	 */
-	public function testCharsetValidateFail()
-	{
-		$view = new View();
-		$view->plugin('doctype')->__invoke('HTML4_STRICT');
+    /**
+     * @issue ZF-7722
+     */
+    public function testCharsetValidateFail()
+    {
+        $view = new View();
+        $view->plugin('doctype')->__invoke('HTML4_STRICT');
 
         $this->setExpectedException('Zend\View\Exception\ExceptionInterface');
         $view->plugin('headMeta')->setCharset('utf-8');
-	}
+    }
 
-	/**
-	 * @issue ZF-7722
-	 */
+    /**
+     * @issue ZF-7722
+     */
     public function testCharset()
     {
-		$view = new View();
-		$view->plugin('doctype')->__invoke('HTML5');
+        $view = new View();
+        $view->plugin('doctype')->__invoke('HTML5');
 
-		$view->plugin('headMeta')->setCharset('utf-8');
-		$this->assertEquals(
-			'<meta charset="utf-8">',
-			$view->plugin('headMeta')->toString());
+        $view->plugin('headMeta')->setCharset('utf-8');
+        $this->assertEquals(
+            '<meta charset="utf-8">',
+            $view->plugin('headMeta')->toString());
 
-		$view->plugin('doctype')->__invoke('XHTML5');
+        $view->plugin('doctype')->__invoke('XHTML5');
 
-		$this->assertEquals(
-			'<meta charset="utf-8"/>',
-			$view->plugin('headMeta')->toString());
-	}
+        $this->assertEquals(
+            '<meta charset="utf-8"/>',
+            $view->plugin('headMeta')->toString());
+    }
 
      /**
      * @group ZF-9743

test/Helper/HeadStyleTest.php

@@ -408,7 +408,7 @@ public function testRenderConditionalCommentsShouldNotContainHtmlEscaping()
     {
         $style = 'a{display:none;}';
         $this->helper->appendStyle($style, array(
-        	'conditional' => 'IE 8'
+            'conditional' => 'IE 8'
         ));
         $value = $this->helper->toString();
 

test/Helper/Navigation/SitemapTest.php

@@ -48,7 +48,7 @@ class SitemapTest extends AbstractTest
     protected function setUp()
     {
         $this->_originaltimezone = date_default_timezone_get();
-    	date_default_timezone_set('Europe/Berlin');
+        date_default_timezone_set('Europe/Berlin');
 
         if (isset($_SERVER['SERVER_NAME'])) {
             $this->_oldServer['SERVER_NAME'] = $_SERVER['SERVER_NAME'];
@@ -173,7 +173,7 @@ public function testDropXmlDeclaration()
 
     public function testThrowExceptionOnInvalidLoc()
     {
-	    $this->markTestIncomplete('Zend\URI changes affect this test');
+        $this->markTestIncomplete('Zend\URI changes affect this test');
         $nav = clone $this->_nav2;
         $nav->addPage(array('label' => 'Invalid', 'uri' => 'http://w.'));
 

test/Renderer/JsonRendererTest.php

@@ -188,7 +188,7 @@ public function testRendersViewModelsWithoutChildrenWithJsonpCallback()
         $this->assertEquals($expected, $test);
     }
 
-	/**
+    /**
      * @dataProvider getNonObjectModels
      */
     public function testRendersNonObjectModelAsJsonWithJsonpCallback($model)