-
-
Notifications
You must be signed in to change notification settings - Fork 3.6k
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' of https://github.com/joomla/joomla-cms into f…
…ix-http-host-1
- Loading branch information
Showing
5,753 changed files
with
305,733 additions
and
198,601 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
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,121 @@ | ||
| build: false | ||
| platform: | ||
| - x64 | ||
| clone_folder: C:\projects\joomla-cms | ||
| ## Build matrix for lowest and highest possible targets | ||
| environment: | ||
| matrix: | ||
| - php_ver_target: 5.6 | ||
| - php_ver_target: 7.0 | ||
| - php_ver_target: 7.1 | ||
|
|
||
| init: | ||
| - SET PATH=C:\Program Files\OpenSSL;C:\tools\php;%PATH% | ||
| - SET COMPOSER_NO_INTERACTION=1 | ||
| - SET PHP=1 # This var relates to caching the php install | ||
| - SET ANSICON=121x90 (121x90) | ||
| services: | ||
| - mssql2014 | ||
| - mysql | ||
| - postgresql94 | ||
| - iis | ||
|
|
||
| ## Install PHP and composer, and run the appropriate composer command | ||
| install: | ||
| - IF EXIST C:\tools\php (SET PHP=0) | ||
| - ps: >- | ||
| If ($env:php_ver_target -eq "5.6") { | ||
| appveyor-retry cinst --params '""/InstallDir:C:\tools\php""' --ignore-checksums -y --forcex86 php --version ((choco search php --exact --all-versions -r | select-string -pattern $env:php_ver_target | sort { [version]($_ -split '\|' | select -last 1) } -Descending | Select-Object -first 1) -replace '[php|]','') | ||
| $VC = "vc11" | ||
| $PHPBuild = "x86" | ||
| } Else { | ||
| appveyor-retry cinst --params '""/InstallDir:C:\tools\php""' --ignore-checksums -y php --version ((choco search php --exact --all-versions -r | select-string -pattern $env:php_ver_target | sort { [version]($_ -split '\|' | select -last 1) } -Descending | Select-Object -first 1) -replace '[php|]','') | ||
| $VC = "vc14" | ||
| $PHPBuild = "x64" | ||
| } | ||
| - appveyor-retry cinst -y sqlite | ||
| - cd C:\tools\php | ||
| # Get the MSSQL DLL's | ||
| - ps: >- | ||
| If ($env:PHP -eq "1") { | ||
| If ($env:php_ver_target -eq "5.6") { | ||
| appveyor-retry appveyor DownloadFile https://cdn.joomla.org/ci/php-sqlsrv.zip | ||
| 7z x -y php-sqlsrv.zip > $null | ||
| copy SQLSRV\php_sqlsrv_56_nts.dll ext\php_sqlsrv_nts.dll | ||
| copy SQLSRV\php_pdo_sqlsrv_56_nts.dll ext\php_pdo_sqlsrv_nts.dll | ||
| Remove-Item C:\tools\php\* -include .zip | ||
| } Else { | ||
| $DLLVersion = "4.1.6.1" | ||
| cd c:\tools\php\ext | ||
| appveyor-retry appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/sqlsrv/$($DLLVersion)/php_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip | ||
| 7z x -y php_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip > $null | ||
| appveyor-retry appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/pdo_sqlsrv/$($DLLVersion)/php_pdo_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip | ||
| 7z x -y php_pdo_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip > $null | ||
| Remove-Item c:\tools\php\ext* -include .zip | ||
| cd c:\tools\php}} | ||
| - IF %PHP%==1 copy php.ini-production php.ini /Y | ||
| - IF %PHP%==1 echo date.timezone="UTC" >> php.ini | ||
| - IF %PHP%==1 echo extension_dir=ext >> php.ini | ||
| - IF %PHP%==1 echo extension=php_openssl.dll >> php.ini | ||
| - IF %PHP%==1 echo extension=php_mbstring.dll >> php.ini | ||
| - IF %PHP%==1 echo extension=php_fileinfo.dll >> php.ini | ||
| - IF %PHP%==1 echo extension=php_gd2.dll >> php.ini | ||
| - ps: >- | ||
| If ($env:php_ver_target -eq "5.6") { | ||
| Add-Content php.ini "`nextension=php_sqlsrv_nts.dll" | ||
| Add-Content php.ini "`nextension=php_pdo_sqlsrv_nts.dll" | ||
| Add-Content php.ini "`n" | ||
| } Else { | ||
| Add-Content php.ini "`nextension=php_sqlsrv.dll" | ||
| Add-Content php.ini "`nextension=php_pdo_sqlsrv.dll" | ||
| Add-Content php.ini "`n" | ||
| } | ||
| - IF %PHP%==1 echo extension=php_pgsql.dll >> php.ini | ||
| - IF %PHP%==1 echo extension=php_pdo_pgsql.dll >> php.ini | ||
| - IF %PHP%==1 echo extension=php_pdo_sqlite.dll >> php.ini | ||
| - IF %PHP%==1 echo extension=php_sqlite3.dll >> php.ini | ||
| - IF %PHP%==1 echo extension=php_pdo_mysql.dll >> php.ini | ||
| - IF %PHP%==1 echo extension=php_mysqli.dll >> php.ini | ||
| - IF %PHP_VER_TARGET%==5.6 IF %PHP%==1 echo extension=php_mysql.dll >> php.ini | ||
| - IF %PHP%==1 echo extension=php_curl.dll >> php.ini | ||
| # Get the Wincache DLLs | ||
| - ps: >- | ||
| If ($env:PHP -eq "1") { | ||
| If ($env:php_ver_target -eq "5.6") {$wincache = "1.3.7.12"} Else {$wincache = "2.0.0.8"} | ||
| cd c:\tools\php\ext | ||
| appveyor-retry appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/wincache/$($wincache)/php_wincache-$($wincache)-$($env:php_ver_target)-nts-$($VC)-$($PHPBuild).zip | ||
| 7z x -y php_wincache-$($wincache)-$($env:php_ver_target)-nts-$($VC)-$($PHPBuild).zip > $null | ||
| Remove-Item C:\tools\php\ext* -include .zip | ||
| cd c:\tools\php} | ||
| - IF %PHP%==1 echo extension=php_wincache.dll >> php.ini | ||
| - IF %PHP%==1 echo wincache.enablecli = 1 >> php.ini | ||
| - IF %PHP%==1 echo zend_extension=php_opcache.dll >> php.ini | ||
| - IF %PHP%==1 echo opcache.enable_cli=1 >> php.ini | ||
| - IF %PHP%==1 echo extension=php_ldap.dll >> php.ini | ||
| - IF %PHP%==1 echo @php %%~dp0composer.phar %%* > composer.bat | ||
| - appveyor-retry appveyor DownloadFile https://getcomposer.org/composer.phar | ||
| - cd C:\projects\joomla-cms | ||
| - appveyor-retry composer install --no-progress --profile | ||
|
|
||
| before_test: | ||
| # Database setup for MySQL via PowerShell tools | ||
| - > | ||
| "C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql" -u root -p"Password12!" -e "CREATE DATABASE IF NOT EXISTS joomla_ut;" | ||
| - > | ||
| "C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql" -u root -p"Password12!" joomla_ut < tests\unit\schema\mysql.sql | ||
| # Database setup for PostgreSQL | ||
| - SET PGUSER=postgres | ||
| - SET PGPASSWORD=Password12! | ||
| - PATH=C:\Program Files\PostgreSQL\9.4\bin\;%PATH% | ||
| - createdb joomla_ut | ||
| - psql -d joomla_ut -a -f tests\unit\schema\postgresql.sql | ||
|
|
||
| # Database setup for SQL Server | ||
| - ps: $sqlInstance = "(local)\SQL2014" | ||
| - ps: sqlcmd -b -E -S "$sqlInstance" -Q "CREATE DATABASE joomla_ut" | ||
| - ps: sqlcmd -S "$sqlInstance" -U "sa" -P "Password12!" -i $env:APPVEYOR_BUILD_FOLDER\tests\unit\schema\sqlsrv.sql | ||
|
|
||
| test_script: | ||
| - cd C:\projects\joomla-cms | ||
| - libraries/vendor/bin/phpunit -c appveyor-phpunit.xml |
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,28 @@ | ||
| pipeline: | ||
| clone: | ||
| image: plugins/git | ||
| depth: 1 | ||
|
|
||
| phpcs: | ||
| image: joomlaprojects/docker-phpcs | ||
| commands: | ||
| - echo $(date) | ||
| - /root/.composer/vendor/bin/phpcs --report=full --extensions=php -p --standard=build/phpcs/Joomla . | ||
| - echo $(date) | ||
|
|
||
| javascript: | ||
| image: joomlaprojects/docker-systemtests:latest | ||
| commands: | ||
| - echo $(date) | ||
| - 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 | ||
| - echo $(date) | ||
|
|
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 |
|---|---|---|
| @@ -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,20 @@ | ||
| Pull Request for Issue # . | ||
|
|
||
| #### Summary of Changes | ||
| ### Summary of Changes | ||
|
|
||
|
|
||
|
|
||
| ### Testing Instructions | ||
|
|
||
|
|
||
|
|
||
| ### Expected result | ||
|
|
||
|
|
||
|
|
||
| ### Actual result | ||
|
|
||
|
|
||
|
|
||
| ### Documentation Changes Required | ||
|
|
||
| #### Testing Instructions |
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,8 @@ | ||
| Where can you get support and help? | ||
| ==================== | ||
| * [The Joomla! Documentation](https://docs.joomla.org/Special:MyLanguage/Main_Page); | ||
| * [Frequently Asked Questions](https://docs.joomla.org/Special:MyLanguage/Category:FAQ) (FAQ); | ||
| * Find the [information you need](https://docs.joomla.org/Special:MyLanguage/Start_here); | ||
| * Find [help and other users](https://www.joomla.org/about-joomla/create-and-share.html); | ||
| * Post questions at [our forums](https://forum.joomla.org); | ||
| * [Joomla Resources Directory](https://resources.joomla.org) (JRD). |
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,13 @@ | ||
| fail_on_violations: false | ||
|
|
||
| scss: | ||
| enabled: false | ||
|
|
||
| jshint: | ||
| enabled: false | ||
|
|
||
| eslint: | ||
| enabled: false | ||
|
|
||
| ruby: | ||
| enabled: false |
Oops, something went wrong.