Skip to content

Commit

Permalink
feat!: update core and opentracing to v1 (#23)
Browse files Browse the repository at this point in the history
BREAKING CHANGE: update core and opentracing to v1
  • Loading branch information
cawolf authored Nov 17, 2021
1 parent b95274d commit 77afc5f
Show file tree
Hide file tree
Showing 8 changed files with 6,854 additions and 21 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ jobs:
- php: '7.4'
symfony: '4.4.*'
- php: '7.3'
symfony: '5.1.*'
symfony: '5.3.*'
- php: '7.4'
symfony: '5.1.*'
symfony: '5.3.*'
steps:
- name: checkout
uses: actions/checkout@v2
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
symfony:
- '3.4.*'
- '4.4.*'
- '5.1.*'
- '5.3.*'
steps:
- name: checkout
uses: actions/checkout@v2
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
composer.lock
.phpunit.result.cache
/.php-version
/build/
Expand Down
2 changes: 1 addition & 1 deletion DBAL/TracingConnectionFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function __construct(

/**
* @param array<string,mixed> $params
* @param string[]|Type[] $mappingTypes
* @param array<string,string> $mappingTypes
* @throws DBALException
*/
public function createConnection(
Expand Down
5 changes: 2 additions & 3 deletions DBAL/TracingDriverConnection.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
use Auxmoney\OpentracingBundle\Internal\Constant;
use Auxmoney\OpentracingBundle\Service\Tracing;
use Doctrine\DBAL\Driver\Connection as DBALDriverConnection;
use Doctrine\DBAL\Driver\Statement as DoctrineStatement;

/**
* @SuppressWarnings(PHPMD.TooManyPublicMethods)
Expand All @@ -33,7 +32,7 @@ public function __construct(

/**
* @param string $prepareString
* @return iterable<DoctrineStatement>
* @return TracingStatement
*/
public function prepare($prepareString)
{
Expand All @@ -42,7 +41,7 @@ public function prepare($prepareString)
}

/**
* @return iterable<DoctrineStatement>
* @return TracingStatement
*/
public function query()
{
Expand Down
5 changes: 2 additions & 3 deletions DBAL/TracingStatement.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

/**
* @SuppressWarnings(PHPMD.TooManyPublicMethods)
* @implements IteratorAggregate<Statement>
*/
final class TracingStatement implements IteratorAggregate, StatementCombinedResult, WrappingStatement
{
Expand Down Expand Up @@ -137,7 +136,7 @@ public function execute($params = null): bool
$result = $this->statement->execute($params);
$this->spanFactory->afterOperation(
$this->sql,
$params ?? $this->params ?? [],
$params ?? $this->params,
$this->username,
$this->statement->rowCount()
);
Expand All @@ -153,7 +152,7 @@ public function rowCount()
}

/**
* @return iterable<Statement>
* @return Statement<Statement>
*/
public function getIterator()
{
Expand Down
18 changes: 9 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,24 @@
"type": "symfony-bundle",
"license": "MIT",
"require": {
"php": "^7.1.33",
"php": "^7.3.27",
"ext-json": "*",
"auxmoney/opentracing-bundle-core": "^0.7.1",
"opentracing/opentracing": "1.0.0-beta5@beta",
"auxmoney/opentracing-bundle-core": "^1.0",
"opentracing/opentracing": "^1.0.1",
"doctrine/doctrine-bundle": "^1.11|^2.0",
"doctrine/dbal": "^2.11"
},
"require-dev": {
"roave/security-advisories": "dev-master",
"roave/security-advisories": "dev-latest",
"phpunit/phpunit": "^7.5",
"phpstan/phpstan": "^0.12",
"squizlabs/php_codesniffer": "^3.5",
"phpmd/phpmd": "^2.7",
"php-coveralls/php-coveralls": "^2.2",
"phpstan/phpstan": "^1.1",
"squizlabs/php_codesniffer": "^3.6",
"phpmd/phpmd": "^2.10",
"php-coveralls/php-coveralls": "^2.5",
"symfony/filesystem": "*",
"symfony/process": "*",
"symfony/yaml": "*",
"mtdowling/jmespath.php": "^2.5"
"mtdowling/jmespath.php": "^2.6"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit 77afc5f

Please sign in to comment.