Skip to content

Task/ci #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 5, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ insert_final_newline = true

[*.md]
trim_trailing_whitespace = false
indent_style = unset

[LICENSE]
indent_style = unset
8 changes: 7 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion Classes/Fluid/ViewHelper/ComponentRenderer.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Documentation/ViewHelperReference.md
Original file line number Diff line number Diff line change
Expand Up @@ -251,4 +251,4 @@ Usage with EXT:form:
/>
</my:molecule.fieldLabel>
</fc:form.translatedValidationResults>
```
```
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
}
Expand Down
9 changes: 7 additions & 2 deletions ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -18,5 +18,10 @@
],
'suggests' => [
],
]
],
'autoload' => [
'psr-4' => [
'SMS\\FluidComponents\\' => 'Classes'
]
],
];