Merge branch 'cs/zendframework/zendframework#6674-zend-view-cs-fixes'…

… into develop

Close zendframework/zendframework#6674
Forward port zendframework/zendframework#6674

src/Exception/BadMethodCallException.php

@@ -12,8 +12,6 @@
 /**
  * Bad method call exception
  */
-class BadMethodCallException
-    extends \BadMethodCallException
-    implements ExceptionInterface
+class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
 {
 }

src/Exception/DomainException.php

@@ -12,8 +12,6 @@
 /**
  * Domain exception
  */
-class DomainException
-    extends \DomainException
-    implements ExceptionInterface
+class DomainException extends \DomainException implements ExceptionInterface
 {
 }

src/Exception/InvalidArgumentException.php

@@ -12,8 +12,6 @@
 /**
  * Invalid argument exception
  */
-class InvalidArgumentException
-    extends \InvalidArgumentException
-    implements ExceptionInterface
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
 }

src/Exception/InvalidHelperException.php

@@ -12,8 +12,6 @@
 /**
  * Invalid helper exception
  */
-class InvalidHelperException
-    extends \Exception
-    implements ExceptionInterface
+class InvalidHelperException extends \Exception implements ExceptionInterface
 {
 }

src/Exception/RuntimeException.php

@@ -12,8 +12,6 @@
 /**
  * Runtime exception
  */
-class RuntimeException
-    extends \RuntimeException
-    implements ExceptionInterface
+class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
 }

src/Exception/UnexpectedValueException.php

@@ -12,7 +12,6 @@
 /**
  * Unexpected value exception
  */
-class UnexpectedValueException extends \UnexpectedValueException implements
-    ExceptionInterface
+class UnexpectedValueException extends \UnexpectedValueException implements ExceptionInterface
 {
 }

src/Helper/Cycle.php

@@ -88,7 +88,7 @@ public function toString()
      * @param  string $name
      * @return Cycle
      */
-    public function assign(Array $data , $name = self::DEFAULT_NAME)
+    public function assign(array $data, $name = self::DEFAULT_NAME)
     {
         $this->setName($name);
         $this->data[$name] = $data;
@@ -127,7 +127,6 @@ public function getName()
         return $this->name;
     }
 
-
     /**
      * Return all elements
      *

src/Helper/EscapeCss.php

@@ -9,7 +9,6 @@
 
 namespace Zend\View\Helper;
 
-
 /**
  * Helper for escaping values
  */

src/Helper/EscapeHtml.php

@@ -9,7 +9,6 @@
 
 namespace Zend\View\Helper;
 
-
 /**
  * Helper for escaping values
  */

src/Helper/EscapeHtmlAttr.php

@@ -9,7 +9,6 @@
 
 namespace Zend\View\Helper;
 
-
 /**
  * Helper for escaping values
  */

src/Helper/EscapeJs.php

@@ -9,7 +9,6 @@
 
 namespace Zend\View\Helper;
 
-
 /**
  * Helper for escaping values
  */

src/Helper/EscapeUrl.php

@@ -9,7 +9,6 @@
 
 namespace Zend\View\Helper;
 
-
 /**
  * Helper for escaping values
  */

src/Helper/HeadLink.php

@@ -144,10 +144,9 @@ public function __call($method, $args)
             }
 
             if (1 > $argc) {
-                throw new Exception\BadMethodCallException(sprintf(
-                    '%s requires at least one argument',
-                    $method
-                 ));
+                throw new Exception\BadMethodCallException(
+                    sprintf('%s requires at least one argument', $method)
+                );
             }
 
             if (is_array($args[0])) {
@@ -266,7 +265,6 @@ public function set($value)
         return $this->getContainer()->set($value);
     }
 
