Skip to content

Commit fb6d778

Browse files
Merge branch '4.0-dev' into featurecontactsconfig-4.0
2 parents b43682e + 96b325c commit fb6d778

2,981 files changed

Lines changed: 19590 additions & 7597 deletions

File tree

Some content is hidden

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

.appveyor.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ install:
9696
- appveyor-retry appveyor DownloadFile https://getcomposer.org/composer.phar
9797
- cd C:\projects\joomla-cms
9898
- appveyor-retry composer install --no-progress --profile
99-
- appveyor-retry composer update joomla/test-unit --no-progress --profile
10099
before_test:
101100
# Database setup for MySQL via PowerShell tools
102101
- >
@@ -113,4 +112,4 @@ before_test:
113112

114113
test_script:
115114
- cd C:\projects\joomla-cms
116-
- libraries/vendor/bin/phpunit --configuration ./libraries/vendor/joomla/test-unit/phpunit.xml.dist
115+
- libraries/vendor/bin/phpunit

.drone.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@ pipeline:
2323
image: joomlaprojects/docker-tools:develop
2424
commands:
2525
- composer install --no-progress --no-suggest
26-
# needed for unit testing
27-
- composer update joomla/test-unit --no-progress --no-suggest
2826
# needed for system testing
2927
- composer update joomla/test-system --no-progress --no-suggest
28+
- composer update joomla/test-api --no-progress --no-suggest
3029
- composer update joomla-projects/selenium-server-standalone --no-progress --no-suggest
3130
- composer update joomla-projects/joomla-browser --no-progress --no-suggest
3231
- npm install --unsafe-perm
@@ -44,19 +43,19 @@ pipeline:
4443
group: unit
4544
image: joomlaprojects/docker-php70:develop
4645
commands:
47-
- ./libraries/vendor/bin/phpunit --configuration ./libraries/vendor/joomla/test-unit/phpunit.xml.dist
46+
- ./libraries/vendor/bin/phpunit
4847

4948
php71-unit:
5049
group: unit
5150
image: joomlaprojects/docker-php71:develop
5251
commands:
53-
- ./libraries/vendor/bin/phpunit --configuration ./libraries/vendor/joomla/test-unit/phpunit.xml.dist
52+
- ./libraries/vendor/bin/phpunit
5453

5554
php72-unit:
5655
group: unit
5756
image: joomlaprojects/docker-php72:develop
5857
commands:
59-
- ./libraries/vendor/bin/phpunit --configuration ./libraries/vendor/joomla/test-unit/phpunit.xml.dist
58+
- ./libraries/vendor/bin/phpunit
6059

6160
javascript-cs:
6261
image: joomlaprojects/docker-systemtests:develop
@@ -81,8 +80,13 @@ pipeline:
8180
commands:
8281
- bash libraries/vendor/joomla/test-system/src/drone-run.sh "$(pwd)"
8382

83+
api-tests:
84+
image: joomlaprojects/docker-systemtests:latest
85+
commands:
86+
- bash libraries/vendor/joomla/test-api/drone-run.sh "$(pwd)"
87+
8488
analysis3x:
85-
image: rips/rips-cli
89+
image: rips/rips-cli:1.2.1
8690
secrets: [rips_username, rips_password]
8791
when:
8892
branch: staging
@@ -91,10 +95,10 @@ pipeline:
9195
- export RIPS_USERNAME=$RIPS_USERNAME
9296
- export RIPS_PASSWORD=$RIPS_PASSWORD
9397
- if [ $DRONE_REPO_OWNER != 'joomla' ]; then echo "The analysis check only run on the main repos"; exit 0; fi
94-
- 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 security@joomla.org"; exit 1; }
98+
- rips-cli rips:scan:start -a 1 -t 1 -R -k -p $(pwd) -t 1 -T $DRONE_REPO_OWNER-$DRONE_BRANCH || { echo "Please contact the security team at security@joomla.org"; exit 1; }
9599

