[2.1] Autowiring fixes

Wolnosciowiec-Archive · Feb 13, 2018 · 6c0fee8 · 6c0fee8
1 parent 620870e
commit 6c0fee8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/Resources/config/services.yml b/Resources/config/services.yml
@@ -9,25 +9,25 @@ services:
         class: Wolnosciowiec\FileRepositoryBundle\Service\Http\Client
         public: true
 
-    wolnosciowiec.file_repository.registry:
+    Wolnosciowiec\FileRepositoryBundle\Service\FileRegistry:
         class: Wolnosciowiec\FileRepositoryBundle\Service\FileRegistry
         public: true
         arguments:
             $client: '@Wolnosciowiec\FileRepositoryBundle\Service\Http\Client'
 
-    wolnosciowiec.file_repository.uploader:
+    Wolnosciowiec\FileRepositoryBundle\Service\FileUploader:
         class: Wolnosciowiec\FileRepositoryBundle\Service\FileUploader
         public: true
         arguments:
             $client: '@Wolnosciowiec\FileRepositoryBundle\Service\Http\Client'
 
-    wolnosciowiec.file_repository.token_manager:
+    Wolnosciowiec\FileRepositoryBundle\Service\TokenManager:
         class: Wolnosciowiec\FileRepositoryBundle\Service\TokenManager
         public: true
         arguments:
             $client: '@Wolnosciowiec\FileRepositoryBundle\Service\Http\Client'
 
-    wolnosciowiec.file_repository.user_upload_manager:
+    Wolnosciowiec\FileRepositoryBundle\Service\UserUploadManager:
         class: Wolnosciowiec\FileRepositoryBundle\Service\UserUploadManager
         public: true
         arguments:

diff --git a/Tests/Functional/UploadTest.php b/Tests/Functional/UploadTest.php
@@ -2,6 +2,8 @@
 
 namespace Wolnosciowiec\FileRepositoryBundle\Tests\Functional;
 
+use Wolnosciowiec\FileRepositoryBundle\Service\FileRegistry;
+use Wolnosciowiec\FileRepositoryBundle\Service\FileUploader;
 use Wolnosciowiec\FileRepositoryBundle\Tests\ContainerAwareTestCase;
 
 class UploadTest extends ContainerAwareTestCase
@@ -17,17 +19,17 @@ public function testUploadByUrl()
         $imageUrl = 'https://avatars0.githubusercontent.com/u/22785395';
 
         // add a file
-        $this->assertNotEmpty($this->container->get('wolnosciowiec.file_repository.uploader')
+        $this->assertNotEmpty($this->container->get(FileUploader::class)
             ->uploadFromUrl($imageUrl));
 
-        $this->assertTrue($this->container->get('wolnosciowiec.file_repository.registry')
+        $this->assertTrue($this->container->get(FileRegistry::class)
             ->fileExists($imageUrl));
 
         // delete a file
-        $this->container->get('wolnosciowiec.file_repository.registry')
+        $this->container->get(FileRegistry::class)
             ->deleteFile($imageUrl);
 
-        $this->assertFalse($this->container->get('wolnosciowiec.file_repository.registry')
+        $this->assertFalse($this->container->get(FileRegistry::class)
             ->fileExists($imageUrl));
     }
 }
diff --git a/Tests/Service/TokenManagerTest.php b/Tests/Service/TokenManagerTest.php
@@ -3,6 +3,7 @@
 namespace Tests\Service;
 
 use Wolnosciowiec\FileRepositoryBundle\Exception\FileRepositoryRequestFailureException;
+use Wolnosciowiec\FileRepositoryBundle\Service\TokenManager;
 use Wolnosciowiec\FileRepositoryBundle\Tests\ContainerAwareTestCase;
 
 /**
@@ -15,7 +16,7 @@ class TokenManagerTest extends ContainerAwareTestCase
      */
     public function testRequestTemporaryToken()
     {
-        $token = $this->container->get('wolnosciowiec.file_repository.token_manager')->requestTemporaryToken(
+        $token = $this->container->get(TokenManager::class)->requestTemporaryToken(
             ['test_role1'],
             ['uploads']
         );