Merge pull request #17 from Machy8/attributes-fix

Remove type attribute from script and style elements
Machy8 · Dec 26, 2021 · 162c3f5 · 162c3f5
2 parents 51f24d6 + 0683eb0
commit 162c3f5
Show file tree

Hide file tree

Showing 15 changed files with 50 additions and 50 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -0,0 +1,29 @@
+name: Tests
+
+on: [push, pull_request]
+
+jobs:
+  tests:
+    name: Tests
+    runs-on: ubuntu-latest
+
+    steps:
+        - uses: actions/checkout@v2
+
+        - name: Install packages
+          run: composer install --no-interaction
+
+        - name: CS Check
+          run: composer cs:check
+
+        - name: PHPstan check
+          run: composer phpstan:check
+
+        - name: Unit Tests
+          run: composer tester:check
+
+        # - name: Coveralls
+        #  uses: coverallsapp/[email protected]
+        #  with:
+        #    github-token: ${{ secrets.COVERALLS_TOKEN }}
+        #    path-to-lcov: 'lcov.info'
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,4 @@ vendor/
 /tests/nette-tester/output/
 composer.lock
 docker-compose.yml
-coverage.xml
+lcov.info
diff --git a/.travis.yml b/.travis.yml
diff --git a/composer.json b/composer.json
@@ -12,9 +12,9 @@
 		"nette/tester": "^2.4",
 		"tubalmartin/cssmin": "^4.1",
 		"machy8/google-closure-compiler": "^1.0",
-		"phpstan/phpstan": "^0.12",
-		"symplify/easy-coding-standard": "^9.2",
-		"symplify/config-transformer": "^9.2",
+		"phpstan/phpstan": "^1.2",
+		"symplify/easy-coding-standard": "^10.0",
+		"symplify/config-transformer": "^10.0",
 		"nette/di": "^3.0"
 	},
 	"suggest": {
@@ -34,7 +34,7 @@
 		"cs:check": "vendor/bin/ecs check src -c tests/coding-standard/ecs.php",
 		"cs:fix": "vendor/bin/ecs check src -c tests/coding-standard/ecs.php",
 		"phpstan:check": "phpstan analyse -c tests/phpstan/phpstan.neon -l 5 src tests/nette-tester",
-		"tester:check": "tester -p phpdbg tests/nette-tester -s --coverage ./coverage.xml --coverage-src ./src"
+		"tester:check": "tester -p phpdbg tests/nette-tester -s --coverage ./lcov.info --coverage-src ./src"
 	},
 	"minimum-stability": "dev",
 	"prefer-stable" : true

diff --git a/src/WebLoader/FilesCollectionRender.php b/src/WebLoader/FilesCollectionRender.php
@@ -24,9 +24,6 @@ class FilesCollectionRender
     private const LINK_PRELOAD_AS_CSS = 'style';
     private const LINK_PRELOAD_AS_JS = 'script';
 
