Skip to content
This repository has been archived by the owner on May 8, 2024. It is now read-only.

Commit

Permalink
Merge commit 'refs/pull/3522/head' of github.com:zendframework/zf2 in…
Browse files Browse the repository at this point in the history
…to hotfix/remove-blank-line
  • Loading branch information
Maks3w committed Jan 23, 2013
2 parents d71ba83 + 9a2f219 commit 6b721bc
Show file tree
Hide file tree
Showing 178 changed files with 0 additions and 178 deletions.
1 change: 0 additions & 1 deletion library/Zend/Authentication/Adapter/DbTable.php
Original file line number Diff line number Diff line change
Expand Up @@ -487,5 +487,4 @@ protected function _authenticateCreateAuthResult()
$this->authenticateResultInfo['messages']
);
}

}
1 change: 0 additions & 1 deletion library/Zend/Cache/Storage/Adapter/MemoryOptions.php
Original file line number Diff line number Diff line change
Expand Up @@ -114,5 +114,4 @@ protected function normalizeMemoryLimit($value)

return $value;
}

}
1 change: 0 additions & 1 deletion library/Zend/Code/Generator/AbstractMemberGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -257,5 +257,4 @@ public function getName()
{
return $this->name;
}

}
1 change: 0 additions & 1 deletion library/Zend/Code/Generator/ClassGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -691,5 +691,4 @@ public function generate()

return $output;
}

}
1 change: 0 additions & 1 deletion library/Zend/Code/Generator/DocBlock/Tag.php
Original file line number Diff line number Diff line change
Expand Up @@ -135,5 +135,4 @@ public function generate()

return $output;
}

}
1 change: 0 additions & 1 deletion library/Zend/Code/Generator/DocBlock/Tag/ParamTag.php
Original file line number Diff line number Diff line change
Expand Up @@ -105,5 +105,4 @@ public function generate()
. (($this->description != null) ? ' ' . $this->description : '');
return $output;
}

}
1 change: 0 additions & 1 deletion library/Zend/Code/Generator/DocBlock/Tag/ReturnTag.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,4 @@ public function generate()
$output = '@return ' . $this->datatype . ' ' . $this->description;
return $output;
}

}
1 change: 0 additions & 1 deletion library/Zend/Code/Generator/DocBlockGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -236,5 +236,4 @@ protected function docCommentize($content)

return $output;
}

}
1 change: 0 additions & 1 deletion library/Zend/Code/Generator/FileGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -592,5 +592,4 @@ public function write()
file_put_contents($this->filename, $this->generate());
return $this;
}

}
1 change: 0 additions & 1 deletion library/Zend/Code/Generator/MethodGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -217,5 +217,4 @@ public function __toString()
{
return $this->generate();
}

}
1 change: 0 additions & 1 deletion library/Zend/Code/Generator/ParameterGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -244,5 +244,4 @@ public function generate()

return $output;
}

}
1 change: 0 additions & 1 deletion library/Zend/Code/Generator/PropertyGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -177,5 +177,4 @@ public function generate()

return $output;
}

}
1 change: 0 additions & 1 deletion library/Zend/Code/Generator/PropertyValueGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,4 @@ public function generate()
{
return parent::generate() . ';';
}

}
1 change: 0 additions & 1 deletion library/Zend/Code/Generator/ValueGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -369,5 +369,4 @@ public function __toString()
{
return $this->generate();
}

}
1 change: 0 additions & 1 deletion library/Zend/Code/NameInformation.php
Original file line number Diff line number Diff line change
Expand Up @@ -110,5 +110,4 @@ public function resolveName($name)
}
return $name;
}

}
1 change: 0 additions & 1 deletion library/Zend/Code/Reflection/ClassReflection.php
Original file line number Diff line number Diff line change
Expand Up @@ -220,5 +220,4 @@ public function __toString()
{
return parent::__toString();
}

}
1 change: 0 additions & 1 deletion library/Zend/Code/Reflection/DocBlock/Tag/GenericTag.php
Original file line number Diff line number Diff line change
Expand Up @@ -95,5 +95,4 @@ protected function parse($docBlockLine)
$this->content = trim($docBlockLine);
$this->values = explode($this->contentSplitCharacter, $docBlockLine);
}

}
1 change: 0 additions & 1 deletion library/Zend/Code/Reflection/DocBlock/TagManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -86,5 +86,4 @@ public function createTag($tagName, $content = null)

