TASK: Adjust to final Flow 4.0 release

flownative · Jan 30, 2017 · 874c0f4 · 874c0f4
1 parent 5751097
commit 874c0f4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/Classes/Helper.php b/Classes/Helper.php
@@ -6,6 +6,9 @@
  * the terms of the MIT license                                           *
  *                                                                        */
 
+use Neos\Cache\Frontend\VariableFrontend;
+use Neos\Flow\Log\LoggerInterface;
+use Neos\Flow\Mvc\Routing\UriBuilder;
 use Neos\FluidAdaptor\View\StandaloneView;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Mvc\ActionRequest;
@@ -28,7 +31,7 @@ class Helper
 
     /**
      * @Flow\Inject
-     * @var \Neos\Cache\Frontend\VariableFrontend
+     * @var VariableFrontend
      */
     protected $tokenCache;
 
@@ -40,13 +43,13 @@ class Helper
 
     /**
      * @Flow\Inject
-     * @var \Neos\Flow\Mvc\Routing\UriBuilder
+     * @var UriBuilder
      */
     protected $uriBuilder;
 
     /**
      * @Flow\Inject
-     * @var \Neos\Flow\Log\LoggerInterface
+     * @var LoggerInterface
      */
     protected $logger;
 

diff --git a/Classes/TypeConverter/TokenConverter.php b/Classes/TypeConverter/TokenConverter.php
@@ -8,6 +8,7 @@
 
 use Flownative\DoubleOptIn\Helper;
 use Flownative\DoubleOptIn\Token;
+use Neos\Flow\Property\PropertyMappingConfigurationInterface;
 use Neos\Flow\Property\TypeConverter\AbstractTypeConverter;
 
 /**
@@ -33,13 +34,13 @@ class TokenConverter extends AbstractTypeConverter
      * @param mixed $source
      * @param string $targetType
      * @param array $convertedChildProperties
-     * @param \Neos\Flow\Property\PropertyMappingConfigurationInterface $configuration
+     * @param PropertyMappingConfigurationInterface $configuration
      *
      * @return Token|NULL the target type, or NULL if it was not a valid token
      */
-    public function convertFrom($source, $targetType, array $convertedChildProperties = [], \Neos\Flow\Property\PropertyMappingConfigurationInterface $configuration = NULL)
+    public function convertFrom($source, $targetType, array $convertedChildProperties = [], PropertyMappingConfigurationInterface $configuration = NULL)
     {
-        $doubleOptinHelper = new Helper();
-        return $doubleOptinHelper->validateTokenHash($source);
+        $doubleOptInHelper = new Helper();
+        return $doubleOptInHelper->validateTokenHash($source);
     }
 }
diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
         }
     ],
     "require": {
-        "typo3/flow": "~4.0"
+        "neos/flow": "~4.0"
     },
     "suggest": {
         "neos/swiftmailer": "Used to send activation mails"
@@ -55,4 +55,4 @@
             "Neos.Flow-20170127183102"
         ]
     }
-}
+}