Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions analyzer-baseline.toml
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,6 @@ code = "imprecise-type"
message = "Type `array` in return type of `getDependencies` is imprecise, equivalent to `array<array-key, mixed>`."
count = 1

[[issues]]
file = "src/ConfigProvider.php"
code = "missing-constant-type"
message = "Class constant `NAMED_ADAPTER_KEY` is missing a type hint."
count = 1

[[issues]]
file = "src/Container/AbstractAdapterInterfaceFactory.php"
code = "imprecise-type"
Expand Down
16 changes: 8 additions & 8 deletions src/Adapter/AdapterInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@ interface AdapterInterface
/**
* Query Mode Constants
*/
public const string QUERY_MODE_EXECUTE = 'execute';
public const string QUERY_MODE_PREPARE = 'prepare';
final public const string QUERY_MODE_EXECUTE = 'execute';
final public const string QUERY_MODE_PREPARE = 'prepare';

/**
* Prepare Type Constants
*/
public const string PREPARE_TYPE_POSITIONAL = 'positional';
public const string PREPARE_TYPE_NAMED = 'named';
final public const string PREPARE_TYPE_POSITIONAL = 'positional';
final public const string PREPARE_TYPE_NAMED = 'named';

public const string FUNCTION_FORMAT_PARAMETER_NAME = 'formatParameterName';
public const string FUNCTION_QUOTE_IDENTIFIER = 'quoteIdentifier';
public const string FUNCTION_QUOTE_VALUE = 'quoteValue';
final public const string FUNCTION_FORMAT_PARAMETER_NAME = 'formatParameterName';
final public const string FUNCTION_QUOTE_IDENTIFIER = 'quoteIdentifier';
final public const string FUNCTION_QUOTE_VALUE = 'quoteValue';

public const string VALUE_QUOTE_SEPARATOR = 'quoteSeparator';
final public const string VALUE_QUOTE_SEPARATOR = 'quoteSeparator';

