Skip to content

Commit b81c275

Browse files
authored
Merge pull request #2 from joomla/staging
Update repository
2 parents e28743e + f3094f2 commit b81c275

File tree

4,261 files changed

+29633
-22817
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,261 files changed

+29633
-22817
lines changed

.appveyor.yml

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,26 @@ install:
3939
- ps: >-
4040
If ($env:PHP -eq "1") {
4141
If ($env:php_ver_target -eq "5.6") {
42-
appveyor-retry appveyor DownloadFile https://cdn.joomla.org/ci/php-sqlsrv.zip
42+
$source = "https://cdn.joomla.org/ci/php-sqlsrv.zip"
43+
$destination = "c:\tools\php\php-sqlsrv.zip"
44+
Invoke-WebRequest $source -OutFile $destination
45+
#appveyor-retry appveyor DownloadFile https://cdn.joomla.org/ci/php-sqlsrv.zip
4346
7z x -y php-sqlsrv.zip > $null
4447
copy SQLSRV\php_sqlsrv_56_nts.dll ext\php_sqlsrv_nts.dll
4548
copy SQLSRV\php_pdo_sqlsrv_56_nts.dll ext\php_pdo_sqlsrv_nts.dll
4649
Remove-Item C:\tools\php\* -include .zip
4750
} Else {
48-
$DLLVersion = "4.1.6.1"
51+
$DLLVersion = "4.3.0"
4952
cd c:\tools\php\ext
50-
appveyor-retry appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/sqlsrv/$($DLLVersion)/php_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip
53+
$source = "http://windows.php.net/downloads/pecl/releases/sqlsrv/$($DLLVersion)/php_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip"
54+
$destination = "c:\tools\php\ext\php_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip"
55+
Invoke-WebRequest $source -OutFile $destination
56+
#appveyor-retry appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/sqlsrv/$($DLLVersion)/php_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip
5157
7z x -y php_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip > $null
52-
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
58+
$source = "http://windows.php.net/downloads/pecl/releases/pdo_sqlsrv/$($DLLVersion)/php_pdo_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip"
59+
$destination = "c:\tools\php\ext\php_pdo_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip"
60+
Invoke-WebRequest $source -OutFile $destination
61+
#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
5362
7z x -y php_pdo_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip > $null
5463
Remove-Item c:\tools\php\ext* -include .zip
5564
cd c:\tools\php}}
@@ -83,7 +92,10 @@ install:
8392
If ($env:PHP -eq "1") {
8493
If ($env:php_ver_target -eq "5.6") {$wincache = "1.3.7.12"} Else {$wincache = "2.0.0.8"}
8594
cd c:\tools\php\ext
86-
appveyor-retry appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/wincache/$($wincache)/php_wincache-$($wincache)-$($env:php_ver_target)-nts-$($VC)-$($PHPBuild).zip
95+
$source = "http://windows.php.net/downloads/pecl/releases/wincache/$($wincache)/php_wincache-$($wincache)-$($env:php_ver_target)-nts-$($VC)-$($PHPBuild).zip"
96+
$destination = "c:\tools\php\ext\php_wincache-$($wincache)-$($env:php_ver_target)-nts-$($VC)-$($PHPBuild).zip"
97+
Invoke-WebRequest $source -OutFile $destination
98+
#appveyor-retry appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/wincache/$($wincache)/php_wincache-$($wincache)-$($env:php_ver_target)-nts-$($VC)-$($PHPBuild).zip
8799
7z x -y php_wincache-$($wincache)-$($env:php_ver_target)-nts-$($VC)-$($PHPBuild).zip > $null
88100
Remove-Item C:\tools\php\ext* -include .zip
89101
cd c:\tools\php}
@@ -118,4 +130,4 @@ before_test:
118130

119131
test_script:
120132
- cd C:\projects\joomla-cms
121-
- libraries/vendor/bin/phpunit -c appveyor-phpunit.xml
133+
- ps: If ($env:php_ver_target -eq "5.6") {libraries/vendor/bin/phpunit -c appveyor-phpunit.xml --exclude-group not-on-windows } Else {libraries/vendor/bin/phpunit -c appveyor-phpunit.xml}

.drone.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pipeline:
77
image: joomlaprojects/docker-phpcs
88
commands:
99
- echo $(date)
10-
- /root/.composer/vendor/bin/phpcs --report=full --extensions=php -p --standard=build/phpcs/Joomla .
10+
- /root/.composer/vendor/bin/phpcs --report=full --encoding=utf-8 --extensions=php -p --standard=build/phpcs/Joomla .
1111
- echo $(date)
1212

