diff --git a/src/Dev/Tasks/FileMigrationHelper.php b/src/Dev/Tasks/FileMigrationHelper.php index 60480d53..b4d9bd1f 100644 --- a/src/Dev/Tasks/FileMigrationHelper.php +++ b/src/Dev/Tasks/FileMigrationHelper.php @@ -227,10 +227,9 @@ private function buildSS3MigrationStrategy(FileResolutionStrategy $initialStrate } // Build the migration strategy - $ss3Strategy = new FileIDHelperResolutionStrategy(); + $ss3Strategy = FileIDHelperResolutionStrategy::create(); $ss3Strategy->setDefaultFileIDHelper($initialStrategy->getDefaultFileIDHelper()); $ss3Strategy->setResolutionFileIDHelpers([new LegacyFileIDHelper(false)]); - $ss3Strategy->setFileHashingService(Injector::inst()->get(FileHashingService::class)); return $ss3Strategy; } diff --git a/src/Dev/Tasks/TagsToShortcodeHelper.php b/src/Dev/Tasks/TagsToShortcodeHelper.php index 63904862..2017294c 100644 --- a/src/Dev/Tasks/TagsToShortcodeHelper.php +++ b/src/Dev/Tasks/TagsToShortcodeHelper.php @@ -242,7 +242,7 @@ private function getTagTuple($tag) */ private function getParsedFileIDFromSrc($src) { - $fileIDHelperResolutionStrategy = new FileIDHelperResolutionStrategy(); + $fileIDHelperResolutionStrategy = FileIDHelperResolutionStrategy::create(); $fileIDHelperResolutionStrategy->setResolutionFileIDHelpers([ $hashFileIdHelper = new HashFileIDHelper(), new LegacyFileIDHelper(), diff --git a/tests/php/Dev/Tasks/FileMigrationHelperTest.php b/tests/php/Dev/Tasks/FileMigrationHelperTest.php index cc8e5c01..544cd76d 100644 --- a/tests/php/Dev/Tasks/FileMigrationHelperTest.php +++ b/tests/php/Dev/Tasks/FileMigrationHelperTest.php @@ -359,7 +359,7 @@ public function testMigrationWithLegacyFilenames() */ public function testInvalidAssetStoreStrategy() { - $strategy = new FileIDHelperResolutionStrategy(); + $strategy = FileIDHelperResolutionStrategy::create(); $strategy->setDefaultFileIDHelper(new HashFileIDHelper()); $strategy->setResolutionFileIDHelpers([new HashFileIDHelper()]); diff --git a/tests/php/Dev/Tasks/SS4CrazyFileMigrationHelperTest.php b/tests/php/Dev/Tasks/SS4CrazyFileMigrationHelperTest.php index 04d34145..a642d5a9 100644 --- a/tests/php/Dev/Tasks/SS4CrazyFileMigrationHelperTest.php +++ b/tests/php/Dev/Tasks/SS4CrazyFileMigrationHelperTest.php @@ -30,19 +30,17 @@ protected function defineOriginStrategy() $hashHelper = new HashFileIDHelper(); $legacyHelper = new LegacyFileIDHelper(); - $protected = new FileIDHelperResolutionStrategy(); + $protected = FileIDHelperResolutionStrategy::create(); $protected->setVersionedStage(Versioned::DRAFT); $protected->setDefaultFileIDHelper($hashHelper); $protected->setResolutionFileIDHelpers([$hashHelper]); - $protected->setFileHashingService(Injector::inst()->get(FileHashingService::class)); $store->setProtectedResolutionStrategy($protected); - $public = new FileIDHelperResolutionStrategy(); + $public = FileIDHelperResolutionStrategy::create(); $public->setVersionedStage(Versioned::LIVE); $public->setDefaultFileIDHelper($legacyHelper); $public->setResolutionFileIDHelpers([$legacyHelper]); - $public->setFileHashingService(Injector::inst()->get(FileHashingService::class)); $store->setPublicResolutionStrategy($public); } @@ -56,20 +54,17 @@ protected function defineDestinationStrategy() $naturalPath = new NaturalFileIDHelper(); $legacyHelper = new LegacyFileIDHelper(); - $protected = new FileIDHelperResolutionStrategy(); + $protected = FileIDHelperResolutionStrategy::create(); $protected->setVersionedStage(Versioned::DRAFT); $protected->setDefaultFileIDHelper($hashHelper); $protected->setResolutionFileIDHelpers([$hashHelper]); - $protected->setFileHashingService(Injector::inst()->get(FileHashingService::class)); - $store->setProtectedResolutionStrategy($protected); - $public = new FileIDHelperResolutionStrategy(); + $public = FileIDHelperResolutionStrategy::create(); $public->setVersionedStage(Versioned::LIVE); $public->setDefaultFileIDHelper($hashHelper); $public->setResolutionFileIDHelpers([$hashHelper, $naturalPath, $legacyHelper]); - $public->setFileHashingService(Injector::inst()->get(FileHashingService::class)); $store->setPublicResolutionStrategy($public); } diff --git a/tests/php/Dev/Tasks/SS4FileMigrationHelperTest.php b/tests/php/Dev/Tasks/SS4FileMigrationHelperTest.php index 3a22804f..ed4170bf 100644 --- a/tests/php/Dev/Tasks/SS4FileMigrationHelperTest.php +++ b/tests/php/Dev/Tasks/SS4FileMigrationHelperTest.php @@ -139,19 +139,17 @@ protected function defineOriginStrategy() $hashHelper = new HashFileIDHelper(); - $protected = new FileIDHelperResolutionStrategy(); + $protected = FileIDHelperResolutionStrategy::create(); $protected->setVersionedStage(Versioned::DRAFT); $protected->setDefaultFileIDHelper($hashHelper); $protected->setResolutionFileIDHelpers([$hashHelper]); - $protected->setFileHashingService(Injector::inst()->get(FileHashingService::class)); $store->setProtectedResolutionStrategy($protected); - $public = new FileIDHelperResolutionStrategy(); + $public = FileIDHelperResolutionStrategy::create(); $public->setVersionedStage(Versioned::LIVE); $public->setDefaultFileIDHelper($hashHelper); $public->setResolutionFileIDHelpers([$hashHelper]); - $public->setFileHashingService(Injector::inst()->get(FileHashingService::class)); $store->setPublicResolutionStrategy($public); } @@ -168,19 +166,17 @@ protected function defineDestinationStrategy() $hashHelper = new HashFileIDHelper(); $naturalHelper = new NaturalFileIDHelper(); - $protected = new FileIDHelperResolutionStrategy(); + $protected = FileIDHelperResolutionStrategy::create(); $protected->setVersionedStage(Versioned::DRAFT); $protected->setDefaultFileIDHelper($hashHelper); $protected->setResolutionFileIDHelpers([$hashHelper, $naturalHelper]); - $protected->setFileHashingService(Injector::inst()->get(FileHashingService::class)); $store->setProtectedResolutionStrategy($protected); - $public = new FileIDHelperResolutionStrategy(); + $public = FileIDHelperResolutionStrategy::create(); $public->setVersionedStage(Versioned::LIVE); $public->setDefaultFileIDHelper($naturalHelper); $public->setResolutionFileIDHelpers([$hashHelper, $naturalHelper]); - $public->setFileHashingService(Injector::inst()->get(FileHashingService::class)); $store->setPublicResolutionStrategy($public); } diff --git a/tests/php/Dev/Tasks/SS4LegacyFileMigrationHelperTest.php b/tests/php/Dev/Tasks/SS4LegacyFileMigrationHelperTest.php index 96c40074..66537c0b 100644 --- a/tests/php/Dev/Tasks/SS4LegacyFileMigrationHelperTest.php +++ b/tests/php/Dev/Tasks/SS4LegacyFileMigrationHelperTest.php @@ -24,20 +24,17 @@ protected function defineOriginStrategy() $naturalHelper = new NaturalFileIDHelper(); - $protected = new FileIDHelperResolutionStrategy(); + $protected = FileIDHelperResolutionStrategy::create(); $protected->setVersionedStage(Versioned::DRAFT); $protected->setDefaultFileIDHelper($naturalHelper); $protected->setResolutionFileIDHelpers([$naturalHelper]); - $protected->setFileHashingService(Injector::inst()->get(FileHashingService::class)); $store->setProtectedResolutionStrategy($protected); - $public = new FileIDHelperResolutionStrategy(); + $public = FileIDHelperResolutionStrategy::create(); $public->setVersionedStage(Versioned::LIVE); $public->setDefaultFileIDHelper($naturalHelper); $public->setResolutionFileIDHelpers([$naturalHelper]); - $public->setFileHashingService(Injector::inst()->get(FileHashingService::class)); - $store->setPublicResolutionStrategy($public); } diff --git a/tests/php/FilenameParsing/FileIDHelperResolutionStrategyTest.php b/tests/php/FilenameParsing/FileIDHelperResolutionStrategyTest.php index 32964642..0a0d9bbc 100644 --- a/tests/php/FilenameParsing/FileIDHelperResolutionStrategyTest.php +++ b/tests/php/FilenameParsing/FileIDHelperResolutionStrategyTest.php @@ -100,7 +100,7 @@ public function testDirectResolveFileID($fixtureID, FileIDHelper $helper) $fileDO->FileHash = sha1('version 1'); $fileDO->write(); - $strategy = new FileIDHelperResolutionStrategy(); + $strategy = FileIDHelperResolutionStrategy::create(); $strategy->setDefaultFileIDHelper($helper); $strategy->setResolutionFileIDHelpers([$helper]); $strategy->setVersionedStage(Versioned::DRAFT); @@ -127,7 +127,7 @@ public function testSecondaryResolveFileID($fixtureID, FileIDHelper $helper) $fileDO->FileHash = sha1('version 1'); $fileDO->write(); - $strategy = new FileIDHelperResolutionStrategy(); + $strategy = FileIDHelperResolutionStrategy::create(); $strategy->setDefaultFileIDHelper($mockHelper); $strategy->setResolutionFileIDHelpers([$mockHelper, $helper]); $strategy->setVersionedStage(Versioned::DRAFT); @@ -152,7 +152,7 @@ public function testBadHashResolveFileID($fixtureID, FileIDHelper $helper) $fileDO->FileHash = sha1('broken content that does not mtach the expected content'); $fileDO->write(); - $strategy = new FileIDHelperResolutionStrategy(); + $strategy = FileIDHelperResolutionStrategy::create(); $strategy->setDefaultFileIDHelper($mockHelper); $strategy->setResolutionFileIDHelpers([$mockHelper, $helper]); $strategy->setVersionedStage(Versioned::DRAFT); @@ -177,7 +177,7 @@ public function testDirectSoftResolveFileID($fixtureID, FileIDHelper $helper) $fileDO->FileHash = sha1('version 1'); $fileDO->write(); - $strategy = new FileIDHelperResolutionStrategy(); + $strategy = FileIDHelperResolutionStrategy::create(); $strategy->setDefaultFileIDHelper($helper); $strategy->setResolutionFileIDHelpers([$helper]); $strategy->setVersionedStage(Versioned::DRAFT); @@ -219,7 +219,7 @@ public function testSoftResolveOlderFileID($fixtureID) $fileDO->FileHash = $newerHash; $fileDO->write(); - $strategy = new FileIDHelperResolutionStrategy(); + $strategy = FileIDHelperResolutionStrategy::create(); $strategy->setDefaultFileIDHelper($helper); $strategy->setResolutionFileIDHelpers([$helper]); $strategy->setVersionedStage(Versioned::DRAFT); @@ -253,7 +253,7 @@ public function testSecondarySoftResolveFileID($fixtureID, FileIDHelper $helper) $fileDO->FileHash = sha1('version 1'); $fileDO->write(); - $strategy = new FileIDHelperResolutionStrategy(); + $strategy = FileIDHelperResolutionStrategy::create(); $strategy->setDefaultFileIDHelper($mockHelper); $strategy->setResolutionFileIDHelpers([$mockHelper, $helper]); $strategy->setVersionedStage(Versioned::DRAFT); @@ -286,7 +286,7 @@ public function testResolveMissingFileID($fixtureID) $fileDO->publishSingle(); - $strategy = new FileIDHelperResolutionStrategy(); + $strategy = FileIDHelperResolutionStrategy::create(); $strategy->setDefaultFileIDHelper($brokenHelper); $strategy->setResolutionFileIDHelpers([$brokenHelper, $mockHelper]); $strategy->setVersionedStage(Versioned::DRAFT); @@ -315,25 +315,21 @@ public function searchTupleStrategyVariation() ); $parsedFileID = $mockHelper->parseFileID($expected); - $hashingService = new Sha1FileHashingService(); - $defaultResolves = new FileIDHelperResolutionStrategy(); + $defaultResolves = FileIDHelperResolutionStrategy::create(); $defaultResolves->setDefaultFileIDHelper($mockHelper); $defaultResolves->setResolutionFileIDHelpers([$brokenHelper]); $defaultResolves->setVersionedStage(Versioned::DRAFT); - $defaultResolves->setFileHashingService($hashingService); - $secondaryResolves = new FileIDHelperResolutionStrategy(); + $secondaryResolves = FileIDHelperResolutionStrategy::create(); $secondaryResolves->setDefaultFileIDHelper($brokenHelper); $secondaryResolves->setResolutionFileIDHelpers([$brokenHelper, $mockHelper]); $secondaryResolves->setVersionedStage(Versioned::DRAFT); - $secondaryResolves->setFileHashingService($hashingService); - $secondaryResolvesLive = new FileIDHelperResolutionStrategy(); + $secondaryResolvesLive = FileIDHelperResolutionStrategy::create(); $secondaryResolvesLive->setDefaultFileIDHelper($brokenHelper); $secondaryResolvesLive->setResolutionFileIDHelpers([$brokenHelper, $mockHelper]); $secondaryResolvesLive->setVersionedStage(Versioned::LIVE); - $secondaryResolvesLive->setFileHashingService($hashingService); return [ [$defaultResolves, $parsedFileID, $expected], @@ -383,13 +379,12 @@ public function testSearchForTuple($strategy, $tuple, $expected) public function testHashlessSearchForTuple() { // Set up strategy - $strategy = new FileIDHelperResolutionStrategy(); + $strategy = FileIDHelperResolutionStrategy::create(); $hashHelper = new HashFileIDHelper(); $naturalHelper = new NaturalFileIDHelper(); $strategy->setDefaultFileIDHelper($hashHelper); $strategy->setResolutionFileIDHelpers([$hashHelper, $naturalHelper]); $strategy->setVersionedStage(Versioned::DRAFT); - $strategy->setFileHashingService(new Sha1FileHashingService()); // Set up some dummy file $content = "The quick brown fox jumps over the lazy dog."; @@ -473,25 +468,21 @@ public function findVariantsStrategyVariation() ); $parsedFileID = $mockHelper->parseFileID('Folder/FolderFile.pdf'); - $hashingService = new Sha1FileHashingService(); - $defaultResolves = new FileIDHelperResolutionStrategy(); + $defaultResolves = FileIDHelperResolutionStrategy::create(); $defaultResolves->setDefaultFileIDHelper($mockHelper); $defaultResolves->setResolutionFileIDHelpers([$brokenHelper]); $defaultResolves->setVersionedStage(Versioned::DRAFT); - $defaultResolves->setFileHashingService($hashingService); - $secondaryResolves = new FileIDHelperResolutionStrategy(); + $secondaryResolves = FileIDHelperResolutionStrategy::create(); $secondaryResolves->setDefaultFileIDHelper($brokenHelper); $secondaryResolves->setResolutionFileIDHelpers([$brokenHelper, $mockHelper]); $secondaryResolves->setVersionedStage(Versioned::DRAFT); - $secondaryResolves->setFileHashingService($hashingService); - $secondaryResolvesLive = new FileIDHelperResolutionStrategy(); + $secondaryResolvesLive = FileIDHelperResolutionStrategy::create(); $secondaryResolvesLive->setDefaultFileIDHelper($brokenHelper); $secondaryResolvesLive->setResolutionFileIDHelpers([$brokenHelper, $mockHelper]); $secondaryResolvesLive->setVersionedStage(Versioned::LIVE); - $secondaryResolvesLive->setFileHashingService($hashingService); return [ [$defaultResolves, $parsedFileID], @@ -535,10 +526,9 @@ public function testFindVariant($strategy, $tuple) public function testFindHashlessVariant() { - $strategy = new FileIDHelperResolutionStrategy(); + $strategy = FileIDHelperResolutionStrategy::create(); $strategy->setDefaultFileIDHelper($naturalHelper = new NaturalFileIDHelper()); $strategy->setResolutionFileIDHelpers([new HashFileIDHelper()]); - $strategy->setFileHashingService(new Sha1FileHashingService()); $expectedHash = sha1('version 1'); @@ -581,7 +571,7 @@ public function testParseFileID() 'Folder' ); - $strategy = new FileIDHelperResolutionStrategy(); + $strategy = FileIDHelperResolutionStrategy::create(); // Test that file ID gets resolved properly if a functional helper is provided $strategy->setResolutionFileIDHelpers([$brokenHelper, $mockHelper]); diff --git a/tests/php/Flysystem/FlysystemAssetStoreTest.php b/tests/php/Flysystem/FlysystemAssetStoreTest.php index 070d9ac1..9924aa57 100644 --- a/tests/php/Flysystem/FlysystemAssetStoreTest.php +++ b/tests/php/Flysystem/FlysystemAssetStoreTest.php @@ -168,7 +168,7 @@ public function testPublicResolutionStrategy() $expected = Injector::inst()->get(FileResolutionStrategy::class . '.public'); $this->assertEquals($expected, $strategy); - $expected = new FileIDHelperResolutionStrategy(); + $expected = FileIDHelperResolutionStrategy::create(); $assetStore->setPublicResolutionStrategy($expected); $strategy = $assetStore->getPublicResolutionStrategy(); $this->assertEquals($expected, $strategy); @@ -181,7 +181,7 @@ public function testProtectedResolutionStrategy() $expected = Injector::inst()->get(FileResolutionStrategy::class . '.protected'); $this->assertEquals($expected, $strategy); - $expected = new FileIDHelperResolutionStrategy(); + $expected = FileIDHelperResolutionStrategy::create(); $assetStore->setProtectedResolutionStrategy($expected); $strategy = $assetStore->getProtectedResolutionStrategy(); $this->assertEquals($expected, $strategy);