96100
analysis4x:
97-
image: rips/rips-cli
101+
image: rips/rips-cli:1.2.1
98102
secrets: [rips_username, rips_password]
99103
when:
100104
branch: 4.0-dev
@@ -103,7 +107,7 @@ pipeline:
103107
- export RIPS_USERNAME=$RIPS_USERNAME
104108
- export RIPS_PASSWORD=$RIPS_PASSWORD
105109
- if [ $DRONE_REPO_OWNER != 'joomla' ]; then echo "The analysis check only run on the main repos"; exit 0; fi
106-
- rips-cli rips:scan:start -a 3 -t 1 -p $(pwd) -t 1 -T $DRONE_REPO_OWNER-$DRONE_BRANCH || { echo "Please contact the security team at security@joomla.org"; exit 1; }
110+
- rips-cli rips:scan:start -a 3 -t 1 -R -k -p $(pwd) -t 1 -T $DRONE_REPO_OWNER-$DRONE_BRANCH || { echo "Please contact the security team at security@joomla.org"; exit 1; }
107111

108112
branches:
109113
exclude: [ l10n_* ]

.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

.eslintignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ media
77
# TODO: Fix the webcomponents codestyle then also allow linting on them
88
joomla-editor-codemirror.w-c.es6.js
99
joomla-field-fancy-select.w-c.es6.js
10-
joomla-field-media.w-c.es6.js
1110
joomla-field-module-order.w-c.es6.js
1211
joomla-field-permissions.w-c.es6.js
1312
joomla-field-send-test-mail.w-c.es6.js

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ RoboFile.php @rdeutz
5757
travis-phpunit.xml @rdeutz
5858

