refactor based on @stof feedback

Author: PhilETaylor

src/Asset/TagRenderer.php

@@ -50,18 +50,14 @@ public function renderWebpackScriptTags(string $entryName, string $packageName =
         $integrityHashes = ($entryPointLookup instanceof IntegrityDataProviderInterface) ? $entryPointLookup->getIntegrityData() : [];
 
         foreach ($entryPointLookup->getJavaScriptFiles($entryName) as $filename) {
-            $attributes = [
-                'src' => $this->getAssetPath($filename, $packageName),
-            ];
+
+            $attributes = $this->defaultAttributes;
+            $attributes['src'] = $this->getAssetPath($filename, $packageName);
 
             if (isset($integrityHashes[$filename])) {
                 $attributes['integrity'] = $integrityHashes[$filename];
             }
 
-            if (isset($this->defaultAttributes['crossorigin']) && false !== $this->defaultAttributes['crossorigin']) {
-                $attributes['crossorigin'] =  $this->defaultAttributes['crossorigin'];
-            }
-
             $scriptTags[] = sprintf(
                 '<script %s></script>',
                 $this->convertArrayToAttributes($attributes)
@@ -78,19 +74,15 @@ public function renderWebpackLinkTags(string $entryName, string $packageName = n
         $integrityHashes = ($entryPointLookup instanceof IntegrityDataProviderInterface) ? $entryPointLookup->getIntegrityData() : [];
 
         foreach ($entryPointLookup->getCssFiles($entryName) as $filename) {
-            $attributes = [
-                'rel' => 'stylesheet',
-                'href' => $this->getAssetPath($filename, $packageName),
-            ];
+
+            $attributes = $this->defaultAttributes;
+            $attributes['rel'] = 'stylesheet';
+            $attributes['href'] = $this->getAssetPath($filename, $packageName);
 
             if (isset($integrityHashes[$filename])) {
                 $attributes['integrity'] = $integrityHashes[$filename];
             }
 
-            if (isset($this->defaultAttributes['crossorigin']) && false !== $this->defaultAttributes['crossorigin']) {
-                $attributes['crossorigin'] =  $this->defaultAttributes['crossorigin'];
-            }
-
             $scriptTags[] = sprintf(
                 '<link %s>',
                 $this->convertArrayToAttributes($attributes)

src/DependencyInjection/WebpackEncoreExtension.php

@@ -52,10 +52,14 @@ public function load(array $configs, ContainerBuilder $container)
             ->replaceArgument(0, ServiceLocatorTagPass::register($container, $factories));
         $container->setAlias(EntrypointLookupInterface::class, new Alias($this->getEntrypointServiceId('_default')));
 
+        $defaultAttributes = [];
+
+        if (false !== $config['crossorigin']){
+            $defaultAttributes['crossorigin'] = $config['crossorigin'];
+        }
+
         $container->getDefinition('webpack_encore.tag_renderer')
-            ->replaceArgument(2, [
-                'crossorigin' => $config['crossorigin'],
-            ]);
+            ->replaceArgument(2, $defaultAttributes);
     }
 
     private function entrypointFactory(ContainerBuilder $container, string $name, string $path, bool $cacheEnabled): Reference

tests/Asset/TagRendererTest.php

@@ -37,11 +37,11 @@ public function testRenderScriptTags()
 
         $output = $renderer->renderWebpackScriptTags('my_entry', 'custom_package');
         $this->assertContains(
-            '<script src="http://localhost:8080/build/file1.js" crossorigin="anonymous"></script>',
+            '<script crossorigin="anonymous" src="http://localhost:8080/build/file1.js"></script>',
             $output
         );
         $this->assertContains(
-            '<script src="http://localhost:8080/build/file2.js" crossorigin="anonymous"></script>',
+            '<script crossorigin="anonymous" src="http://localhost:8080/build/file2.js"></script>',
             $output
         );
     }
@@ -68,7 +68,7 @@ public function testRenderScriptTagsWithBadFilename()
 
         $output = $renderer->renderWebpackScriptTags('my_entry', 'custom_package');
         $this->assertContains(
-            '<script src="http://localhost:8080/build/file&lt;&quot;bad_chars.js" crossorigin="anonymous"></script>',
+            '<script crossorigin="anonymous" src="http://localhost:8080/build/file&lt;&quot;bad_chars.js"></script>',
             $output
         );
     }
@@ -114,17 +114,17 @@ public function testRenderScriptTagsWithinAnEntryPointCollection()
 
         $output = $renderer->renderWebpackScriptTags('my_entry', 'custom_package');
         $this->assertContains(
-            '<script src="http://localhost:8080/build/file1.js" crossorigin="anonymous"></script>',
+            '<script crossorigin="anonymous" src="http://localhost:8080/build/file1.js"></script>',
             $output
         );
         $output = $renderer->renderWebpackScriptTags('my_entry', null, 'second');
         $this->assertContains(
-            '<script src="http://localhost:8080/build/file2.js" crossorigin="anonymous"></script>',
+            '<script crossorigin="anonymous" src="http://localhost:8080/build/file2.js"></script>',
             $output
         );
         $output = $renderer->renderWebpackScriptTags('my_entry', 'specific_package', 'third');
         $this->assertContains(
-            '<script src="http://localhost:8080/build/file3.js" crossorigin="anonymous"></script>',
+            '<script crossorigin="anonymous" src="http://localhost:8080/build/file3.js"></script>',
             $output
         );
     }
@@ -164,11 +164,11 @@ public function testRenderScriptTagsWithHashes()
 
         $output = $renderer->renderWebpackScriptTags('my_entry', 'custom_package');
         $this->assertContains(
-            '<script src="http://localhost:8080/build/file1.js" integrity="sha384-Q86c+opr0lBUPWN28BLJFqmLhho+9ZcJpXHorQvX6mYDWJ24RQcdDarXFQYN8HLc" crossorigin="anonymous"></script>',
+            '<script crossorigin="anonymous" src="http://localhost:8080/build/file1.js" integrity="sha384-Q86c+opr0lBUPWN28BLJFqmLhho+9ZcJpXHorQvX6mYDWJ24RQcdDarXFQYN8HLc"></script>',
             $output
         );
         $this->assertContains(
-            '<script src="http://localhost:8080/build/file2.js" integrity="sha384-ymG7OyjISWrOpH9jsGvajKMDEOP/mKJq8bHC0XdjQA6P8sg2nu+2RLQxcNNwE/3J" crossorigin="anonymous"></script>',
+            '<script crossorigin="anonymous" src="http://localhost:8080/build/file2.js" integrity="sha384-ymG7OyjISWrOpH9jsGvajKMDEOP/mKJq8bHC0XdjQA6P8sg2nu+2RLQxcNNwE/3J"></script>',
             $output
         );
     }