Forward port zendframework#3522

Conflicts:
	library/Zend/Code/Generator/AbstractMemberGenerator.php
	library/Zend/Mvc/Controller/AbstractRestfulController.php
	library/Zend/Soap/Client/DotNet.php

library/Zend/Authentication/Adapter/DbTable.php

@@ -442,5 +442,4 @@ protected function _authenticateCreateAuthResult()
             $this->authenticateResultInfo['messages']
         );
     }
-
 }

library/Zend/Cache/Storage/Adapter/MemoryOptions.php

@@ -109,5 +109,4 @@ protected function normalizeMemoryLimit($value)
 
         return $value;
     }
-
 }

library/Zend/Code/Generator/DocBlock/Tag.php

@@ -132,5 +132,4 @@ public function generate()
 
         return $output;
     }
-
 }

library/Zend/Code/Generator/DocBlock/Tag/ParamTag.php

@@ -88,5 +88,4 @@ public function generate()
 
         return $output;
     }
-
 }

library/Zend/Code/Generator/DocBlock/Tag/ReturnTag.php

@@ -59,5 +59,4 @@ public function generate()
     {
         return '@return ' . $this->datatype . ' ' . $this->description;
     }
-
 }

library/Zend/Code/Generator/DocBlockGenerator.php

@@ -233,5 +233,4 @@ protected function docCommentize($content)
 
         return $output;
     }
-
 }

library/Zend/Code/Generator/MethodGenerator.php

@@ -267,5 +267,4 @@ public function __toString()
     {
         return $this->generate();
     }
-
 }

library/Zend/Code/Generator/ParameterGenerator.php

@@ -284,5 +284,4 @@ public function generate()
 
         return $output;
     }
-
 }

library/Zend/Code/Generator/PropertyGenerator.php

@@ -228,5 +228,4 @@ public function generate()
 
         return $output;
     }
-
 }

library/Zend/Code/Generator/PropertyValueGenerator.php

@@ -18,5 +18,4 @@ public function generate()
     {
         return parent::generate() . ';';
     }
-
 }

library/Zend/Code/Generator/ValueGenerator.php

@@ -353,5 +353,4 @@ public function __toString()
     {
         return $this->generate();
     }
-
 }

library/Zend/Code/NameInformation.php

@@ -152,5 +152,4 @@ public function resolveName($name)
 
         return $name;
     }
-
 }

library/Zend/Code/Reflection/ClassReflection.php

@@ -227,5 +227,4 @@ public function __toString()
     {
         return parent::__toString();
     }
-
 }

library/Zend/Code/Reflection/DocBlock/Tag/GenericTag.php

@@ -104,5 +104,4 @@ protected function parse($docBlockLine)
         $this->content = trim($docBlockLine);
         $this->values = explode($this->contentSplitCharacter, $docBlockLine);
     }
-
 }

library/Zend/Code/Reflection/DocBlock/TagManager.php

@@ -121,5 +121,4 @@ public function createTag($tagName, $content = null)
 
         return $newTag;
     }
-
 }

library/Zend/Code/Reflection/DocBlockReflection.php

@@ -289,5 +289,4 @@ public function __toString()
     {
         return $this->toString();
     }
-
 }

library/Zend/Code/Reflection/MethodReflection.php

@@ -166,5 +166,4 @@ public function __toString()
     {
         return parent::__toString();
     }
-
 }

library/Zend/Code/Reflection/ParameterReflection.php

@@ -105,5 +105,4 @@ public function __toString()
     {
         return parent::__toString();
     }
-
 }

library/Zend/Code/Scanner/ClassScanner.php

@@ -791,5 +791,4 @@ protected function scan()
 
         return;
     }
-
 }

library/Zend/Code/Scanner/DerivedClassScanner.php

@@ -246,5 +246,4 @@ public function hasMethod($name)
 
         return false;
     }
-
 }

library/Zend/Code/Scanner/MethodScanner.php

@@ -534,5 +534,4 @@ protected function scan()
 
         return;
     }
-
 }

library/Zend/Code/Scanner/ParameterScanner.php

@@ -350,5 +350,4 @@ public function isPassedByReference()
 
         return $this->isPassedByReference;
     }
-
 }

library/Zend/Code/Scanner/TokenArrayScanner.php

@@ -676,5 +676,4 @@ protected function getUsesNoScan($namespace)
 
         return $uses;
     }
-
 }

library/Zend/Config/Processor/Translator.php

@@ -136,5 +136,4 @@ public function processValue($value)
     {
         return $this->translator->translate($value, $this->textDomain, $this->locale);
     }
