smg6511
diff --git a/‎.editorconfig‎
Lines changed: 2 additions & 20 deletions b/‎.editorconfig‎
Lines changed: 2 additions & 20 deletions
diff --git a/‎.github/ISSUE_TEMPLATE/bug_report.md‎
Lines changed: 2 additions & 2 deletions b/‎.github/ISSUE_TEMPLATE/bug_report.md‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎.github/ISSUE_TEMPLATE/feature_request.md‎
Lines changed: 2 additions & 2 deletions b/‎.github/ISSUE_TEMPLATE/feature_request.md‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎.github/PULL_REQUEST_TEMPLATE.md‎
Lines changed: 5 additions & 2 deletions b/‎.github/PULL_REQUEST_TEMPLATE.md‎
Lines changed: 5 additions & 2 deletions
diff --git a/‎.github/workflows/ci.yml‎
Lines changed: 62 additions & 0 deletions b/‎.github/workflows/ci.yml‎
Lines changed: 62 additions & 0 deletions
diff --git a/‎.github/workflows/phpcs.yml‎
Lines changed: 27 additions & 0 deletions b/‎.github/workflows/phpcs.yml‎
Lines changed: 27 additions & 0 deletions
diff --git a/‎.gitignore‎
Lines changed: 3 additions & 0 deletions b/‎.gitignore‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎.travis.yml‎
Lines changed: 0 additions & 29 deletions b/‎.travis.yml‎
Lines changed: 0 additions & 29 deletions
diff --git a/‎CODE_OF_CONDUCT.md‎
Lines changed: 50 additions & 0 deletions b/‎CODE_OF_CONDUCT.md‎
Lines changed: 50 additions & 0 deletions
diff --git a/‎README.md‎
Lines changed: 21 additions & 6 deletions b/‎README.md‎
Lines changed: 21 additions & 6 deletions
@@ -7,29 +7,11 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 indent_style = space
-tab_width = 4
+indent_size = 4
 max_line_length = off
 
 [**.scss]
-tab_width = 2
-
-[**.js]
-tab_width = 4
-
-[**.coffee]
-tab_width = 4
-
-[**.cson]
-tab_width = 4
-
-[**.json]
-tab_width = 4
-
-[**rc]
-tab_width = 4
-
-[**php]
-tab_width = 4
+indent_size = 2
 
 [*.md]
 max_line_length = off
 
@@ -1,7 +1,7 @@
 ---
 name: Bug report
 about: Create a report to help us improve MODX Revolution
-
+labels: bug
 ---
 
 ## Bug report
@@ -18,4 +18,4 @@ How it behaved after following steps above.
 How it should behave after following steps above.
 
 ### Environment
-MODX version, apache/nginx and version, mysql version, browser, etc. Any relevant information.
+MODX version, apache/nginx and version, mysql version, browser, etc. Any relevant information.
@@ -1,7 +1,7 @@
 ---
 name: Feature request
 about: Suggest an idea that makes MODX Revolution even better
-
+labels: feature
 ---
 
 ## Feature request
@@ -15,4 +15,4 @@ A clear and concise description of what the problem is. Ex. I'm always frustrate
 A clear and concise description of what you want to happen.
 
 ### Related issue(s)/PR(s)
-Let us know if this is related to any issue/pull request.
+Let us know if this is related to any issue/pull request.
@@ -1,8 +1,11 @@
 ### What does it do?
-Describe the technical changes you did.
+Describe the technical changes you made.
 
 ### Why is it needed?
 Describe the issue you are solving.
 
+### How to test
+Describe how to test the changes you made.
+
 ### Related issue(s)/PR(s)
