Update dependencies (#175)

fre5h · Sep 25, 2020 · 8b7ebcf · 8b7ebcf
1 parent 7560f78
commit 8b7ebcf
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 16 deletions.
diff --git a/.styleci.yml b/.styleci.yml
@@ -1,14 +1,19 @@
+risky: true
 preset: symfony
-
-version: 7
-
+tab-width: 4
+use-tabs: false
 enabled:
   - combine_consecutive_unsets
   - ordered_class_elements
-  - ordered_imports
-
+  - alpha_ordered_imports
+  - declare_strict_types
+  - phpdoc_order
+disabled:
+  - no_superfluous_phpdoc_tags_symfony
+  - native_function_invocation_symfony
 finder:
   exclude:
     - "Tests"
+    - "vendor"
   name:
     - "*.php"
diff --git a/DBAL/Types/AbstractEnumType.php b/DBAL/Types/AbstractEnumType.php
@@ -122,7 +122,7 @@ public function requiresSQLCommentHint(AbstractPlatform $platform): bool
      */
     public function getName(): string
     {
-        return $this->name ?: (string) \array_search(\get_class($this), self::getTypesMap(), true);
+        return $this->name ?: (string) \array_search(static::class, self::getTypesMap(), true);
     }
 
     /**

diff --git a/FreshDoctrineEnumBundle.php b/FreshDoctrineEnumBundle.php
@@ -8,9 +8,11 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Fresh\DoctrineEnumBundle;
 
-use Doctrine\Common\Persistence\ConnectionRegistry;
+use Doctrine\Persistence\ConnectionRegistry;
 use Fresh\DoctrineEnumBundle\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpKernel\Bundle\Bundle;

diff --git a/Tests/Form/EnumTypeGuesserTest.php b/Tests/Form/EnumTypeGuesserTest.php
@@ -12,8 +12,8 @@
 
 namespace Fresh\DoctrineEnumBundle\Tests\Form;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
+use Doctrine\Persistence\ManagerRegistry;
 use Fresh\DoctrineEnumBundle\Exception\EnumType\EnumTypeIsRegisteredButClassDoesNotExistException;
 use Fresh\DoctrineEnumBundle\Form\EnumTypeGuesser;
 use Fresh\DoctrineEnumBundle\Tests\Fixtures\DBAL\Types\BasketballPositionType;

diff --git a/Tests/FreshDoctrineEnumBundleTest.php b/Tests/FreshDoctrineEnumBundleTest.php
@@ -12,9 +12,9 @@
 
 namespace Fresh\DoctrineEnumBundle\Tests;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\Persistence\ManagerRegistry;
 use Fresh\DoctrineEnumBundle\Exception\InvalidArgumentException;
 use Fresh\DoctrineEnumBundle\FreshDoctrineEnumBundle;
 use PHPUnit\Framework\MockObject\MockObject;

diff --git a/Tests/Validator/EnumValidatorTest.php b/Tests/Validator/EnumValidatorTest.php
@@ -90,14 +90,14 @@ public function testInvalidBasketballPositionType(): void
         $constraintValidationBuilder
             ->expects(self::at(0))
             ->method('setParameter')
-            ->with($this->equalTo('{{ value }}'), $this->equalTo('"Pitcher"'))
+            ->with(self::equalTo('{{ value }}'), self::equalTo('"Pitcher"'))
             ->willReturnSelf()
         ;
 
         $constraintValidationBuilder
             ->expects(self::at(1))
             ->method('setParameter')
-            ->with($this->equalTo('{{ choices }}'), $this->equalTo('"PG", "SG", "SF", "PF", "C"'))
+            ->with(self::equalTo('{{ choices }}'), self::equalTo('"PG", "SG", "SF", "PF", "C"'))
             ->willReturnSelf()
         ;
 
@@ -110,7 +110,7 @@ public function testInvalidBasketballPositionType(): void
         $this->context
             ->expects(self::once())
             ->method('buildViolation')
-            ->with($this->equalTo('The value you selected is not a valid choice.'))
+            ->with(self::equalTo('The value you selected is not a valid choice.'))
             ->willReturn($constraintValidationBuilder)
         ;
 

diff --git a/Twig/Extension/ReadableEnumValueTwigExtension.php b/Twig/Extension/ReadableEnumValueTwigExtension.php
@@ -37,12 +37,12 @@ public function getFilters(): array
      * @param string|null $enumValue
      * @param string|null $enumType
      *
-     * @return string|null
-     *
      * @throws EnumTypeIsNotRegisteredException
      * @throws NoRegisteredEnumTypesException
      * @throws ValueIsFoundInFewRegisteredEnumTypesException
      * @throws ValueIsNotFoundInAnyRegisteredEnumTypeException
+     *
+     * @return string|null
      */
     public function getReadableEnumValue(?string $enumValue, ?string $enumType = null): ?string
     {

diff --git a/Validator/Constraints/EnumValidator.php b/Validator/Constraints/EnumValidator.php
@@ -8,6 +8,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Fresh\DoctrineEnumBundle\Validator\Constraints;
 
 use Fresh\DoctrineEnumBundle\Exception\RuntimeException;

diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
     "require": {
         "php": ">=7.1.3",
         "doctrine/doctrine-bundle": "^2.0",
-        "doctrine/common": "~2.8",
+        "doctrine/common": "~2.8 || ^3.0",
         "doctrine/orm": "~2.6",
         "symfony/config": "^4.3",
         "symfony/dependency-injection": "^4.3",
@@ -35,7 +35,7 @@
         "twig/twig": "~2.11 || ^3.0"
     },
     "require-dev": {
-        "escapestudios/symfony2-coding-standard": "^3.10",
+        "escapestudios/symfony2-coding-standard": "^3.11",
         "phpstan/phpstan": "^0.12",
         "phpstan/phpstan-doctrine":"^0.12",
         "phpstan/phpstan-phpunit": "^0.12",
-Original file line number
+Diff line change
@@ Expand Up @@
          */
         public function getName(): string
         {
-            return $this->name ?: (string) \array_search(\get_class($this), self::getTypesMap(), true);
+            return $this->name ?: (string) \array_search(static::class, self::getTypesMap(), true);
         }
         /**
@@ Expand Down @@