/**
* @param ParameterContainer|array<array-key, mixed> $initialParameters
Expand Down
4 changes: 2 additions & 2 deletions src/Adapter/Driver/DriverInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
*/
interface DriverInterface
{
public const string PARAMETERIZATION_POSITIONAL = 'positional';
public const string PARAMETERIZATION_NAMED = 'named';
final public const string PARAMETERIZATION_POSITIONAL = 'positional';
final public const string PARAMETERIZATION_NAMED = 'named';

/**
* Check environment
Expand Down
6 changes: 3 additions & 3 deletions src/Adapter/Driver/Pdo/Result.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
*/
class Result implements Iterator, ResultInterface
{
public const string STATEMENT_MODE_SCROLLABLE = 'scrollable';
public const string STATEMENT_MODE_FORWARD = 'forward';
final public const string STATEMENT_MODE_SCROLLABLE = 'scrollable';
final public const string STATEMENT_MODE_FORWARD = 'forward';

protected string $statementMode = self::STATEMENT_MODE_FORWARD;

Expand All @@ -41,7 +41,7 @@ class Result implements Iterator, ResultInterface
*
* @var list<int>
*/
public const array VALID_FETCH_MODES = [
final public const array VALID_FETCH_MODES = [
PDO::FETCH_LAZY, // 1
PDO::FETCH_ASSOC, // 2
PDO::FETCH_NUM, // 3
Expand Down
14 changes: 7 additions & 7 deletions src/Adapter/ParameterContainer.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@
*/
class ParameterContainer implements Iterator, ArrayAccess, Countable
{
public const string TYPE_AUTO = 'auto';
public const string TYPE_NULL = 'null';
public const string TYPE_DOUBLE = 'double';
public const string TYPE_INTEGER = 'integer';
public const string TYPE_BINARY = 'binary';
public const string TYPE_STRING = 'string';
public const string TYPE_LOB = 'lob';
final public const string TYPE_AUTO = 'auto';
final public const string TYPE_NULL = 'null';
final public const string TYPE_DOUBLE = 'double';
final public const string TYPE_INTEGER = 'integer';
final public const string TYPE_BINARY = 'binary';
final public const string TYPE_STRING = 'string';
final public const string TYPE_LOB = 'lob';

/**
* Data
Expand Down
2 changes: 1 addition & 1 deletion src/ConfigProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

final readonly class ConfigProvider
{
public const NAMED_ADAPTER_KEY = 'adapters';
public const string NAMED_ADAPTER_KEY = 'adapters';

public function getDependencies(): array
{
Expand Down
2 changes: 1 addition & 1 deletion src/Metadata/Source/AbstractSource.php
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
*/
abstract class AbstractSource implements MetadataInterface
{
public const string DEFAULT_SCHEMA = '__DEFAULT_SCHEMA__';
final public const string DEFAULT_SCHEMA = '__DEFAULT_SCHEMA__';

protected string $defaultSchema;

Expand Down
4 changes: 2 additions & 2 deletions src/ResultSet/ResultSet.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
class ResultSet extends AbstractResultSet implements ArrayObjectResultSetInterface
{
/** @deprecated use ResultSetReturnType */
public const string TYPE_ARRAYOBJECT = 'arrayobject';
public const string TYPE_ARRAY = 'array';
final public const string TYPE_ARRAYOBJECT = 'arrayobject';
final public const string TYPE_ARRAY = 'array';

private readonly ResultSetReturnType $returnType;

Expand Down
8 changes: 4 additions & 4 deletions src/Sql/SqlInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ interface SqlInterface
*
* @see ArgumentType
*/
public const string TYPE_IDENTIFIER = 'identifier';
final public const string TYPE_IDENTIFIER = 'identifier';

public const string TYPE_VALUE = 'value';
final public const string TYPE_VALUE = 'value';

public const string TYPE_LITERAL = 'literal';
final public const string TYPE_LITERAL = 'literal';

public const string TYPE_SELECT = 'select';
final public const string TYPE_SELECT = 'select';

/**
* Get SQL string for statement
Expand Down
20 changes: 10 additions & 10 deletions src/TableGateway/Feature/EventFeatureEventsInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@
*/
interface EventFeatureEventsInterface
{
public const string EVENT_PRE_INITIALIZE = 'preInitialize';
public const string EVENT_POST_INITIALIZE = 'postInitialize';
final public const string EVENT_PRE_INITIALIZE = 'preInitialize';
final public const string EVENT_POST_INITIALIZE = 'postInitialize';

public const string EVENT_PRE_SELECT = 'preSelect';
public const string EVENT_POST_SELECT = 'postSelect';
final public const string EVENT_PRE_SELECT = 'preSelect';
final public const string EVENT_POST_SELECT = 'postSelect';

public const string EVENT_PRE_INSERT = 'preInsert';
public const string EVENT_POST_INSERT = 'postInsert';
final public const string EVENT_PRE_INSERT = 'preInsert';
final public const string EVENT_POST_INSERT = 'postInsert';

public const string EVENT_PRE_DELETE = 'preDelete';
public const string EVENT_POST_DELETE = 'postDelete';
final public const string EVENT_PRE_DELETE = 'preDelete';
final public const string EVENT_POST_DELETE = 'postDelete';

public const string EVENT_PRE_UPDATE = 'preUpdate';
public const string EVENT_POST_UPDATE = 'postUpdate';
final public const string EVENT_PRE_UPDATE = 'preUpdate';
final public const string EVENT_POST_UPDATE = 'postUpdate';
}
2 changes: 1 addition & 1 deletion src/TableGateway/Feature/FeatureSet.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/
class FeatureSet
{
public const string APPLY_HALT = 'halt';
final public const string APPLY_HALT = 'halt';

protected ?AbstractTableGateway $tableGateway = null;

Expand Down
Loading