-
     /**
      * Create HTML link element from data item
      *
@@ -300,10 +298,7 @@ public function itemToString(stdClass $item)
             return '';
         }
 
-        if (isset($attributes['conditionalStylesheet'])
-            && !empty($attributes['conditionalStylesheet'])
-            && is_string($attributes['conditionalStylesheet'])
-        ) {
+        if (isset($attributes['conditionalStylesheet']) && !empty($attributes['conditionalStylesheet']) && is_string($attributes['conditionalStylesheet'])) {
             // inner wrap with comment end and start if !IE
             if (str_replace(' ', '', $attributes['conditionalStylesheet']) === '!IE') {
                 $link = '<!-->' . $link . '<!--';

src/Helper/HeadMeta.php

@@ -115,11 +115,7 @@ public function __invoke($content = null, $keyValue = null, $keyType = 'name', $
      */
     public function __call($method, $args)
     {
-        if (preg_match(
-            '/^(?P<action>set|(pre|ap)pend|offsetSet)(?P<type>Name|HttpEquiv|Property|Itemprop)$/',
-            $method,
-            $matches)
-        ) {
+        if (preg_match('/^(?P<action>set|(pre|ap)pend|offsetSet)(?P<type>Name|HttpEquiv|Property|Itemprop)$/', $method, $matches)) {
             $action = $matches['action'];
             $type   = $this->normalizeType($matches['type']);
             $argc   = count($args);
@@ -265,10 +261,7 @@ public function itemToString(stdClass $item)
             $modifiersString
         );
 
-        if (isset($item->modifiers['conditional'])
-            && !empty($item->modifiers['conditional'])
-            && is_string($item->modifiers['conditional'])
-        ) {
+        if (isset($item->modifiers['conditional']) && !empty($item->modifiers['conditional']) && is_string($item->modifiers['conditional'])) {
             // inner wrap with comment end and start if !IE
             if (str_replace(' ', '', $item->modifiers['conditional']) === '!IE') {
                 $meta = '<!-->' . $meta . '<!--';

src/Helper/HeadScript.php

@@ -328,10 +328,7 @@ public function createData($type, array $attributes, $content = null)
     protected function isDuplicate($file)
     {
         foreach ($this->getContainer() as $item) {
-            if (($item->source === null)
-                && array_key_exists('src', $item->attributes)
-                && ($file == $item->attributes['src'])
-            ) {
+            if (($item->source === null) && array_key_exists('src', $item->attributes) && ($file == $item->attributes['src'])) {
                 return true;
             }
         }
@@ -347,10 +344,7 @@ protected function isDuplicate($file)
      */
     protected function isValid($value)
     {
-        if ((!$value instanceof stdClass)
-            || !isset($value->type)
-            || (!isset($value->source) && !isset($value->attributes))
-        ) {
+        if ((!$value instanceof stdClass) || !isset($value->type) || (!isset($value->source) && !isset($value->attributes))) {
             return false;
         }
 
@@ -372,8 +366,7 @@ public function itemToString($item, $indent, $escapeStart, $escapeEnd)
         if (!empty($item->attributes)) {
             foreach ($item->attributes as $key => $value) {
                 if ((!$this->arbitraryAttributesAllowed() && !in_array($key, $this->optionalAttributes))
-                    || in_array($key, array('conditional', 'noescape'))
-                ) {
+                    || in_array($key, array('conditional', 'noescape'))) {
                     continue;
                 }
                 if ('defer' == $key) {
@@ -404,10 +397,7 @@ public function itemToString($item, $indent, $escapeStart, $escapeEnd)
         }
         $html .= '</script>';
 
-        if (isset($item->attributes['conditional'])
-            && !empty($item->attributes['conditional'])
-            && is_string($item->attributes['conditional'])
-        ) {
+        if (isset($item->attributes['conditional']) && !empty($item->attributes['conditional']) && is_string($item->attributes['conditional'])) {
             // inner wrap with comment end and start if !IE
             if (str_replace(' ', '', $item->attributes['conditional']) === '!IE') {
                 $html = '<!-->' . $html . '<!--';

src/Helper/HeadStyle.php

@@ -264,10 +264,7 @@ public function createData($content, array $attributes)
      */
     protected function isValid($value)
     {
-        if ((!$value instanceof stdClass)
-            || !isset($value->content)
-            || !isset($value->attributes)
-        ) {
+        if ((!$value instanceof stdClass) || !isset($value->content) || !isset($value->attributes)) {
             return false;
         }
 

src/Helper/HeadTitle.php

@@ -111,9 +111,7 @@ public function renderTitle()
 
         if (null !== ($translator = $this->getTranslator())) {
             foreach ($this as $item) {
-                $items[] = $translator->translate(
-                    $item, $this->getTranslatorTextDomain()
-                );
+                $items[] = $translator->translate($item, $this->getTranslatorTextDomain());
             }
         } else {
             foreach ($this as $item) {

src/Helper/Navigation.php

@@ -201,7 +201,8 @@ protected function inject(NavigationHelper $helper)
 
         if ($this->getInjectTranslator() && !$helper->hasTranslator()) {
             $helper->setTranslator(
-                $this->getTranslator(), $this->getTranslatorTextDomain()
+                $this->getTranslator(),
+                $this->getTranslatorTextDomain()
             );
         }
     }

src/Helper/Navigation/Breadcrumbs.php

@@ -203,8 +203,8 @@ public function renderPartial($container = null, $partial = null)
             if (count($partial) != 2) {
                 throw new Exception\InvalidArgumentException(
                     'Unable to render menu: A view partial supplied as '
-                        .  'an array must contain two values: partial view '
-                        .  'script and module where script can be found'
+                    .  'an array must contain two values: partial view '
+                    .  'script and module where script can be found'
                 );
             }
 

src/Helper/Navigation/Sitemap.php

@@ -237,8 +237,7 @@ public function getDomSitemap(AbstractContainer $container = null)
                 if (!$this->getUseSitemapValidators() ||
                     $priorityValidator->isValid($priority)) {
                     $urlNode->appendChild(
-                        $dom->createElementNS(self::SITEMAP_NS, 'priority',
-                            $priority)
+                        $dom->createElementNS(self::SITEMAP_NS, 'priority', $priority)
                     );
                 }
             }

src/Helper/Placeholder/Container/AbstractStandalone.php

@@ -250,10 +250,12 @@ public function setContainerClass($name)
     {
         if (!class_exists($name)) {
             throw new Exception\DomainException(
-                sprintf('%s expects a valid container class name; received "%s", which did not resolve',
+                sprintf(
+                    '%s expects a valid container class name; received "%s", which did not resolve',
                     __METHOD__,
                     $name
-                ));
+                )
+            );
         }
 
         if (!in_array('Zend\View\Helper\Placeholder\Container\AbstractContainer', class_parents($name))) {

src/Helper/Placeholder/Registry.php

@@ -156,10 +156,12 @@ public function setContainerClass($name)
     {
         if (!class_exists($name)) {
             throw new Exception\DomainException(
-                sprintf('%s expects a valid registry class name; received "%s", which did not resolve',
-                        __METHOD__,
-                        $name
-                ));
+                sprintf(
+                    '%s expects a valid registry class name; received "%s", which did not resolve',
+                    __METHOD__,
+                    $name
+                )
+            );
         }
 
         if (!in_array('Zend\View\Helper\Placeholder\Container\AbstractContainer', class_parents($name))) {

src/Model/ConsoleModel.php

@@ -9,7 +9,6 @@
 
 namespace Zend\View\Model;
 
-
 class ConsoleModel extends ViewModel
 {
     const RESULT = 'result';

src/Model/ModelInterface.php

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

src/Model/ViewModel.php

@@ -58,7 +58,6 @@ class ViewModel implements ModelInterface, ClearableModelInterface, RetrievableC
      */
     protected $variables = array();
 
-
     /**
      * Is this append to child  with the same capture?
      *

src/Stream.php

@@ -73,8 +73,8 @@ public function stream_open($path, $mode, $options, &$opened_path)
          * Convert <?= ?> to long-form <?php echo ?> and <?php ?> to <?php ?>
          *
          */
-        $this->data = preg_replace('/\<\?\=/',          "<?php echo ",  $this->data);
-        $this->data = preg_replace('/<\?(?!xml|php)/s', '<?php ',       $this->data);
+        $this->data = preg_replace('/\<\?\=/', "<?php echo ", $this->data);
+        $this->data = preg_replace('/<\?(?!xml|php)/s', '<?php ', $this->data);
 
         /**
          * file_get_contents() won't update PHP's stat cache, so we grab a stat
@@ -109,7 +109,6 @@ public function stream_read($count)
         return $ret;
     }
 
-
     /**
      * Tells the current position in the stream.
      *
@@ -120,7 +119,6 @@ public function stream_tell()
         return $this->pos;
     }
 
-
     /**
      * Tells if we are at the end of the stream.
      *
@@ -131,7 +129,6 @@ public function stream_eof()
         return $this->pos >= strlen($this->data);
     }
 
-
     /**
      * Stream statistics.
      *
@@ -142,7 +139,6 @@ public function stream_stat()
         return $this->stat;
     }
 
-
     /**
      * Seek to a specific point in the stream.
      *