Merge branch 'master' into l10n_master

brotkrueml · Dec 27, 2020 · 20a6629 · 20a6629
2 parents 2201dd1 + d871651
commit 20a6629
Show file tree

Hide file tree

Showing 89 changed files with 1,466 additions and 1,297 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -21,27 +21,24 @@ indent_size = 2
 indent_style = tab
 
 # ReST-Files
-[{*.rst,*.rst.txt}]
+[*.rst]
 indent_size = 3
-max_line_length = 80
 
 # YAML-Files
 [*.{yaml,yml}]
 indent_size = 2
 
 # package.json
-# .travis.yml
-[{package.json,.travis.yml}]
+[package.json]
 indent_size = 2
-indent_style = space
 
 # TypoScript
 [*.{typoscript,tsconfig}]
 indent_size = 2
 
 # XLF-Files
 [*.xlf]
-indent_size = 2
+indent_style = tab
 
 # SQL-Files
 [*.sql]
@@ -51,7 +48,3 @@ indent_size = 2
 # .htaccess
 [{_.htaccess,.htaccess}]
 indent_style = tab
-
-# composer.json
-[composer.json]
-indent_style = space
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,8 +17,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.2', '7.3', '7.4']
-        typo3-versions: ['^9', '^10']
+        php-versions: ['7.4']
+        typo3-versions: ['^9', '^10', '^11']
+        include:
+          - php-versions: 7.2
+            typo3-versions: ^9
+          - php-versions: 7.2
+            typo3-versions: ^10
     steps:
       - name: Check out repository
         uses: actions/checkout@v2
@@ -51,7 +56,7 @@ jobs:
       - name: Setup PHP version
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.2
+          php-version: 7.4
       - name: Install composer dependencies
         run: |
           composer --version

diff --git a/.php_cs b/.php_cs
@@ -1,6 +1,7 @@
 <?php
 
-$finder = PhpCsFixer\Finder::create()
+$config = \TYPO3\CodingStandards\CsFixerConfig::create();
+$config->getFinder()
     ->in(__DIR__ . '/Classes')
     ->in(__DIR__ . '/Configuration')
     ->in(__DIR__ . '/Tests')
@@ -13,53 +14,8 @@ For the full copyright and license information, please read the
 LICENSE.txt file that was distributed with this source code.
 EOF;
 
-return PhpCsFixer\Config::create()
-    ->setRiskyAllowed(true)
-    ->setRules([
-        '@DoctrineAnnotation' => true,
-        '@PSR2' => true,
-        'array_indentation' => true,
-        'array_syntax' => ['syntax' => 'short'],
-        'cast_spaces' => ['space' => 'none'],
-        'concat_space' => ['spacing' => 'one'],
-        'declare_equal_normalize' => ['space' => 'none'],
-        'dir_constant' => true,
-        'function_typehint_space' => true,
-        'hash_to_slash_comment' => true,
-        'header_comment' => ['header' => $header, 'separate' => 'both'],
-        'lowercase_cast' => true,
-        'modernize_types_casting' => true,
-        'native_function_casing' => true,
-        'no_alias_functions' => true,
-        'no_blank_lines_after_phpdoc' => true,
-        'no_empty_phpdoc' => true,
-        'no_empty_statement' => true,
-        'no_extra_consecutive_blank_lines' => true,
-        'no_leading_import_slash' => true,
-        'no_leading_namespace_whitespace' => true,
-        'no_null_property_initialization' => true,
-        'no_short_bool_cast' => true,
-        'no_singleline_whitespace_before_semicolons' => true,
-        'no_superfluous_elseif' => true,
-        'no_trailing_comma_in_singleline_array' => true,
-        'no_unneeded_control_parentheses' => true,
-        'no_unused_imports' => true,
-        'no_useless_else' => true,
-        'no_whitespace_in_blank_line' => true,
-        'ordered_imports' => true,
-        'phpdoc_no_access' => true,
-        'phpdoc_no_empty_return' => true,
-        'phpdoc_no_package' => true,
-        'phpdoc_scalar' => true,
-        'phpdoc_trim' => true,
-        'phpdoc_types' => true,
-        'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
-        'php_unit_mock_short_will_return' => true,
-        'php_unit_set_up_tear_down_visibility' => true,
-        'php_unit_strict' => true,
-        'php_unit_test_case_static_method_calls' => ['call_type' => 'self'],
-        'return_type_declaration' => ['space_before' => 'none'],
-        'single_quote' => true,
-        'whitespace_after_comma_in_array' => true,
-    ])
-    ->setFinder($finder);
+$config->addRules([
+    'header_comment' => ['header' => $header, 'separate' => 'both'],
+]);
+
+return $config;
diff --git a/Build/gulpfile.js b/Build/gulpfile.js
@@ -16,6 +16,7 @@ const options = {
   outputPath: '../Resources/Public/Prism/',
   availablePlugins: [
     'command-line',
+    'inline-color',
     'line-highlight',
     'line-numbers',
   ],

diff --git a/Build/package.json b/Build/package.json
@@ -2,10 +2,10 @@
   "name": "codehighlight",
   "license": "GPL-2.0+",
   "dependencies": {
-    "prismjs": "^1.19.0"
+    "prismjs": "^1.22.0"
   },
   "devDependencies": {
-    "del": "^5.1.0",
+    "del": "^6.0.0",
     "gulp": "^4.0.2",
     "gulp-clean-css": "^4.3.0",
     "gulp-concat": "^2.6.1",

diff --git a/Build/patches/prismjs+1.21.0.patch → Build/patches/prismjs+1.22.0.patch b/Build/patches/prismjs+1.21.0.patch → Build/patches/prismjs+1.22.0.patch
@@ -1,13 +1,17 @@
 diff --git a/node_modules/prismjs/plugins/autoloader/prism-autoloader.js b/node_modules/prismjs/plugins/autoloader/prism-autoloader.js
-index b57c694..23ed575 100644
+index 36764c4..57d0401 100644
 --- a/node_modules/prismjs/plugins/autoloader/prism-autoloader.js
 +++ b/node_modules/prismjs/plugins/autoloader/prism-autoloader.js
-@@ -227,23 +227,7 @@
+@@ -233,28 +233,9 @@
+ 	var lang_data = {};
+
+ 	var ignored_language = 'none';
+-	var languages_path = 'components/';
 
  	var script = Prism.util.currentScript();
- 	if (script) {
--		var autoloaderFile = /\bplugins\/autoloader\/prism-autoloader\.(?:min\.)js(?:\?[^\r\n/]*)?$/i;
--		var prismFile = /(^|\/)[\w-]+\.(?:min\.)js(?:\?[^\r\n/]*)?$/i;
+-	if (script) {
+-		var autoloaderFile = /\bplugins\/autoloader\/prism-autoloader\.(?:min\.)?js(?:\?[^\r\n/]*)?$/i;
+-		var prismFile = /(^|\/)[\w-]+\.(?:min\.)?js(?:\?[^\r\n/]*)?$/i;
 -
 -		var autoloaderPath = script.getAttribute('data-autoloader-path');
 -		if (autoloaderPath != null) {
@@ -23,7 +27,8 @@ index b57c694..23ed575 100644
 -				languages_path = src.replace(prismFile, '$1components/');
 -			}
 -		}
-+    var languages_path = '/typo3conf/ext/codehighlight/Resources/Public/Prism/components/';
- 	}
+-	}
++  var languages_path = '/typo3conf/ext/codehighlight/Resources/Public/Prism/components/';
 
  	var config = Prism.plugins.autoloader = {
+ 		languages_path: languages_path,