Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'staging' into jroute-between-sites
- Loading branch information
Showing
2,565 changed files
with
80,092 additions
and
54,435 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| build: | ||
| image: joomlaprojects/docker-systemtests:latest | ||
| commands: | ||
| - apt-get install nodejs npm | ||
| - ln -s /usr/bin/nodejs /usr/bin/node | ||
| - export DISPLAY=:0 | ||
| - Xvfb -screen 0 1024x768x24 -ac +extension GLX +render -noreset > /dev/null 2>&1 & | ||
| - sleep 3 | ||
| - fluxbox > /dev/null 2>&1 & | ||
| - cd tests/javascript | ||
| - npm install | ||
| - cd ../.. | ||
| - tests/javascript/node_modules/karma/bin/karma start karma.conf.js --single-run | ||
| clone: | ||
| depth: 1 | ||
| path: repo |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,18 @@ | ||
| #### Steps to reproduce the issue | ||
| ### Steps to reproduce the issue | ||
|
|
||
|
|
||
|
|
||
| #### Expected result | ||
| ### Expected result | ||
|
|
||
|
|
||
|
|
||
| #### Actual result | ||
| ### Actual result | ||
|
|
||
|
|
||
|
|
||
| #### System information (as much as possible) | ||
| ### System information (as much as possible) | ||
|
|
||
|
|
||
|
|
||
| #### Additional comments | ||
| ### Additional comments | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| Pull Request for Issue # . | ||
|
|
||
| #### Summary of Changes | ||
| ### Summary of Changes | ||
|
|
||
| #### Testing Instructions | ||
| ### Testing Instructions | ||
|
|
||
| ### Documentation Changes Required |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| <?php | ||
|
|
||
| $topFilesFinder = Symfony\CS\Finder\DefaultFinder::create() | ||
| ->in(array(__DIR__ . '/libraries')) | ||
| ->files() | ||
| ->depth(0); | ||
|
|
||
| $mainFinder = Symfony\CS\Finder\DefaultFinder::create() | ||
| ->in( | ||
| array( | ||
| __DIR__ . '/libraries/cms', | ||
| __DIR__ . '/libraries/joomla', | ||
| __DIR__ . '/libraries/legacy', | ||
| ) | ||
| ) | ||
| ->append($topFilesFinder); | ||
|
|
||
| return Symfony\CS\Config\Config::create() | ||
| ->setUsingLinter(false) | ||
| ->setUsingCache(true) | ||
| ->level(Symfony\CS\FixerInterface::NONE_LEVEL) | ||
| ->fixers( | ||
| array( | ||
| // psr-1 | ||
| 'encoding', | ||
| // psr-2 | ||
| 'elseif', | ||
| 'eof_ending', | ||
| 'function_call_space', | ||
| 'line_after_namespace', | ||
| 'linefeed', | ||
| 'lowercase_constants', | ||
| 'lowercase_keywords', | ||
| 'method_argument_space', | ||
| 'multiple_use', | ||
| 'parenthesis', | ||
| 'single_line_after_imports', | ||
| 'trailing_spaces', | ||
| 'visibility', | ||
| // symfony | ||
| 'array_element_no_space_before_comma', | ||
| 'array_element_white_space_after_comma', | ||
| 'duplicate_semicolon', | ||
| 'empty_return', | ||
| 'extra_empty_lines', | ||
| 'function_typehint_space', | ||
| 'include', | ||
| 'join_function', | ||
| 'list_commas', | ||
| 'multiline_array_trailing_comma', | ||
| 'no_blank_lines_after_class_opening', | ||
| 'phpdoc_trim', | ||
| 'return', | ||
| 'single_array_no_trailing_comma', | ||
| 'single_blank_line_before_namespace', | ||
| 'spaces_cast', | ||
| 'unneeded_control_parentheses', | ||
| 'unused_use', | ||
| 'whitespacy_lines', | ||
| // contrib | ||
| 'concat_with_spaces', | ||
| 'long_array_syntax', | ||
| ) | ||
| ) | ||
| ->finder($mainFinder); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.