return $newTag;
}

}
1 change: 0 additions & 1 deletion library/Zend/Code/Reflection/DocBlockReflection.php
Original file line number Diff line number Diff line change
Expand Up @@ -284,5 +284,4 @@ public function __toString()
{
return $this->toString();
}

}
1 change: 0 additions & 1 deletion library/Zend/Code/Reflection/MethodReflection.php
Original file line number Diff line number Diff line change
Expand Up @@ -166,5 +166,4 @@ public function __toString()
{
return parent::__toString();
}

}
1 change: 0 additions & 1 deletion library/Zend/Code/Reflection/ParameterReflection.php
Original file line number Diff line number Diff line change
Expand Up @@ -110,5 +110,4 @@ public function __toString()
{
return parent::__toString();
}

}
1 change: 0 additions & 1 deletion library/Zend/Code/Scanner/ClassScanner.php
Original file line number Diff line number Diff line change
Expand Up @@ -787,5 +787,4 @@ protected function scan()
$this->isScanned = true;
return;
}

}
1 change: 0 additions & 1 deletion library/Zend/Code/Scanner/DerivedClassScanner.php
Original file line number Diff line number Diff line change
Expand Up @@ -274,5 +274,4 @@ public function hasMethod($name)
}
return false;
}

}
1 change: 0 additions & 1 deletion library/Zend/Code/Scanner/FileScanner.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,4 @@ public function getFile()
{
return $this->file;
}

}
1 change: 0 additions & 1 deletion library/Zend/Code/Scanner/MethodScanner.php
Original file line number Diff line number Diff line change
Expand Up @@ -392,5 +392,4 @@ protected function scan()
$this->isScanned = true;
return;
}

}
1 change: 0 additions & 1 deletion library/Zend/Code/Scanner/ParameterScanner.php
Original file line number Diff line number Diff line change
Expand Up @@ -346,5 +346,4 @@ public function isPassedByReference()
$this->scan();
return $this->isPassedByReference;
}

}
1 change: 0 additions & 1 deletion library/Zend/Code/Scanner/TokenArrayScanner.php
Original file line number Diff line number Diff line change
Expand Up @@ -630,5 +630,4 @@ protected function getUsesNoScan($namespace)