5959
# Core JS
60-
media/*/js/* @dgt41
60+
media/*/js/* @dgrammatiko
6161

6262
# CSP Tooling
6363
plugins/system/httpheaders/* @zero-24

.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. |

.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 security@joomla.org 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: 0 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

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ before_script:
1919
- composer install --ignore-platform-reqs
2020

2121
script:
22-
- libraries/vendor/bin/phpunit --configuration ./libraries/vendor/joomla/test-unit/phpunit.xml.dist
22+
- libraries/vendor/bin/phpunit
2323

2424
branches:
2525
except:

CODE_OF_CONDUCT.md

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# Joomla Contributor Covenant Code of Conduct
2+
3+
This document outlines the Code of Conduct for all persons volunteering their service to the Joomla Project and/or Open Source Matters. It covers your behaviour as a member of the Joomla community, in any forum, mailing list, Wiki, Web site, IRC channel, install-fest, public meeting or private correspondence.
4+
5+
If you cannot agree to any of these principles, then volunteering in the Joomla Project is not for you. Contributing to our community assumes acceptance of these principles:
6+
## Be Considerate
7+
8+
You are working with others as a team so be considerate of how your actions or contribution affects your colleagues and the community as a whole.
9+
## Be Respectful
10+
11+
Treat one another and members of the community with respect. Everyone can make a valuable contribution to Joomla. We may not always agree, but disagreement is no excuse for poor behavior or poor manners.
12+
13+
We might all experience some frustration now and then, but we cannot allow that frustration to turn into a personal attack. It's important to remember that a community where people feel uncomfortable or threatened is not a productive one. We expect the members of Joomla community to be respectful when dealing with other volunteers as well as with people from outside projects and initiatives and with users.
14+
15+
Avoid becoming involved in flame wars, trolling, personal attacks, and repetitive arguments. Take the matters "outside" (off-list, etc) if it helps resolve the situation, and do not use communal methods of communication to be a vehicle for your private "wall of shame."
16+
## Be Collaborative
17+
18+
Joomla is free software and about collaboration and working together. Collaboration reduces redundancy of work done in the free software world, and improves the quality of the software produced regardless of whether you are writing code or performing some other task.
19+
20+
When you disagree, consult others. Disagreements, both political and technical, happen all the time, and Joomla is no exception. Disagreement, debate and constructive criticism is often how progress is made and are a necessary part of doing complex work in a team.
21+
22+
The important goal is not to avoid disagreements or differing views but to resolve them constructively. Above all, avoid making conflicts about the work into personal conflicts. Debate should never include reference to someone's nationality, gender, religion or other personal characteristics.
23+
24+
You should turn to the community and to the community process to seek advice and to resolve disagreements. Team leaders and Department Coordinators are able to help you figure out which direction will be most acceptable.
25+
26+
When you are unsure, ask for help. Nobody knows everything and nobody is expected to be perfect. Asking questions avoids many problems down the road and so questions are encouraged. Those who are asked should be responsive and helpful. However, when asking a question, care must be taken to do so in an appropriate forum. Off-topic questions, such as requests for help on a development mailing list, detract from productive discussion.
27+
## Step Down Considerately
28+
29+
People on every project come and go, and Joomla is no different. When you leave or disengage from the community, in whole or in part, we ask that you do so in a way that minimizes disruption to the Project. This means you should tell people you are leaving and take the proper steps to ensure that others can pick up where you leave off.
30+
## Be Available
31+
32+
Check your e-mails regularly and answer them promptly—even if it's "I'll get back to you."
33+
## Be Honest
34+
35+
Sometimes the hardest thing to say is "no" or admit you've forgotten do something. Be honest with each other and yourself with regards to what you say and what you can realistically commit to.
36+
## Follow the Rules
37+
38+
Volunteers are expected to uphold Joomla's licensing and trademark requirements including, but not limited to, compliance on their own or affiliate Web sites and extensions. Make sure you have sought the appropriate approvals for domain name, name and logo usage prior to volunteering and that any extensions you distribute comply with the Joomla license.
39+
40+
All work contributed to the Project, whether code, documentation or other material, must observe the appropriate licenses as set down by the Core Team and Open Source Matters.
41+
42+
Some contributors represent the Joomla Project in specific areas, but you should not speak on behalf of the Project or present yourself as an official representative of the Project unless you are specifically authorized to do so, and you should never state your opinions as the official policies of the Project.
43+
## Exercise Discretion and Confidentiality at Appropriate Times
44+
45+
Depending on your role, you will be privy to various levels of information. As a volunteer you are expected to keep site access details (such as logins, FTP details, etc.) secure at all times.
46+
47+
Information contained within private forums (for example, about serious security matters, legal cases, or personal details), private mailing lists, chats or other mediums is also to be kept confidential even after you have discontinued your service. Breaches in the area of privacy and confidentiality are taken very seriously by the Project.
48+
## Conflict of Interest
49+
50+
When using Project resources or making decisions within the board, your department, team, or subteam or the concerning Project's policy positions, you must do so based only on the best interests of the Project and its user community. If you have a situation or affiliation that might constitute or lead to a conflict of interest or might be perceived by a reasonable person in the community to be a conflict of interest, disclose this to your Team Leaders or the team as a whole. If appropriate, after discussing with your team, you should remove yourself from specific decisions or discussions in which you may have a conflict of interest.
51+
## Conflict Resolution Team
52+
53+
Should you wish to make a CoC violation report or are facing a conflict that has failed to be resolved in the manner set out in this CoC, please [click here](https://docs.google.com/forms/d/e/1FAIpQLSea_VL9NUvUM3iX-gptNuJe5oz5-jp9y5Y4v9ZyKImblfYTcQ/viewform) to access the report form.
54+
## The Fine Print
55+
56+
Members of the board of Open Source Matters are governed by additional guidelines and requirements and, where a conflict exists, these take precedence over this Code of Conduct.
57+
## The Last Bit
58+
59+
This Code of Conduct has changed over time and will continue to develop, but was originally derived, with permission, from the Ubuntu CoC.
60+
61+
Last Updated 8th of June 2017
62+
Online version of this document is available at https://www.joomla.org/about-joomla/the-project/code-of-conduct.html

0 commit comments

Comments
 (0)