-
 }

library/Zend/Console/Prompt/Char.php

@@ -209,5 +209,4 @@ public function getEcho()
     {
         return $this->echo;
     }
-
 }

library/Zend/Console/Prompt/Confirm.php

@@ -106,5 +106,4 @@ public function getYesChar()
     {
         return $this->yesChar;
     }
-
 }

library/Zend/Console/Prompt/Line.php

@@ -110,5 +110,4 @@ public function getPromptText()
     {
         return $this->promptText;
     }
-
 }

library/Zend/Console/Prompt/Number.php

@@ -205,5 +205,4 @@ public function getAllowFloat()
     {
         return $this->allowFloat;
     }
-
 }

library/Zend/Console/Request.php

@@ -186,5 +186,4 @@ public function getScriptName()
     {
         return $this->scriptName;
     }
-
 }

library/Zend/Crypt/Symmetric/Padding/Pkcs7.php

@@ -46,5 +46,4 @@ public function strip($string)
         }
         return false;
     }
-
 }

library/Zend/Db/Adapter/Driver/Mysqli/Mysqli.php

@@ -224,5 +224,4 @@ public function getLastGeneratedValue()
     {
         return $this->getConnection()->getLastGeneratedValue();
     }
-
 }

library/Zend/Db/Adapter/Driver/Mysqli/Result.php

@@ -339,5 +339,4 @@ public function getGeneratedValue()
     {
         return $this->generatedValue;
     }
-
 }

library/Zend/Db/Adapter/Driver/Mysqli/Statement.php

@@ -279,5 +279,4 @@ protected function bindParametersFromContainer()
             call_user_func_array(array($this->resource, 'bind_param'), $args);
         }
     }
-
 }

library/Zend/Db/Adapter/Driver/Pdo/Connection.php

@@ -395,5 +395,4 @@ public function getLastGeneratedValue($name = null)
         }
         return false;
     }
-
 }

library/Zend/Db/Adapter/Driver/Pdo/Feature/SqliteRowCounter.php

@@ -76,5 +76,4 @@ public function getRowCountClosure($context)
                 : $sqliteRowCounter->getCountForSql($context);
         };
     }
-
 }

library/Zend/Db/Adapter/Driver/Pdo/Pdo.php

@@ -276,5 +276,4 @@ public function getLastGeneratedValue()
     {
         return $this->connection->getLastGeneratedValue();
     }
-
 }

library/Zend/Db/Adapter/Driver/Pdo/Result.php

@@ -222,5 +222,4 @@ public function getGeneratedValue()
     {
         return $this->generatedValue;
     }
-
 }

library/Zend/Db/Adapter/Driver/Pdo/Statement.php

@@ -268,5 +268,4 @@ public function __clone()
         }
 
     }
-
 }

library/Zend/Db/Adapter/Driver/Pgsql/Connection.php

@@ -238,5 +238,4 @@ public function getLastGeneratedValue($name = null)
         $result = pg_query($this->resource, 'SELECT CURRVAL(\'' . str_replace('\'', '\\\'', $name) . '\') as "currval"');
         return pg_fetch_result($result, 0, 'currval');
     }
-
 }

library/Zend/Db/Adapter/Driver/Sqlsrv/Connection.php

@@ -316,5 +316,4 @@ public function getLastGeneratedValue($name = null)
         $row = sqlsrv_fetch_array($result);
         return $row['Current_Identity'];
     }
-
 }

library/Zend/Db/Adapter/Driver/Sqlsrv/Exception/ErrorException.php

@@ -30,5 +30,4 @@ public function __construct($errors = false)
     {
         $this->errors = ($errors === false) ? sqlsrv_errors() : $errors;
     }
-
 }

library/Zend/Db/Adapter/Driver/Sqlsrv/Sqlsrv.php

@@ -179,5 +179,4 @@ public function getLastGeneratedValue()
     {
         return $this->getConnection()->getLastGeneratedValue();
     }
-
 }

library/Zend/Db/Adapter/Driver/Sqlsrv/Statement.php

@@ -254,5 +254,4 @@ protected function bindParametersFromContainer()
         //    }
         //}
     }
-
 }

library/Zend/Db/Adapter/Exception/InvalidConnectionParametersException.php

@@ -26,5 +26,4 @@ public function __construct($message, $parameters)
         parent::__construct($message);
         $this->parameters = $parameters;
     }
-
 }

library/Zend/Db/Adapter/Platform/Mysql.php

@@ -133,5 +133,4 @@ public function quoteIdentifierInFragment($identifier, array $safeWords = array(
         }
         return implode('', $parts);
     }