return $uses;
}

}
1 change: 0 additions & 1 deletion library/Zend/Config/Processor/Translator.php
Original file line number Diff line number Diff line change
Expand Up @@ -142,5 +142,4 @@ public function processValue($value)
{
return $this->translator->translate($value, $this->textDomain, $this->locale);
}

}
1 change: 0 additions & 1 deletion library/Zend/Console/Prompt/Char.php
Original file line number Diff line number Diff line change
Expand Up @@ -215,5 +215,4 @@ public function getEcho()
{
return $this->echo;
}

}
1 change: 0 additions & 1 deletion library/Zend/Console/Prompt/Confirm.php
Original file line number Diff line number Diff line change
Expand Up @@ -112,5 +112,4 @@ public function getYesChar()
{
return $this->yesChar;
}

}
1 change: 0 additions & 1 deletion library/Zend/Console/Prompt/Line.php
Original file line number Diff line number Diff line change
Expand Up @@ -116,5 +116,4 @@ public function getPromptText()
{
return $this->promptText;
}

}
1 change: 0 additions & 1 deletion library/Zend/Console/Prompt/Number.php
Original file line number Diff line number Diff line change
Expand Up @@ -211,5 +211,4 @@ public function getAllowFloat()
{
return $this->allowFloat;
}

}
1 change: 0 additions & 1 deletion library/Zend/Console/Request.php
Original file line number Diff line number Diff line change
Expand Up @@ -191,5 +191,4 @@ public function getScriptName()
{
return $this->scriptName;
}

}
1 change: 0 additions & 1 deletion library/Zend/Crypt/Symmetric/Padding/Pkcs7.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,4 @@ public function strip($string)
}
return false;
}

}
1 change: 0 additions & 1 deletion library/Zend/Db/Adapter/Adapter.php
Original file line number Diff line number Diff line change
Expand Up @@ -281,5 +281,4 @@ protected function createPlatformFromDriver(Driver\DriverInterface $driver)
return new Platform\Sql92();
}
}

}
1 change: 0 additions & 1 deletion library/Zend/Db/Adapter/Driver/Mysqli/Mysqli.php
Original file line number Diff line number Diff line change
Expand Up @@ -230,5 +230,4 @@ public function getLastGeneratedValue()
{
return $this->getConnection()->getLastGeneratedValue();
}

}
1 change: 0 additions & 1 deletion library/Zend/Db/Adapter/Driver/Mysqli/Result.php
Original file line number Diff line number Diff line change
Expand Up @@ -345,5 +345,4 @@ public function getGeneratedValue()
{
return $this->generatedValue;
}

}
1 change: 0 additions & 1 deletion library/Zend/Db/Adapter/Driver/Mysqli/Statement.php
Original file line number Diff line number Diff line change
Expand Up @@ -285,5 +285,4 @@ protected function bindParametersFromContainer()
call_user_func_array(array($this->resource, 'bind_param'), $args);
}
}

}
1 change: 0 additions & 1 deletion library/Zend/Db/Adapter/Driver/Pdo/Connection.php
Original file line number Diff line number Diff line change
Expand Up @@ -401,5 +401,4 @@ public function getLastGeneratedValue($name = null)
}
return false;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -81,5 +81,4 @@ public function getRowCountClosure($context)
: $sqliteRowCounter->getCountForSql($context);
};
}

}
1 change: 0 additions & 1 deletion library/Zend/Db/Adapter/Driver/Pdo/Pdo.php
Original file line number Diff line number Diff line change
Expand Up @@ -271,5 +271,4 @@ public function getLastGeneratedValue()
{
return $this->connection->getLastGeneratedValue();
}

}
1 change: 0 additions & 1 deletion library/Zend/Db/Adapter/Driver/Pdo/Result.php
Original file line number Diff line number Diff line change
Expand Up @@ -228,5 +228,4 @@ public function getGeneratedValue()
{
return $this->generatedValue;
}

}
1 change: 0 additions & 1 deletion library/Zend/Db/Adapter/Driver/Pdo/Statement.php
Original file line number Diff line number Diff line change
Expand Up @@ -274,5 +274,4 @@ public function __clone()
}

}

}
1 change: 0 additions & 1 deletion library/Zend/Db/Adapter/Driver/Pgsql/Connection.php
Original file line number Diff line number Diff line change
Expand Up @@ -244,5 +244,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');
}

}
1 change: 0 additions & 1 deletion library/Zend/Db/Adapter/Driver/Sqlsrv/Connection.php
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,4 @@ public function getLastGeneratedValue($name = null)
$row = sqlsrv_fetch_array($result);
return $row['Current_Identity'];
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,4 @@ public function __construct($errors = false)
{
$this->errors = ($errors === false) ? sqlsrv_errors() : $errors;
}

}
1 change: 0 additions & 1 deletion library/Zend/Db/Adapter/Driver/Sqlsrv/Sqlsrv.php
Original file line number Diff line number Diff line change
Expand Up @@ -185,5 +185,4 @@ public function getLastGeneratedValue()
{
return $this->getConnection()->getLastGeneratedValue();
}

}
1 change: 0 additions & 1 deletion library/Zend/Db/Adapter/Driver/Sqlsrv/Statement.php
Original file line number Diff line number Diff line change
Expand Up @@ -260,5 +260,4 @@ protected function bindParametersFromContainer()
// }
//}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,4 @@ public function __construct($message, $parameters)
parent::__construct($message);
$this->parameters = $parameters;
}

}
1 change: 0 additions & 1 deletion library/Zend/Db/Adapter/Platform/Mysql.php
Original file line number Diff line number Diff line change
Expand Up @@ -139,5 +139,4 @@ public function quoteIdentifierInFragment($identifier, array $safeWords = array(
}
return implode('', $parts);
}

}
1 change: 0 additions & 1 deletion library/Zend/Db/Adapter/Platform/Postgresql.php
Original file line number Diff line number Diff line change
Expand Up @@ -138,5 +138,4 @@ public function quoteIdentifierInFragment($identifier, array $safeWords = array(
}
return implode('', $parts);
}

}
1 change: 0 additions & 1 deletion library/Zend/Db/Adapter/Platform/Sql92.php
Original file line number Diff line number Diff line change
Expand Up @@ -141,5 +141,4 @@ public function quoteIdentifierInFragment($identifier, array $safeWords = array(

return implode('', $parts);
}

}
1 change: 0 additions & 1 deletion library/Zend/Db/Adapter/Platform/SqlServer.php
Original file line number Diff line number Diff line change
Expand Up @@ -138,5 +138,4 @@ public function quoteIdentifierInFragment($identifier, array $safeWords = array(
}
return implode('', $parts);
}

}
1 change: 0 additions & 1 deletion library/Zend/Db/Adapter/Platform/Sqlite.php
Original file line number Diff line number Diff line change
Expand Up @@ -139,5 +139,4 @@ public function quoteIdentifierInFragment($identifier, array $safeWords = array(
}
return implode('', $parts);
}

}
1 change: 0 additions & 1 deletion library/Zend/Db/Metadata/Metadata.php
Original file line number Diff line number Diff line change
Expand Up @@ -252,5 +252,4 @@ public function getColumn($columnName, $table, $schema = null)
{
return $this->source->getColumn($columnName, $table, $schema);
}

}
1 change: 0 additions & 1 deletion library/Zend/Db/Metadata/Object/ColumnObject.php
Original file line number Diff line number Diff line change
Expand Up @@ -392,5 +392,4 @@ public function setErrata($errataName, $errataValue)
$this->errata[$errataName] = $errataValue;
return $this;
}

}
1 change: 0 additions & 1 deletion library/Zend/Db/Metadata/Object/ConstraintObject.php
Original file line number Diff line number Diff line change
Expand Up @@ -414,5 +414,4 @@ public function isCheck()
{
return ('CHECK' == $this->type);
}

}
1 change: 0 additions & 1 deletion library/Zend/Db/Metadata/Source/AbstractSource.php
Original file line number Diff line number Diff line change
Expand Up @@ -549,5 +549,4 @@ protected function loadTriggerData($schema)

