Skip to content

Commit

Permalink
Resolved merge conflicts from commit 83ba3cf
Browse files Browse the repository at this point in the history
  • Loading branch information
localheinz authored and Mike Willbanks committed Jun 20, 2013
1 parent 19ad624 commit fa5bfde
Showing 81 changed files with 81 additions and 257 deletions.
4 changes: 1 addition & 3 deletions library/Zend/Cache/Storage/Adapter/AbstractAdapter.php
Original file line number Diff line number Diff line change
@@ -24,9 +24,7 @@
use Zend\EventManager\EventManagerInterface;
use Zend\EventManager\EventsCapableInterface;

abstract class AbstractAdapter implements
StorageInterface,
EventsCapableInterface
abstract class AbstractAdapter implements StorageInterface, EventsCapableInterface
{
/**
* The used EventManager if any
4 changes: 1 addition & 3 deletions library/Zend/Cache/Storage/Adapter/KeyListIterator.php
Original file line number Diff line number Diff line change
@@ -13,9 +13,7 @@
use Zend\Cache\Storage\IteratorInterface;
use Zend\Cache\Storage\StorageInterface;

class KeyListIterator implements
IteratorInterface,
Countable
class KeyListIterator implements IteratorInterface, Countable
{

/**
4 changes: 1 addition & 3 deletions library/Zend/Code/Reflection/DocBlock/Tag/MethodTag.php
Original file line number Diff line number Diff line change
@@ -9,9 +9,7 @@

namespace Zend\Code\Reflection\DocBlock\Tag;

class MethodTag implements
TagInterface,
PhpDocTypedTagInterface
class MethodTag implements TagInterface, PhpDocTypedTagInterface
{
/**
* Return value type
4 changes: 1 addition & 3 deletions library/Zend/Code/Reflection/DocBlock/Tag/ParamTag.php
Original file line number Diff line number Diff line change
@@ -9,9 +9,7 @@

namespace Zend\Code\Reflection\DocBlock\Tag;

class ParamTag implements
TagInterface,
PhpDocTypedTagInterface
class ParamTag implements TagInterface, PhpDocTypedTagInterface
{
/**
* @var array
4 changes: 1 addition & 3 deletions library/Zend/Code/Reflection/DocBlock/Tag/PropertyTag.php
Original file line number Diff line number Diff line change
@@ -9,9 +9,7 @@

namespace Zend\Code\Reflection\DocBlock\Tag;

class PropertyTag implements
TagInterface,
PhpDocTypedTagInterface
class PropertyTag implements TagInterface, PhpDocTypedTagInterface
{
/**
* @var array
4 changes: 1 addition & 3 deletions library/Zend/Code/Reflection/DocBlock/Tag/ReturnTag.php
Original file line number Diff line number Diff line change
@@ -9,9 +9,7 @@

namespace Zend\Code\Reflection\DocBlock\Tag;

class ReturnTag implements
TagInterface,
PhpDocTypedTagInterface
class ReturnTag implements TagInterface, PhpDocTypedTagInterface
{
/**
* @var array
4 changes: 1 addition & 3 deletions library/Zend/Code/Reflection/DocBlock/Tag/ThrowsTag.php
Original file line number Diff line number Diff line change
@@ -9,9 +9,7 @@

namespace Zend\Code\Reflection\DocBlock\Tag;

class ThrowsTag implements
TagInterface,
PhpDocTypedTagInterface
class ThrowsTag implements TagInterface, PhpDocTypedTagInterface
{
/**
* @var string
5 changes: 1 addition & 4 deletions library/Zend/Config/Config.php
Original file line number Diff line number Diff line change
@@ -21,10 +21,7 @@
* Implements Countable, Iterator and ArrayAccess
* to facilitate easy access to the data.
*/
class Config implements
Countable,
Iterator,
ArrayAccess
class Config implements Countable, Iterator, ArrayAccess
{
/**
* Whether modifications to configuration data are allowed.
4 changes: 1 addition & 3 deletions library/Zend/Db/Adapter/Adapter.php
Original file line number Diff line number Diff line change
@@ -15,9 +15,7 @@
* @property Driver\DriverInterface $driver
* @property Platform\PlatformInterface $platform
*/
class Adapter implements
AdapterInterface,
Profiler\ProfilerAwareInterface
class Adapter implements AdapterInterface, Profiler\ProfilerAwareInterface
{
/**
* Query Mode Constants
4 changes: 1 addition & 3 deletions library/Zend/Db/Adapter/Driver/IbmDb2/Connection.php
Original file line number Diff line number Diff line change
@@ -13,9 +13,7 @@
use Zend\Db\Adapter\Exception;
use Zend\Db\Adapter\Profiler;

class Connection implements
ConnectionInterface,
Profiler\ProfilerAwareInterface
class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
{
/** @var IbmDb2 */
protected $driver = null;
4 changes: 1 addition & 3 deletions library/Zend/Db/Adapter/Driver/IbmDb2/IbmDb2.php
Original file line number Diff line number Diff line change
@@ -13,9 +13,7 @@
use Zend\Db\Adapter\Exception;
use Zend\Db\Adapter\Profiler;

class IbmDb2 implements
DriverInterface,
Profiler\ProfilerAwareInterface
class IbmDb2 implements DriverInterface, Profiler\ProfilerAwareInterface
{
/**
* @var Connection
4 changes: 1 addition & 3 deletions library/Zend/Db/Adapter/Driver/IbmDb2/Statement.php
Original file line number Diff line number Diff line change
@@ -14,9 +14,7 @@
use Zend\Db\Adapter\ParameterContainer;
use Zend\Db\Adapter\Profiler;

class Statement implements
StatementInterface,
Profiler\ProfilerAwareInterface
class Statement implements StatementInterface, Profiler\ProfilerAwareInterface
{
/**
* @var resource
4 changes: 1 addition & 3 deletions library/Zend/Db/Adapter/Driver/Mysqli/Connection.php
Original file line number Diff line number Diff line change
@@ -13,9 +13,7 @@
use Zend\Db\Adapter\Exception;
use Zend\Db\Adapter\Profiler;

class Connection implements
ConnectionInterface,
Profiler\ProfilerAwareInterface
class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
{

/**
4 changes: 1 addition & 3 deletions library/Zend/Db/Adapter/Driver/Mysqli/Mysqli.php
Original file line number Diff line number Diff line change
@@ -14,9 +14,7 @@
use Zend\Db\Adapter\Exception;
use Zend\Db\Adapter\Profiler;

class Mysqli implements
DriverInterface,
Profiler\ProfilerAwareInterface
class Mysqli implements DriverInterface, Profiler\ProfilerAwareInterface
{

/**
4 changes: 1 addition & 3 deletions library/Zend/Db/Adapter/Driver/Mysqli/Statement.php
Original file line number Diff line number Diff line change
@@ -14,9 +14,7 @@
use Zend\Db\Adapter\ParameterContainer;
use Zend\Db\Adapter\Profiler;

class Statement implements
StatementInterface,
Profiler\ProfilerAwareInterface
class Statement implements StatementInterface, Profiler\ProfilerAwareInterface
{

/**
4 changes: 1 addition & 3 deletions library/Zend/Db/Adapter/Driver/Oci8/Connection.php
Original file line number Diff line number Diff line change
@@ -13,9 +13,7 @@
use Zend\Db\Adapter\Exception;
use Zend\Db\Adapter\Profiler;

class Connection implements
ConnectionInterface,
Profiler\ProfilerAwareInterface
class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
{
/**
* @var Oci8
4 changes: 1 addition & 3 deletions library/Zend/Db/Adapter/Driver/Oci8/Oci8.php
Original file line number Diff line number Diff line change
@@ -13,9 +13,7 @@
use Zend\Db\Adapter\Exception;
use Zend\Db\Adapter\Profiler;

class Oci8 implements
DriverInterface,
Profiler\ProfilerAwareInterface
class Oci8 implements DriverInterface, Profiler\ProfilerAwareInterface
{

/**
4 changes: 1 addition & 3 deletions library/Zend/Db/Adapter/Driver/Oci8/Result.php
Original file line number Diff line number Diff line change
@@ -13,9 +13,7 @@
use Zend\Db\Adapter\Driver\ResultInterface;
use Zend\Db\Adapter\Exception;

class Result implements
Iterator,
ResultInterface
class Result implements Iterator, ResultInterface
{

/**
4 changes: 1 addition & 3 deletions library/Zend/Db/Adapter/Driver/Oci8/Statement.php
Original file line number Diff line number Diff line change
@@ -14,9 +14,7 @@
use Zend\Db\Adapter\ParameterContainer;
use Zend\Db\Adapter\Profiler;

class Statement implements
StatementInterface,
Profiler\ProfilerAwareInterface
class Statement implements StatementInterface, Profiler\ProfilerAwareInterface
{

/**
4 changes: 1 addition & 3 deletions library/Zend/Db/Adapter/Driver/Pdo/Connection.php
Original file line number Diff line number Diff line change
@@ -13,9 +13,7 @@
use Zend\Db\Adapter\Exception;
use Zend\Db\Adapter\Profiler;

class Connection implements
ConnectionInterface,
Profiler\ProfilerAwareInterface
class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
{
/**
* @var Pdo
5 changes: 1 addition & 4 deletions library/Zend/Db/Adapter/Driver/Pdo/Pdo.php
Original file line number Diff line number Diff line change
@@ -16,10 +16,7 @@
use Zend\Db\Adapter\Exception;
use Zend\Db\Adapter\Profiler;

class Pdo implements
DriverInterface,
DriverFeatureInterface,
Profiler\ProfilerAwareInterface
class Pdo implements DriverInterface, DriverFeatureInterface, Profiler\ProfilerAwareInterface
{
/**
* @const
4 changes: 1 addition & 3 deletions library/Zend/Db/Adapter/Driver/Pdo/Result.php
Original file line number Diff line number Diff line change
@@ -14,9 +14,7 @@
use Zend\Db\Adapter\Driver\ResultInterface;
use Zend\Db\Adapter\Exception;

class Result implements
Iterator,
ResultInterface
class Result implements Iterator, ResultInterface
{

const STATEMENT_MODE_SCROLLABLE = 'scrollable';
4 changes: 1 addition & 3 deletions library/Zend/Db/Adapter/Driver/Pdo/Statement.php
Original file line number Diff line number Diff line change
@@ -14,9 +14,7 @@
use Zend\Db\Adapter\ParameterContainer;
use Zend\Db\Adapter\Profiler;

class Statement implements
StatementInterface,
Profiler\ProfilerAwareInterface
class Statement implements StatementInterface, Profiler\ProfilerAwareInterface
{

/**
4 changes: 1 addition & 3 deletions library/Zend/Db/Adapter/Driver/Pgsql/Connection.php
Original file line number Diff line number Diff line change
@@ -13,9 +13,7 @@
use Zend\Db\Adapter\Exception;
use Zend\Db\Adapter\Profiler;

class Connection implements
ConnectionInterface,
Profiler\ProfilerAwareInterface
class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
{
/**
* @var Pgsql
4 changes: 1 addition & 3 deletions library/Zend/Db/Adapter/Driver/Pgsql/Pgsql.php
Original file line number Diff line number Diff line change
@@ -13,9 +13,7 @@
use Zend\Db\Adapter\Exception;
use Zend\Db\Adapter\Profiler;

class Pgsql implements
DriverInterface,
Profiler\ProfilerAwareInterface
class Pgsql implements DriverInterface, Profiler\ProfilerAwareInterface
{
/**
* @var Connection
4 changes: 1 addition & 3 deletions library/Zend/Db/Adapter/Driver/Pgsql/Statement.php
Original file line number Diff line number Diff line change
@@ -14,9 +14,7 @@
use Zend\Db\Adapter\ParameterContainer;
use Zend\Db\Adapter\Profiler;

class Statement implements
StatementInterface,
Profiler\ProfilerAwareInterface
class Statement implements StatementInterface, Profiler\ProfilerAwareInterface
{
/**
* @var int
4 changes: 1 addition & 3 deletions library/Zend/Db/Adapter/Driver/Sqlsrv/Connection.php
Original file line number Diff line number Diff line change
@@ -14,9 +14,7 @@
use Zend\Db\Adapter\Exception;
use Zend\Db\Adapter\Profiler;

class Connection implements
ConnectionInterface,
Profiler\ProfilerAwareInterface
class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
{
/**
* @var Sqlsrv
4 changes: 1 addition & 3 deletions library/Zend/Db/Adapter/Driver/Sqlsrv/Result.php
Original file line number Diff line number Diff line change
@@ -12,9 +12,7 @@
use Iterator;
use Zend\Db\Adapter\Driver\ResultInterface;

class Result implements
Iterator,
ResultInterface
class Result implements Iterator, ResultInterface
{

/**
4 changes: 1 addition & 3 deletions library/Zend/Db/Adapter/Driver/Sqlsrv/Sqlsrv.php
Original file line number Diff line number Diff line change
@@ -13,9 +13,7 @@
use Zend\Db\Adapter\Exception;
use Zend\Db\Adapter\Profiler;

class Sqlsrv implements
DriverInterface,
Profiler\ProfilerAwareInterface
class Sqlsrv implements DriverInterface, Profiler\ProfilerAwareInterface
{

/**
4 changes: 1 addition & 3 deletions library/Zend/Db/Adapter/Driver/Sqlsrv/Statement.php
Original file line number Diff line number Diff line change
@@ -14,9 +14,7 @@
use Zend\Db\Adapter\ParameterContainer;
use Zend\Db\Adapter\Profiler;

class Statement implements
StatementInterface,
Profiler\ProfilerAwareInterface
class Statement implements StatementInterface, Profiler\ProfilerAwareInterface
{

/**
5 changes: 1 addition & 4 deletions library/Zend/Db/Adapter/ParameterContainer.php
Original file line number Diff line number Diff line change
@@ -13,10 +13,7 @@
use Countable;
use Iterator;

class ParameterContainer implements
Iterator,
ArrayAccess,
Countable
class ParameterContainer implements Iterator, ArrayAccess, Countable
{

const TYPE_AUTO = 'auto';
4 changes: 1 addition & 3 deletions library/Zend/Db/ResultSet/AbstractResultSet.php
Original file line number Diff line number Diff line change
@@ -16,9 +16,7 @@
use IteratorAggregate;
use Zend\Db\Adapter\Driver\ResultInterface;

abstract class AbstractResultSet implements
Iterator,
ResultSetInterface
abstract class AbstractResultSet implements Iterator, ResultSetInterface
{
/**
* if -1, datasource is already buffered
5 changes: 1 addition & 4 deletions library/Zend/Db/RowGateway/AbstractRowGateway.php
Original file line number Diff line number Diff line change
@@ -14,10 +14,7 @@
use Zend\Db\Sql\Sql;
use Zend\Db\Sql\TableIdentifier;

abstract class AbstractRowGateway implements
ArrayAccess,
Countable,
RowGatewayInterface
abstract class AbstractRowGateway implements ArrayAccess, Countable, RowGatewayInterface
{

/**
4 changes: 1 addition & 3 deletions library/Zend/Db/Sql/Delete.php
Original file line number Diff line number Diff line change
@@ -19,9 +19,7 @@
*
* @property Where $where
*/
class Delete extends AbstractSql implements
SqlInterface,
PreparableSqlInterface
class Delete extends AbstractSql implements SqlInterface, PreparableSqlInterface
{
/**@#+
* @const
4 changes: 1 addition & 3 deletions library/Zend/Db/Sql/Insert.php
Original file line number Diff line number Diff line change
@@ -15,9 +15,7 @@
use Zend\Db\Adapter\Platform\Sql92;
use Zend\Db\Adapter\StatementContainerInterface;

class Insert extends AbstractSql implements
SqlInterface,
PreparableSqlInterface
class Insert extends AbstractSql implements SqlInterface, PreparableSqlInterface
{
/**#@+
* Constants
Loading

0 comments on commit fa5bfde

Please sign in to comment.