-
 }

library/Zend/Db/Adapter/Platform/Postgresql.php

@@ -132,5 +132,4 @@ public function quoteIdentifierInFragment($identifier, array $safeWords = array(
         }
         return implode('', $parts);
     }
-
 }

library/Zend/Db/Adapter/Platform/Sql92.php

@@ -135,5 +135,4 @@ public function quoteIdentifierInFragment($identifier, array $safeWords = array(
 
         return implode('', $parts);
     }
-
 }

library/Zend/Db/Adapter/Platform/SqlServer.php

@@ -132,5 +132,4 @@ public function quoteIdentifierInFragment($identifier, array $safeWords = array(
         }
         return implode('', $parts);
     }
-
 }

library/Zend/Db/Adapter/Platform/Sqlite.php

@@ -133,5 +133,4 @@ public function quoteIdentifierInFragment($identifier, array $safeWords = array(
         }
         return implode('', $parts);
     }
-
 }

library/Zend/Db/Metadata/Metadata.php

@@ -246,5 +246,4 @@ public function getColumn($columnName, $table, $schema = null)
     {
         return $this->source->getColumn($columnName, $table, $schema);
     }
-
 }

library/Zend/Db/Metadata/Object/ColumnObject.php

@@ -386,5 +386,4 @@ public function setErrata($errataName, $errataValue)
         $this->errata[$errataName] = $errataValue;
         return $this;
     }
-
 }

library/Zend/Db/Metadata/Object/ConstraintObject.php

@@ -408,5 +408,4 @@ public function isCheck()
     {
         return ('CHECK' == $this->type);
     }
-
 }

library/Zend/Db/Metadata/Source/AbstractSource.php

@@ -543,5 +543,4 @@ protected function loadTriggerData($schema)
 
         $this->prepareDataHierarchy('triggers', $schema);
     }
-
 }

library/Zend/Db/Metadata/Source/SqlServerMetadata.php

@@ -340,5 +340,4 @@ protected function loadTriggerData($schema)
 
         $this->data['triggers'][$schema] = $data;
     }
-
 }

library/Zend/Db/ResultSet/AbstractResultSet.php

@@ -269,5 +269,4 @@ public function toArray()
         }
         return $return;
     }
-
 }

library/Zend/Db/ResultSet/HydratingResultSet.php

@@ -113,5 +113,4 @@ public function toArray()
         }
         return $return;
     }
-
 }

library/Zend/Db/ResultSet/ResultSet.php

@@ -109,5 +109,4 @@ public function current()
 
         return $data;
     }
-
 }

library/Zend/Db/RowGateway/AbstractRowGateway.php

@@ -346,5 +346,4 @@ protected function processPrimaryKeyData()
             $this->primaryKeyData[$column] = $this->data[$column];
         }
     }
-
 }

library/Zend/Db/RowGateway/Feature/AbstractFeature.php

@@ -56,5 +56,4 @@ public function getMagicMethodSpecifications()
     {
         return array();
     }
-
 }

library/Zend/Db/RowGateway/RowGateway.php

@@ -46,5 +46,4 @@ public function __construct($primaryKeyColumn, $table, $adapterOrSql = null)
 
         $this->initialize();
     }
-
 }

library/Zend/Db/Sql/AbstractSql.php

@@ -174,5 +174,4 @@ protected function processSubSelect(Select $subselect, PlatformInterface $platfo
         }
         return $sql;
     }
-
 }

library/Zend/Db/Sql/Expression.php

@@ -143,5 +143,4 @@ public function getExpressionData()
             $types
         ));
     }
-
 }

library/Zend/Db/Sql/Platform/AbstractPlatform.php

@@ -107,5 +107,4 @@ public function getSqlString(PlatformInterface $adapterPlatform = null)
 
         return $this->subject->getSqlString($adapterPlatform);
     }
-
 }

library/Zend/Db/Sql/Platform/Mysql/Mysql.php

@@ -18,5 +18,4 @@ public function __construct(SelectDecorator $selectDecorator = null)
     {
         $this->setTypeDecorator('Zend\Db\Sql\Select', ($selectDecorator) ?: new SelectDecorator());
     }
-
 }

library/Zend/Db/Sql/Platform/Mysql/SelectDecorator.php

@@ -85,5 +85,4 @@ protected function processOffset(PlatformInterface $platform, DriverInterface $d
 
         return array($this->offset);
     }
-
 }

library/Zend/Db/Sql/Platform/Platform.php

@@ -39,5 +39,4 @@ public function __construct(AdapterInterface $adapter)
             default:
         }
     }
-
 }