$this->prepareDataHierarchy('triggers', $schema);
}

}
1 change: 0 additions & 1 deletion library/Zend/Db/Metadata/Source/SqlServerMetadata.php
Original file line number Diff line number Diff line change
Expand Up @@ -346,5 +346,4 @@ protected function loadTriggerData($schema)

$this->data['triggers'][$schema] = $data;
}

}
1 change: 0 additions & 1 deletion library/Zend/Db/ResultSet/AbstractResultSet.php
Original file line number Diff line number Diff line change
Expand Up @@ -271,5 +271,4 @@ public function toArray()
}
return $return;
}

}
1 change: 0 additions & 1 deletion library/Zend/Db/ResultSet/HydratingResultSet.php
Original file line number Diff line number Diff line change
Expand Up @@ -109,5 +109,4 @@ public function toArray()
}
return $return;
}

}
1 change: 0 additions & 1 deletion library/Zend/Db/ResultSet/ResultSet.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,5 +115,4 @@ public function current()

return $data;
}

}
1 change: 0 additions & 1 deletion library/Zend/Db/RowGateway/AbstractRowGateway.php
Original file line number Diff line number Diff line change
Expand Up @@ -352,5 +352,4 @@ protected function processPrimaryKeyData()
$this->primaryKeyData[$column] = $this->data[$column];
}
}

}
1 change: 0 additions & 1 deletion library/Zend/Db/RowGateway/Feature/AbstractFeature.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,4 @@ public function getMagicMethodSpecifications()
{
return array();
}

}
1 change: 0 additions & 1 deletion library/Zend/Db/RowGateway/RowGateway.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,4 @@ public function __construct($primaryKeyColumn, $table, $adapterOrSql = null)

$this->initialize();
}

}
1 change: 0 additions & 1 deletion library/Zend/Db/Sql/AbstractSql.php
Original file line number Diff line number Diff line change
Expand Up @@ -165,5 +165,4 @@ protected function processSubSelect(Select $subselect, PlatformInterface $platfo
}
return $sql;
}

}
Loading

0 comments on commit 6b721bc

Please sign in to comment.