Update Doctrine Inflector API (#14)

.php_cs

@@ -54,7 +54,7 @@ return \PhpCsFixer\Config::create()
             'no_trailing_comma_in_singleline_array' => true,
             'no_unneeded_control_parentheses' => true,
             'no_unneeded_curly_braces' => true,
-            'no_unneeded_final_method' => true,
+            'no_unneeded_final_method' => false,
             'no_unreachable_default_argument_value' => false,
             'no_unused_imports' => true,
             'no_useless_else' => true,

composer.json

@@ -32,6 +32,7 @@
         "ext-json": "*",
         "doctrine/doctrine-bundle": "~1.6",
         "doctrine/orm": "~2.1",
+        "doctrine/inflector": "^1.4",
         "stof/doctrine-extensions-bundle": "*",
         "symfony/framework-bundle": "^3.4|^4.0",
         "symfony/security-bundle": "^3.4|^4.0"

src/EventListener/VisitorTrackingSubscriber.php

@@ -8,7 +8,7 @@
 use Alpha\VisitorTrackingBundle\Entity\PageView;
 use Alpha\VisitorTrackingBundle\Entity\Session;
 use Alpha\VisitorTrackingBundle\Storage\SessionStore;
-use Doctrine\Common\Inflector\Inflector;
+use Doctrine\Inflector\InflectorFactory;
 use Doctrine\ORM\EntityManager;
 use Symfony\Bundle\SecurityBundle\Security\FirewallMap;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -167,10 +167,10 @@ private function generateSessionAndLifetime(Request $request): void
         $session->setUserAgent(\is_string($userAgent) ? $userAgent : '');
         $session->setQueryString($request->getQueryString() ?: '');
         $session->setLoanTerm($request->query->get('y') ?: '');
-        $session->setRepApr($request->query->has('r') ? (string) (\hexdec($request->query->get('r')) / 100) : '');
+        $session->setRepApr($request->query->has('r') ? (string) (\hexdec((string) $request->query->get('r')) / 100) : '');
 
         foreach (self::UTM_CODES as $code) {
-            $method = 'set'.Inflector::classify($code);
+            $method = 'set'.InflectorFactory::create()->build()->classify($code);
             $session->$method($request->query->get($code) ?: '');
         }
 
@@ -209,7 +209,7 @@ private function sessionMatchesRequestParameters(Request $request): bool
         }
 
         foreach (self::UTM_CODES as $code) {
-            $method = 'get'.Inflector::classify($code);
+            $method = 'get'.InflectorFactory::create()->build()->classify($code);
 
             if ($request->query->get($code, '') !== $session->$method()) {
                 return false;

src/Features/Context/DeviceContext.php

@@ -7,7 +7,7 @@
 use Behat\Behat\Context\Context;
 use Behat\Behat\Context\SnippetAcceptingContext;
 use Behat\MinkExtension\Context\RawMinkContext;
-use Doctrine\Common\Inflector\Inflector;
+use Doctrine\Inflector\InflectorFactory;
 use Doctrine\ORM\EntityManagerInterface;
 use Alpha\VisitorTrackingBundle\Entity\Lifetime;
 
@@ -44,7 +44,7 @@ public function theCookieHasTheValue(): void
         $session->setLoanTerm('');
         $session->setRepApr('');
         foreach ($this->utmCodes as $code) {
-            $method = 'set'.Inflector::classify($code);
+            $method = 'set'.InflectorFactory::create()->build()->classify($code);
             $session->$method('');
         }
 

tools/phpstan/phpstan.neon

@@ -7,7 +7,7 @@ parameters:
 	checkMissingIterableValueType: false
 	reportUnmatchedIgnoredErrors: false
 	ignoreErrors:
-		- "#Call to function method_exists() with 'Symfony\\\\Component…' and 'getRootNode' will always evaluate to false.#"
+		- "#Call to function method_exists\\(\\) with 'Symfony\\\\Component…' and 'getRootNode' will always evaluate to false.#"
 
 services:
     -