1313
javascript:
@@ -26,3 +26,12 @@ pipeline:
2626
- tests/javascript/node_modules/karma/bin/karma start karma.conf.js --single-run
2727
- echo $(date)
2828

29+
analysis:
30+
image: rips/rips-cli
31+
secrets: [rips_username, rips_password]
32+
commands:
33+
- export RIPS_BASE_URI='https://api.rips.joomla.org'
34+
- export RIPS_USERNAME=$RIPS_USERNAME
35+
- export RIPS_PASSWORD=$RIPS_PASSWORD
36+
- rips-cli rips:scan:start -a 1 -t 1 -p $(pwd) -t 1 -T $DRONE_REPO_OWNER-$DRONE_BRANCH || { echo "Please contact the security team at [email protected]"; exit 1; }
37+

.editorconfig

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# EditorConfig is awesome: http://EditorConfig.org
2+
3+
# top-most EditorConfig file
4+
root = true
5+
6+
# Unix-style newlines with a newline ending every file
7+
[*]
8+
indent_style = tab
9+
end_of_line = lf
10+
charset = utf-8
11+
trim_trailing_whitespace = true
12+
insert_final_newline = true

.github/CODEOWNERS

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
# Custom Fields
2+
administrator/components/com_fields/* @laoneo
3+
components/com_fields/* @laoneo
4+
plugins/content/fields/* @laoneo
5+
plugins/editors-xtd/fields/* @laoneo
6+
plugins/fields/* @laoneo
7+
plugins/systems/fields/* @laoneo
8+
9+
# Smart Search
10+
administrator/components/com_finder/* @mbabker
11+
components/com_finder/* @mbabker
12+
modules/mod_finder/* @mbabker
13+
plugins/content/finder/* @mbabker
14+
plugins/finder/* @mbabker
15+
16+
# Language strings
17+
administrator/language/en-GB/* @brianteeman
18+
installation/language/en-GB/* @brianteeman
19+
language/en-GB/* @brianteeman
20+
README.md @brianteeman
21+
README.txt @brianteeman
22+
23+
# CodeMirror
24+
media/editors/codemirror/* @okonomiyaki3000
25+
plugins/editors/codemirror/* @okonomiyaki3000
26+
27+
# Statistics Server
28+
plugins/system/stats/* @mbabker @wilsonge
29+
30+
# Release Tools
31+
build.xml @mbabker
32+
build/build.php @mbabker @rdeutz @wilsonge
33+
build/bump.php @mbabker @rdeutz @wilsonge
34+
build/deleted_file_check.php @mbabker @rdeutz @wilsonge
35+
36+
# Core/Extension Install/Update Tools
37+
administrator/components/com_joomlaupdate/* @mbabker @rdeutz @wilsonge @zero-24
38+
libraries/src/Installer/* @mbabker @rdeutz @wilsonge @zero-24
39+
libraries/src/Updater/* @mbabker @rdeutz @wilsonge @zero-24
40+
41+
# Automated Testing
42+
build/jenkins/* @mbabker @rdeutz
43+
build/travis/* @mbabker @rdeutz
44+
tests/codeception/* @rdeutz
45+
tests/javascript/* @dgrammatiko @rdeutz
46+
tests/unit/* @mbabker @rdeutz
47+
.appveyor.yml @mbabker @rdeutz
48+
.drone.yml @rdeutz
49+
.hound.yml @mbabker
50+
.travis.yml @mbabker @rdeutz
51+
appveyor-phpunit.xml @mbabker @rdeutz
52+
codeception.yml @rdeutz
53+
karma.conf.js @dgrammatiko @rdeutz
54+
phpunit.xml.dist @mbabker @rdeutz
55+
RoboFile.dist.ini @rdeutz
56+
RoboFile.php @rdeutz
57+
travis-phpunit.xml @mbabker @rdeutz
58+
59+
# Core JS
60+
media/*/js/* @dgrammatiko

.github/CONTRIBUTING.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,6 @@ There are other branches available which serve specific purposes.
2020
| Branch | Purpose |
2121
| ------ | ------- |
2222
| staging | Current codebase. Branch for the next minor Joomla version. New backward compatible features go into this branch. |
23-
| 3.9-dev | Branch for the next minor Joomla version. The 3.9.0 release will only include compatibility features for 4.0. Commits to staging will be applied to this branch as well. |
23+
| 3.9-dev | Branch for the next minor Joomla version. The 3.9.0 release will include the Privacy Tools Suite features. Commits to staging will be applied to this branch as well. |
24+
| 3.10-dev | Branch for the next minor Joomla version. The 3.10.0 release will only include compatibility features for 4.0. Commits to staging will be applied to this branch as well. |
2425
| 4.0-dev | Branch for the next major Joomla version. New features go into this branch. Commits to staging will be applied to this branch as well. |
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
5+
---
6+
7+
### Steps to reproduce the issue
8+
9+
10+
11+
### Expected result
12+
13+
14+
15+
### Actual result
16+
17+
18+
19+
### System information (as much as possible)
20+
21+
22+
23+
### Additional comments

.github/ISSUE_TEMPLATE/Custom.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
name: Fix this template
3+
about: Suggest a fix it
4+
5+
---
6+
7+
### What needs to be fixed
8+
9+
10+
### Why this should be fixed
11+
12+
13+
### How would you fix it
14+
15+
16+
### Side Effects expected
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
5+
---
6+
7+
### Is your feature request related to a problem? Please describe.
8+
9+
10+
11+
### Describe the solution you'd like
12+
13+
14+
15+
### Additional context

.github/ISSUE_TEMPLATE/Security.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
name: Security
3+
about: Report a security issue
4+
5+
---
6+
7+
Security issues should **NOT** be reported on this repository.
8+
9+
If you believe you have found a security issue, please contact the Joomla Security Strike Team via email at [email protected] or through the contact form at https://developer.joomla.org/security/contact-the-team.html.
10+
11+
Please see https://developer.joomla.org/security.html for more information on how the Joomla project responds to security issues.

.gitignore

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# IDE & System Related Files #
22
.buildpath
3-
.editorconfig
43
.project
54
.settings
65
.DS_Store
@@ -89,6 +88,7 @@ Desktop.ini
8988
/libraries/vendor/joomla/*/composer.json
9089
/libraries/vendor/joomla/*/phpunit.xml.dist
9190
/libraries/vendor/joomla/*/README.md
91+
/libraries/vendor/joomla/*/ruleset.xml
9292
/libraries/vendor/joomla/session/Joomla/Session/.github
9393
/libraries/vendor/joomla/session/Joomla/Session/_Tests
9494
/libraries/vendor/joomla/session/Joomla/Session/build
@@ -121,8 +121,11 @@ Desktop.ini
121121
/libraries/vendor/paragonie/random_compat/psalm.xml
122122
/libraries/vendor/paragonie/random_compat/tests
123123
/libraries/vendor/paragonie/sodium_compat/.gitignore
124+
/libraries/vendor/paragonie/sodium_compat/appveyor.yml
125+
/libraries/vendor/paragonie/sodium_compat/build-phar.sh
124126
/libraries/vendor/paragonie/sodium_compat/composer.json
125127
/libraries/vendor/paragonie/sodium_compat/composer.lock
128+
/libraries/vendor/paragonie/sodium_compat/dist
126129
/libraries/vendor/paragonie/sodium_compat/phpunit.xml.dist
127130
/libraries/vendor/paragonie/sodium_compat/README.md
128131
/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/README.md
@@ -142,17 +145,26 @@ Desktop.ini
142145
/libraries/vendor/phpmailer/phpmailer/UPGRADING.md
143146
/libraries/vendor/phpmailer/phpmailer/extras/README.md
144147
/libraries/vendor/phpmailer/phpmailer/get_oauth_token.php
148+
/libraries/vendor/psr/container/.gitignore
149+
/libraries/vendor/psr/container/composer.json
150+
/libraries/vendor/psr/container/README.md
145151
/libraries/vendor/psr/log/Psr/Log/Test
146152
/libraries/vendor/psr/log/.gitignore
147153
/libraries/vendor/psr/log/composer.json
148154
/libraries/vendor/psr/log/README.md
155+
/libraries/vendor/symfony/polyfill-ctype/composer.json
156+
/libraries/vendor/symfony/polyfill-ctype/README.md
149157
/libraries/vendor/symfony/polyfill-php55/composer.json
150158
/libraries/vendor/symfony/polyfill-php55/README.md
151159
/libraries/vendor/symfony/polyfill-php56/composer.json
152160
/libraries/vendor/symfony/polyfill-php56/README.md
161+
/libraries/vendor/symfony/polyfill-php73/composer.json
162+
/libraries/vendor/symfony/polyfill-php73/README.md
153163
/libraries/vendor/symfony/polyfill-util/composer.json
154164
/libraries/vendor/symfony/polyfill-util/README.md
165+
/libraries/vendor/symfony/polyfill-util/LegacyTestListener.php
155166
/libraries/vendor/symfony/polyfill-util/TestListener.php
167+
/libraries/vendor/symfony/polyfill-util/TestListenerTrait.php
156168
/libraries/vendor/symfony/yaml/Tests
157169
/libraries/vendor/symfony/yaml/.gitignore
158170
/libraries/vendor/symfony/yaml/CHANGELOG.md

0 commit comments

Comments
 (0)