Fix namespace

silverstripe · Apr 30, 2019 · c457db9 · c457db9
1 parent d8d9bb5
commit c457db9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/src/LegacyThumbnailMigrationHelper.php → .../Tasks/LegacyThumbnailMigrationHelper.php b/src/LegacyThumbnailMigrationHelper.php → .../Tasks/LegacyThumbnailMigrationHelper.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace SilverStripe\Assets;
+namespace SilverStripe\Assets\Dev\Tasks;
 
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
-use SilverStripe\Assets\FilenameParsing\LegacyFileIDHelper;
+use SilverStripe\Assets\File;
 use SilverStripe\Assets\Flysystem\FlysystemAssetStore;
+use SilverStripe\Assets\Folder;
 use SilverStripe\Core\Config\Configurable;
 use SilverStripe\Core\Environment;
 use SilverStripe\Core\Injector\Injectable;

diff --git a/...hp/LegacyThumbnailMigrationHelperTest.php → ...ks/LegacyThumbnailMigrationHelperTest.php b/...hp/LegacyThumbnailMigrationHelperTest.php → ...ks/LegacyThumbnailMigrationHelperTest.php
@@ -1,19 +1,17 @@
 <?php
 
-namespace SilverStripe\Assets\Tests;
+namespace SilverStripe\Assets\Tests\Dev\Tasks;
 
 use Silverstripe\Assets\Dev\TestAssetStore;
 use SilverStripe\Assets\File;
-use SilverStripe\Assets\FileMigrationHelper;
+use SilverStripe\Assets\FilenameParsing\FileIDHelperResolutionStrategy;
 use SilverStripe\Assets\FilenameParsing\ParsedFileID;
 use SilverStripe\Assets\Filesystem;
-use SilverStripe\Assets\Flysystem\FlysystemAssetStore;
 use SilverStripe\Assets\Folder;
 use SilverStripe\Assets\Image;
-use SilverStripe\Assets\LegacyThumbnailMigrationHelper;
+use SilverStripe\Assets\Dev\Tasks\LegacyThumbnailMigrationHelper;
 use SilverStripe\Assets\Storage\AssetStore;
-use SilverStripe\Assets\Tests\FileMigrationHelperTest\Extension;
-use SilverStripe\Core\Config\Config;
+use SilverStripe\Assets\Tests\Dev\Tasks\FileMigrationHelperTest\Extension;
 use SilverStripe\Core\Convert;
 use SilverStripe\Dev\SapphireTest;
 
@@ -49,7 +47,7 @@ public function setUp()
         TestAssetStore::activate('LegacyThumbnailMigrationHelperTest/assets');
 
         // Ensure that each file has a local record file in this new assets base
-        $from = $this->joinPaths(__DIR__, 'ImageTest/test-image-low-quality.jpg');
+        $from = $this->joinPaths(__DIR__, '../../ImageTest/test-image-low-quality.jpg');
         foreach (File::get()->exclude('ClassName', Folder::class) as $file) {
             /** @var $file File */
             $file->setFromLocalFile($from, $file->generateFilename());

diff --git a/...hp/LegacyThumbnailMigrationHelperTest.yml → ...ks/LegacyThumbnailMigrationHelperTest.yml b/...hp/LegacyThumbnailMigrationHelperTest.yml → ...ks/LegacyThumbnailMigrationHelperTest.yml