-Let us know if this is related to any issue/pull request (see https://github.com/blog/1506-closing-issues-via-pull-requests)
+Provide any issue that's addressed by this change in the format "Resolves #<issue number>", and mention other issues/pull requests with relevant information. 
@@ -0,0 +1,62 @@
+name: CI
+
+on:
+  push:
+      branches-ignore:
+          - 'l10n_**'
+  pull_request:
+      branches-ignore:
+          - 'l10n_**'
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  mysql-check:
+    name: MySQL Check
+    runs-on: ubuntu-20.04
+
+    services:
+      mysql:
+        image: "mysql:5.6"
+
+        options: >-
+          --health-cmd "mysqladmin ping --silent"
+          -e MYSQL_ALLOW_EMPTY_PASSWORD=yes
+          -e MYSQL_DATABASE=revo_test
+        ports:
+          - 3306:3306
+
+    strategy:
+      matrix:
+        php-version: ['7.1', '7.2', '7.3', '7.4', '8.0']
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Install PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          extensions: pdo, pdo_mysql, zip, mysqli, gd
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install dependencies
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
+
+      - name: Setup MODX
+        run: cd _build/test && ./generateConfigs.sh auto
+
+      - name: Run PHPUnit
+        run: core/vendor/bin/phpunit  --enforce-time-limit -c ./_build/test/phpunit.xml
@@ -0,0 +1,27 @@
+name: "Code Quality"
+
+on:
+    pull_request:
+        paths:
+            - "**.php"
+            - "phpcs.xml"
+            - ".github/workflows/phpcs.yml"
+
+jobs:
+    phpcs:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v2
+              with:
+                  fetch-depth: 0
+
+            - name: Install PHP_CodeSniffer
+              run: |
+                  curl -OL https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar
+                  php phpcs.phar --version
+
+            - uses: thenabeel/action-phpcs@v8
+              with:
+                  files: "**.php"
+                  phpcs_path: php phpcs.phar
+                  standard: phpcs.xml
@@ -53,3 +53,6 @@ composer.lock
 
 # ignore composer vendor dir
 /vendor
+
+# ignore phpunit cache files
+.phpunit.result.cache
@@ -0,0 +1,50 @@
+# Contributor Covenant Code of Conduct
+
+The MODX Community, Leadership and Advisory Board has decided to use the [Contributor Covenant][homepage] until such time we ratify our own.
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at http://contributor-covenant.org/version/1/4
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at https://www.contributor-covenant.org/faq.
+Translations are available at https://www.contributor-covenant.org/translations.
@@ -1,14 +1,25 @@
-# MODX Revolution
+<p align="center">
+  <a href="https://modx.com/">
+    <img alt="MODX Revolution" src="https://raw.githubusercontent.com/modxcms/revolution/2.x/manager/templates/default/images/modx-icon-color.svg" width="100" />
+  </a>
+</p>
+<h1 align="center">
+  MODX Revolution
+</h1>
 
-[![Build Status](https://travis-ci.com/modxcms/revolution.svg?branch=3.x)](https://travis-ci.org/modxcms/revolution) [![Slack Chat](https://img.shields.io/badge/chat_in_slack-online-green.svg?longCache=true&style=flat&logo=slack)](https://modx.org)
+#### MODX Revolution is the world’s fastest, most secure, flexible and scalable Open Source CMS
+
+[![LICENSE](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](./LICENSE) [![Build Status](https://github.com/modxcms/revolution/workflows/CI/badge.svg?branch=3.x)](https://github.com/modxcms/revolution/actions?query=branch%3A3.x) [![Contributors](https://img.shields.io/github/contributors/modxcms/revolution.svg)](https://github.com/modxcms/revolution/graphs/contributors) [![Slack Chat](https://img.shields.io/badge/chat_in_slack-online-green.svg?longCache=true&style=flat&logo=slack)](https://modx.org) [![follow on Twitter](https://img.shields.io/twitter/follow/modx.svg?style=social&logo=twitter)](https://twitter.com/intent/follow?screen_name=modx)
 
 ## Content Management System and Application Framework
 
 MODX lets you power anything from multi-language, multi-domain corporate sites to personal blogs to mobile APIs. Delivering true creative freedom and removing all restrictions, it lets you control the markup and design without having to code. You can also tailor its modular and extensible core to accommodate virtually any custom requirement or amount of traffic. MODX is the free open source software that meets your needs today—and tomorrow.
 
+MODX Revolution is the world’s fastest, most customizable Open Source PHP CMS. Your creative vision, no restrictions, no compromise.
+
 ### Latest Changes
 
-For details read the [complete changelog](./core/docs/changelog.txt "complete changelog")
+For details read the [complete changelog](./core/docs/changelog.txt 'complete changelog')
 
 ### Getting Started
 
@@ -23,17 +34,21 @@ Here's what you need to get started installing or upgrading MODX Revoluton:
 
 ### Other Important Stuff
 
-MODX is only as good as it is because of many individual community members and users that take the time to [report issues and request new features](https://github.com/modxcms/revolution/issues "MODX Github Issues"). Make sure you [read the documentation](https://docs.modx.com/3.x/en/index), [post feedback and share your successes](https://community.modx.com) in the MODX community forums. To join us in the quest for *Creative Freedom*, [become a Contributor](https://docs.modx.org/3.x/en/contribute). You can [contribute using GitHub](https://docs.modx.com/current/en/contribute/code/git-github)
+MODX is only as good as it is because of many individual community members and users that take the time to [report issues and request new features](https://github.com/modxcms/revolution/issues 'MODX Github Issues'). Make sure you [read the documentation](https://docs.modx.com/3.x/en/index), [post feedback and share your successes](https://community.modx.com/ 'MODX Community') in the MODX community forums. And also help with translating lexicons on [Crowdin platform](https://crowdin.com/project/modx-revolution). To join us in the quest for _Creative Freedom_, [become a Contributor](https://docs.modx.com/3.x/en/contribute/code). You can [contribute using GitHub](https://docs.modx.com/3.x/en/contribute/code 'Contribute to MODX via GitHub')
 
 On behalf of the entire MODX Team,
 
 Thank you for using MODX!
 
+### Security Issues in MODX
+
+For details read the [SECURITY](./SECURITY.md 'SECURITY')
+
 ### Copyright
 
 Copyright (c) MODX, LLC. All Rights Reserved.
 
-For complete copyright information, see the [COPYRIGHT](./COPYRIGHT "Copyright") file at the top-level directory of this distribution.
+For complete copyright information, see the [COPYRIGHT](./COPYRIGHT 'Copyright') file at the top-level directory of this distribution.
 
 ### License
 
@@ -43,4 +58,4 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 
 You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-[GNU General Public License v2](./LICENSE "GNU General Public License v2")
+[GNU General Public License v2](./LICENSE 'GNU General Public License v2')