-    private const SCRIPT_TYPE_ATTRIBUTE = 'text/javascript';
-    private const STYLE_TYPE_ATTRIBUTE = 'text/css';
-
     private const VERSION_MARK = '?v=';
 
     /**
@@ -63,7 +60,6 @@ public function css(?string $collectionName = null, array $attributes = [], bool
         $collectionName = $collection->getName();
         $this->compiler->compileFilesCollectionByType(Engine::CSS, $collectionName);
         $attributes = array_merge($attributes, $collection->getOutputElementAttributes());
-        $attributes['type'] = self::STYLE_TYPE_ATTRIBUTE;
         $element = self::STYLE_ELEMENT;
         $basePath = $this->getCollectionBasePath($collectionName, Engine::CSS);
         $filePathParameter = null;
@@ -118,7 +114,6 @@ public function js(?string $collectionName = null, array $attributes = [], bool
         $collectionName = $collection->getName();
         $this->compiler->compileFilesCollectionByType(Engine::JS, $collectionName);
         $attributes = array_merge($attributes, $collection->getOutputElementAttributes());
-        $attributes['type'] = self::SCRIPT_TYPE_ATTRIBUTE;
         $basePath = $this->getCollectionBasePath($collectionName, Engine::JS);
         $filePathParameter = null;
 

diff --git a/tests/nette-tester/CompilerTestsCase.phpt b/tests/nette-tester/CompilerTestsCase.phpt
@@ -37,7 +37,7 @@ final class CompilerTestsCase extends AbstractTestCase
 		});
 
 		Assert::equal(
-			'<link type="text/css" rel="stylesheet" href="/' . self::BASE_PATH . '/' . $collectionName . '.css?v=' . $this->getFilesVersion() . '">',
+			'<link rel="stylesheet" href="/' . self::BASE_PATH . '/' . $collectionName . '.css?v=' . $this->getFilesVersion() . '">',
 			$webLoader->getFilesCollectionRender()->css($collectionName)
 		);
 
@@ -66,7 +66,7 @@ final class CompilerTestsCase extends AbstractTestCase
 		$webLoader = $this->getWebLoader();
 
 		Assert::equal(
-			'<script async type="text/javascript" src="/' . self::BASE_PATH . '/' . $collectionName . '.js?v=' . $this->getFilesVersion() . '"></script>',
+			'<script async src="/' . self::BASE_PATH . '/' . $collectionName . '.js?v=' . $this->getFilesVersion() . '"></script>',
 			$webLoader->getFilesCollectionRender()->js($collectionName, ['async' => TRUE])
 		);
 
@@ -110,12 +110,12 @@ final class CompilerTestsCase extends AbstractTestCase
 		$render = $webLoader->getFilesCollectionRender();
 
 		Assert::equal(
-			'<link type="text/css" rel="stylesheet" href="/' . self::BASE_PATH . '/' . $collectionNameA . '.css?v=' . $this->getFilesVersion() . '">',
+			'<link rel="stylesheet" href="/' . self::BASE_PATH . '/' . $collectionNameA . '.css?v=' . $this->getFilesVersion() . '">',
 			$render->css($collectionNameA)
 		);
 
 		Assert::equal(
-			'<script defer async type="text/javascript" src="/' . self::BASE_PATH . '/' . $collectionNameB . '.js?v=' . $this->getFilesVersion() . '"></script>',
+			'<script defer async src="/' . self::BASE_PATH . '/' . $collectionNameB . '.js?v=' . $this->getFilesVersion() . '"></script>',
 			$render->js($collectionNameB, ['defer' => TRUE])
 		);
 
@@ -163,8 +163,8 @@ final class CompilerTestsCase extends AbstractTestCase
 
 		$render = $webLoader->getFilesCollectionsContainerRender()->selectContainer('testContainer');
 
-		$collectionALink = '<link type="text/css" rel="stylesheet" href="/' . self::BASE_PATH . '/' . $collectionNameA . '.css?v=' . $this->getFilesVersion() . '">';
-		$collectionBLink = '<link type="text/css" rel="stylesheet" href="/' . self::BASE_PATH . '/' . $collectionNameB . '.css?v=' . $this->getFilesVersion() . '">';
+		$collectionALink = '<link rel="stylesheet" href="/' . self::BASE_PATH . '/' . $collectionNameA . '.css?v=' . $this->getFilesVersion() . '">';
+		$collectionBLink = '<link rel="stylesheet" href="/' . self::BASE_PATH . '/' . $collectionNameB . '.css?v=' . $this->getFilesVersion() . '">';
 		Assert::equal($collectionALink . $collectionBLink, $render->css());
 
 		$collectionALink = '<link rel="prefetch" href="/' . self::BASE_PATH . '/' . $collectionNameA . '.css?v=' . $this->getFilesVersion() . '">';
@@ -175,8 +175,8 @@ final class CompilerTestsCase extends AbstractTestCase
 		$collectionBLink = '<link rel="preload" as="style" href="/' . self::BASE_PATH . '/' . $collectionNameB . '.css?v=' . $this->getFilesVersion() . '">';
 		Assert::equal($collectionALink . $collectionBLink, $render->cssPreload());
 
-		$collectionALink = '<script async defer type="text/javascript" src="/' . self::BASE_PATH . '/' . $collectionNameA . '.js?v=' . $this->getFilesVersion() . '"></script>';
-		$collectionBLink = '<script async defer type="text/javascript" src="/' . self::BASE_PATH . '/' . $collectionNameB . '.js?v=' . $this->getFilesVersion() . '"></script>';
+		$collectionALink = '<script async defer src="/' . self::BASE_PATH . '/' . $collectionNameA . '.js?v=' . $this->getFilesVersion() . '"></script>';
+		$collectionBLink = '<script async defer src="/' . self::BASE_PATH . '/' . $collectionNameB . '.js?v=' . $this->getFilesVersion() . '"></script>';
 		Assert::equal($collectionALink . $collectionBLink, $render->js(NULL, ['async' => TRUE, 'defer' => TRUE]));
 
 		$collectionALink = '<link rel="prefetch" href="/' . self::BASE_PATH . '/' . $collectionNameA . '.js?v=' . $this->getFilesVersion() . '">';

diff --git a/tests/nette-tester/webtemp/actual/test-css-files-collection-style-element.html b/tests/nette-tester/webtemp/actual/test-css-files-collection-style-element.html
@@ -1,4 +1,4 @@
-<style amp-custom type="text/css">
+<style amp-custom>
 a {
     color: steelblue;
     font-weight: bold;

diff --git a/tests/nette-tester/webtemp/actual/test-files-collections-from-config-a.html b/tests/nette-tester/webtemp/actual/test-files-collections-from-config-a.html
@@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script>
 ;(function ($) {
 	var codeFragment = 'jQuery! muhehe';
 

diff --git a/tests/nette-tester/webtemp/actual/test-files-collections-from-config-b.html b/tests/nette-tester/webtemp/actual/test-files-collections-from-config-b.html
@@ -1,4 +1,4 @@
-<style amp-custom type="text/css">
+<style amp-custom>
 div {
     display: inline-block;
     width: 50px;

diff --git a/tests/nette-tester/webtemp/actual/test-js-files-collection-script-element-with-content.html b/tests/nette-tester/webtemp/actual/test-js-files-collection-script-element-with-content.html
@@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script>
 ;(function ($) {
 	var codeFragment = 'jQuery! muhehe';
 

diff --git a/tests/nette-tester/webtemp/expected/test-css-files-collection-style-element.html b/tests/nette-tester/webtemp/expected/test-css-files-collection-style-element.html
@@ -1,4 +1,4 @@
-<style amp-custom type="text/css">
+<style amp-custom>
 a {
     color: steelblue;
     font-weight: bold;

diff --git a/tests/nette-tester/webtemp/expected/test-files-collections-from-config-a.html b/tests/nette-tester/webtemp/expected/test-files-collections-from-config-a.html
@@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script>
 ;(function ($) {
 	var codeFragment = 'jQuery! muhehe';
 

diff --git a/tests/nette-tester/webtemp/expected/test-files-collections-from-config-b.html b/tests/nette-tester/webtemp/expected/test-files-collections-from-config-b.html
@@ -1,4 +1,4 @@
-<style amp-custom type="text/css">
+<style amp-custom>
 div {
     display: inline-block;
     width: 50px;

diff --git a/...s/nette-tester/webtemp/expected/test-js-files-collection-script-element-with-content.html b/...s/nette-tester/webtemp/expected/test-js-files-collection-script-element-with-content.html
@@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script>
 ;(function ($) {
 	var codeFragment = 'jQuery! muhehe';
 

diff --git a/tests/phpstan/phpstan.neon b/tests/phpstan/phpstan.neon
@@ -1,5 +1,3 @@
 parameters:
-	autoload_files:
-		- ../nette-tester/AbstractTestCase.php
 	ignoreErrors:
 		- '#Property [a-zA-Z0-9\\_]+::\$[a-zA-Z0-9_]+ \([\S]+\) does not accept [\S\|]+\.#'