diff --git a/.editorconfig b/.editorconfig index 779f99a..fca2964 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,3 +10,7 @@ insert_final_newline = true [*.md] trim_trailing_whitespace = false +indent_style = unset + +[LICENSE] +indent_style = unset diff --git a/.travis.yml b/.travis.yml index 070e0b1..18ee359 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,13 @@ php: - '7.0' - '7.1' - '7.2' -before_script: composer install + - '7.3' +cache: + directories: + - $HOME/.composer/cache/files +before_script: + - phpenv config-rm xdebug.ini + - composer install --prefer-dist script: - composer lint #- composer test diff --git a/Classes/Fluid/ViewHelper/ComponentRenderer.php b/Classes/Fluid/ViewHelper/ComponentRenderer.php index 135c543..ceed96d 100644 --- a/Classes/Fluid/ViewHelper/ComponentRenderer.php +++ b/Classes/Fluid/ViewHelper/ComponentRenderer.php @@ -178,7 +178,7 @@ public function renderArgument($argumentValue, $renderingContext) { if ($argumentValue instanceof \Closure) { return $argumentValue($renderingContext); - } else if ($argumentValue instanceof NodeInterface) { + } elseif ($argumentValue instanceof NodeInterface) { return $argumentValue->evaluate($renderingContext); } else { return $argumentValue; diff --git a/Documentation/ViewHelperReference.md b/Documentation/ViewHelperReference.md index 7e20d15..05c8e95 100644 --- a/Documentation/ViewHelperReference.md +++ b/Documentation/ViewHelperReference.md @@ -251,4 +251,4 @@ Usage with EXT:form: /> -``` \ No newline at end of file +``` diff --git a/composer.json b/composer.json index 71b9522..da7e0a3 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,7 @@ "@lint:php", "@lint:editorconfig" ], - "lint:php": "phpcs --standard=PSR2 --extensions=php --ignore=.Build,Tests,ext_emconf.php .", + "lint:php": "phpcs --standard=PSR2 --extensions=php --exclude=Generic.Files.LineLength --ignore='\\.Build,Tests,ext_emconf\\.php' .", "lint:editorconfig": "editorconfig-checker -d .", "test": "phpunit -c .Build/vendor/typo3/testing-framework/Resources/Core/Build/UnitTests.xml Tests/" } diff --git a/ext_emconf.php b/ext_emconf.php index 43bf07e..1f0090f 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -9,7 +9,7 @@ 'state' => 'beta', 'uploadfolder' => false, 'clearCacheOnLoad' => false, - 'version' => '1.1.0', + 'version' => '1.1.2', 'constraints' => [ 'depends' => [ 'typo3' => '8.7.0-9.9.99' @@ -18,5 +18,10 @@ ], 'suggests' => [ ], - ] + ], + 'autoload' => [ + 'psr-4' => [ + 'SMS\\FluidComponents\\' => 'Classes' + ] + ], ];