Skip to content

Commit

Permalink
Merge pull request #136 from doctrine/dependencies/doctrine-coding-st…
Browse files Browse the repository at this point in the history
…andard-v7

Update to doctrine/coding-standard v7
  • Loading branch information
carusogabriel committed Jan 8, 2020
2 parents 8fe4010 + 24855e9 commit 6dcf635
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 33 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"php": "^7.2"
},
"require-dev": {
"doctrine/coding-standard": "^6.0",
"doctrine/coding-standard": "^7.0",
"phpstan/phpstan": "^0.11",
"phpstan/phpstan-phpunit": "^0.11",
"phpstan/phpstan-strict-rules": "^0.11",
Expand Down
53 changes: 27 additions & 26 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions tests/Doctrine/Tests/Inflector/RulesetInflectorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
namespace Doctrine\Tests\Inflector;

use Doctrine\Inflector\Rules\Patterns;
use Doctrine\Inflector\Rules\Rules;
use Doctrine\Inflector\Rules\Ruleset;
use Doctrine\Inflector\Rules\Substitutions;
use Doctrine\Inflector\Rules\Transformations;
Expand All @@ -23,7 +22,6 @@ class RulesetInflectorTest extends TestCase

public function testInflectIrregular() : void
{
/** @var Substitutions|MockObject $irregular */
$irregular = $this->createMock(Substitutions::class);

$this->ruleset->expects(self::once())
Expand All @@ -40,7 +38,6 @@ public function testInflectIrregular() : void

public function testInflectUninflected() : void
{
/** @var Patterns|MockObject $uninflected */
$uninflected = $this->createMock(Patterns::class);

$this->ruleset->expects(self::once())
Expand All @@ -57,13 +54,10 @@ public function testInflectUninflected() : void

public function testInflectRules() : void
{
/** @var Substitutions|MockObject $irregular */
$irregular = $this->createMock(Substitutions::class);

/** @var Patterns|MockObject $uninflected */
$uninflected = $this->createMock(Patterns::class);

/** @var Rules|MockObject $rules */
$regular = $this->createMock(Transformations::class);

$this->ruleset->expects(self::once())
Expand Down

0 comments on commit 6dcf635

Please sign in to comment.