Skip to content

Commit

Permalink
Merge joomla-cms/3.7.x into app-client
Browse files Browse the repository at this point in the history
  • Loading branch information
izharaazmi committed Oct 1, 2016
2 parents 84163c5 + 3186fe5 commit 59de436
Show file tree
Hide file tree
Showing 3,799 changed files with 139,302 additions and 91,297 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
16 changes: 16 additions & 0 deletions .drone.yml
@@ -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
5 changes: 2 additions & 3 deletions CONTRIBUTING.md → .github/CONTRIBUTING.md
Expand Up @@ -21,6 +21,5 @@ There are other branches available which serve specific purposes.
| ------ | ------- |
| staging | Current codebase. |
| master | Each commit made to staging gets tested if it passes unit tests and codestyle rules. It is then merged into master. This is done automatically. |
| 2.5.x | Branch for the Joomla 2.5.x series. Currently in maintenance mode with EOL end of 2014. No new features are accepted here. |
| 3.2.x | Branch for the Joomla 3.2.x series. Currently in security mode with EOL Oct 2014. Only security issues are fixed. |
| 3.4-dev | Branch for the next minor Joomla version. New backward compatible features go into this branch. Commits to staging will be applied to this branch as well. |
| 2.5.x | Branch for the Joomla 2.5.x series. Support for this version has ended, no patches are accepted here. |
| 3.6.x | Branch for the next minor Joomla version. New backward compatible features go into this branch. Commits to staging will be applied to this branch as well. |
18 changes: 18 additions & 0 deletions .github/ISSUE_TEMPLATE.md
@@ -0,0 +1,18 @@
### Steps to reproduce the issue



### Expected result



### Actual result



### System information (as much as possible)



### Additional comments

7 changes: 7 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,7 @@
Pull Request for Issue # .

### Summary of Changes

### Testing Instructions

### Documentation Changes Required
35 changes: 24 additions & 11 deletions .gitignore
@@ -1,31 +1,27 @@
# IDE & System Related Files #
.buildpath
.editorconfig
.project
.settings
.DS_Store
.idea

# Local System Files (i.e. cache, logs, etc.) #
/administrator/cache
/administrator/logs
/cache
/logs
/installation/cache
/tmp
/configuration.php
/.htaccess
/web.config
/.php_cs.cache

# Test Related Files #
/phpunit.xml
/tests/system/webdriver/tests/logs/
/tests/system/servers/configdef.php
codecept.phar
tests/codeception/_output/*
tests/codeception/vendor/*
tests/codeception/testingsite*
tests/codeception/tests/acceptance.suite.yml
tests/codeception/tests/acceptance/*Tester.php
tests/codeception/tests/functional/*Tester.php
tests/codeception/tests/unit/*Tester.php

# Node modules #
node_modules/

# phpDocumentor Logs #
phpdoc-*
Expand Down Expand Up @@ -64,6 +60,8 @@ Desktop.ini
/libraries/vendor/ircmaxell/password-compat/phpunit.xml.dist
/libraries/vendor/ircmaxell/password-compat/README.md
/libraries/vendor/ircmaxell/password-compat/version-test.php
/libraries/vendor/joomla/*/.gitignore
/libraries/vendor/joomla/*/.gitmodules
/libraries/vendor/joomla/*/docs
/libraries/vendor/joomla/*/Tests
/libraries/vendor/joomla/*/vendor
Expand All @@ -90,6 +88,9 @@ Desktop.ini
/libraries/vendor/paragonie/random_compat/.gitignore
/libraries/vendor/paragonie/random_compat/.scrutinizer.yml
/libraries/vendor/paragonie/random_compat/.travis.yml
/libraries/vendor/paragonie/random_compat/dist
/libraries/vendor/paragonie/random_compat/other
/libraries/vendor/paragonie/random_compat/CHANGELOG.md
/libraries/vendor/paragonie/random_compat/ERRATA.md
/libraries/vendor/paragonie/random_compat/README.md
/libraries/vendor/paragonie/random_compat/SECURITY.md
Expand All @@ -112,6 +113,8 @@ Desktop.ini
/libraries/vendor/psr/log/.gitignore
/libraries/vendor/psr/log/composer.json
/libraries/vendor/psr/log/README.md
/libraries/vendor/symfony/polyfill-php55/composer.json
/libraries/vendor/symfony/polyfill-php55/README.md
/libraries/vendor/symfony/polyfill-php56/composer.json
/libraries/vendor/symfony/polyfill-php56/README.md
/libraries/vendor/symfony/polyfill-util/composer.json
Expand All @@ -123,3 +126,13 @@ Desktop.ini
/libraries/vendor/symfony/yaml/composer.json
/libraries/vendor/symfony/yaml/phpunit.xml.dist
/libraries/vendor/symfony/yaml/README.md
/libraries/vendor/simplepie/simplepie/demo
/libraries/vendor/simplepie/simplepie/tests
/libraries/vendor/simplepie/simplepie/README.markdown
/libraries/vendor/simplepie/simplepie/phpunit.xml.dist
/libraries/vendor/simplepie/simplepie/.gitignore
/libraries/vendor/simplepie/simplepie/.travis.yml
/libraries/vendor/simplepie/simplepie/compatibility_test
/libraries/vendor/simplepie/simplepie/build
/libraries/vendor/simplepie/simplepie/idn/ReadMe.txt
/libraries/vendor/simplepie/simplepie/composer.json
65 changes: 65 additions & 0 deletions .php_cs
@@ -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);
57 changes: 39 additions & 18 deletions .travis.yml
Expand Up @@ -6,46 +6,67 @@ language: php
env:
global:
- RUN_PHPCS="no"
- RUN_UNIT_TESTS="yes"
- RUN_JAVASCRIPT_TESTS="no"
- INSTALL_MEMCACHE="yes"
- INSTALL_MEMCACHED="yes"
- INSTALL_REDIS="yes"

matrix:
fast_finish: true
include:
- php: 5.6
env: RUN_PHPCS="yes" RUN_UNIT_TESTS="no" INSTALL_MEMCACHE="no" INSTALL_MEMCACHED="no" INSTALL_REDIS="no"
- php: 5.3
env: INSTALL_APC="yes"
- php: 5.4
env: INSTALL_APC="yes"
- php: 5.5
env: INSTALL_APCU="yes"
- php: 5.6
env: RUN_PHPCS="yes" INSTALL_APCU="yes"
env: INSTALL_APCU="yes"
- php: 7.0
env: INSTALL_APCU_BC_BETA="no" INSTALL_MEMCACHED="no" INSTALL_REDIS="no" # Disabled apcu_bc install until https://github.com/travis-ci/travis-ci/issues/5207 is resolved
env: INSTALL_APCU="yes" INSTALL_APCU_BC_BETA="no" INSTALL_MEMCACHE="no" INSTALL_MEMCACHED="no" INSTALL_REDIS="no" # Disabled apcu_bc install until https://github.com/travis-ci/travis-ci/issues/5207 is resolved
- node_js: 6.1
sudo: true
env: RUN_JAVASCRIPT_TESTS="yes" RUN_UNIT_TESTS="no"
- php: 7.1
env: INSTALL_APCU="yes" INSTALL_APCU_BC_BETA="no" INSTALL_MEMCACHE="no" INSTALL_MEMCACHED="no" INSTALL_REDIS="no" # Disabled apcu_bc install until https://github.com/travis-ci/travis-ci/issues/5207 is resolved
- php: hhvm
sudo: true
dist: trusty
group: edge # until the next update
addons:
apt:
packages:
- mysql-server-5.6
- mysql-client-core-5.6
- mysql-client-5.6
services:
- mysql
- postgresql
- redis-server
env: INSTALL_APCU_BC_BETA="no" INSTALL_MEMCACHE="no" INSTALL_MEMCACHED="no" # Disabled items that currently do not work in travis-ci hhvm
allow_failures:
- php: 7.1
- php: hhvm
- node_js: 6.1

services:
- memcache
- memcached
- redis-server

before_script:
# JavaScript tests
- if [[ $RUN_JAVASCRIPT_TESTS == "yes" ]]; then export DISPLAY=:99.0; bash build/travis/javascript-tests.sh $PWD; fi
# Make sure all dev dependencies are installed
- composer install
# Set up databases for testing
- mysql -e 'create database joomla_ut;'
- mysql joomla_ut < tests/unit/schema/mysql.sql
- psql -c 'create database joomla_ut;' -U postgres
- psql -d joomla_ut -a -f tests/unit/schema/postgresql.sql
# Set up Apache
# - ./build/travis/php-apache.sh
# Enable additional PHP extensions
- if [ "$INSTALL_MEMCACHED" == "yes" ]; then phpenv config-add build/travis/phpenv/memcached.ini; fi
- if [ "$INSTALL_APC" == "yes" ]; then phpenv config-add build/travis/phpenv/apc-$TRAVIS_PHP_VERSION.ini; fi
- if [ "$INSTALL_APCU" == "yes" ]; then printf "\n" | pecl install apcu-4.0.10; fi
- if [ "$INSTALL_APCU_BC_BETA" == "yes" ]; then printf "\n" | pecl install apcu_bc-beta; fi
- if [ "$INSTALL_REDIS" == "yes" ]; then phpenv config-add build/travis/phpenv/redis.ini; fi
- if [[ ( $RUN_UNIT_TESTS == "yes" ) || ( $RUN_PHPCS == "yes" ) ]]; then bash build/travis/unit-tests.sh $PWD; fi

script:
- libraries/vendor/bin/phpunit --configuration travisci-phpunit.xml
- if [ "$RUN_PHPCS" == "yes" ]; then libraries/vendor/bin/phpcs --report=full --extensions=php -p --standard=build/phpcs/Joomla .; fi
- if [[ $RUN_PHPCS == "yes" ]]; then libraries/vendor/bin/phpcs --report=full --extensions=php -p --standard=build/phpcs/Joomla .; fi
- if [[ $RUN_UNIT_TESTS == "yes" ]]; then libraries/vendor/bin/phpunit --configuration travisci-phpunit.xml; fi
- if [[ $RUN_JAVASCRIPT_TESTS == "yes" ]]; then tests/javascript/node_modules/karma/bin/karma start karma.conf.js --single-run ; fi

branches:
except:
Expand Down
42 changes: 21 additions & 21 deletions README.md
Expand Up @@ -10,49 +10,50 @@ What is this?
---------------------
* This is a Joomla! 3.x installation/upgrade package.
* Joomla's [Official website](https://www.joomla.org).
* Joomla! 3.5 [version history](https://docs.joomla.org/Joomla_3.5_version_history).
* Joomla! 3.6 [version history](https://docs.joomla.org/Joomla_3.6_version_history).
* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/master).

What is Joomla?
---------------------
* Joomla is a **Content Management System** (CMS) which enables you to build websites and powerful online applications.
* It is a simple and powerful web server application which requires a server with PHP and either MySQL, PostgreSQL or SQL Server to run. You can find more [details here](https://www.joomla.org/about-joomla.html).
* Joomla is **free and OpenSource software** distributed under the GNU General Public License version 2 or later.
* [Joomla!](https://www.joomla.org/about-joomla.html) is a **Content Management System** (CMS) which enables you to build websites and powerful online applications.
* It is a simple and powerful web server application which requires a server with PHP and either MySQL, PostgreSQL or SQL Server to run. You can find [full technical requirements here](https://www.joomla.org/about-joomla/technical-requirements.html).
* Joomla! is **free and OpenSource software** distributed under the GNU General Public License version 2 or later.

Is Joomla! for you?
---------------------
* Joomla is [the right solution for most content web projects](https://docs.joomla.org/Joomla_Is_it_for_me%3F).
* View Joomla's core [features here](https://www.joomla.org/core-features.html).
* Joomla! is [the right solution for most content web projects](https://docs.joomla.org/Portal:Learn_More).
* View Joomla's [core features here](https://www.joomla.org/core-features.html).
* Try it out for yourself in our [online demo](https://demo.joomla.org).

How to find a Joomla! translation?
---------------------
* Repository of [accredited language packs](http://community.joomla.org/translations.html).
* You can also add languages directly to your website via your Joomla! administration panel.
* Repository of [accredited language packs](https://community.joomla.org/translations.html).
* You can also [add languages](https://docs.joomla.org/J3.x:Setup_a_Multilingual_Site/Installing_New_Language) directly to your website via your Joomla! administration panel.
* Learn how to [setup a Multilingual Joomla! Site](https://docs.joomla.org/J3.x:Setup_a_Multilingual_Site)

Learn Joomla!
---------------------
* Read ['Getting Started with Joomla!'](https://docs.joomla.org/J3.x:Getting_Started_with_Joomla!) to learn the basics.
* Before installing, read the ['Beginners' Guide'](https://docs.joomla.org/Beginners).
* Before installing, read the ['Beginners' Guide'](https://docs.joomla.org/Portal:Beginners).

What are the benefits of Joomla?
---------------------
* The functionality of a Joomla website can be extended by installing extensions that you can create (or download) to suit your needs.
* The functionality of a Joomla! website can be extended by installing extensions that you can create (or download) to suit your needs.
* There are many ready-made extensions that you can download and install.
* Check out the [Joomla! Extensions Directory (JED)](http://extensions.joomla.org).
* Check out the [Joomla! Extensions Directory (JED)](https://extensions.joomla.org).

Is it easy to change the layout display?
---------------------
* The layout is controlled by templates that you can edit.
* There are a lot of ready-made professional templates that you can download.
* Template management information is [available here](https://docs.joomla.org/Portal:Administrators#Template_Management).
* Template management information is [available here](https://docs.joomla.org/Portal:Template_Management).

Ready to install Joomla?
---------------------
* Check the [minimum requirements](https://www.joomla.org/technical-requirements.html).
* How do you [install Joomla](https://docs.joomla.org/Installing_Joomla!)?
* Check the [minimum requirements](https://www.joomla.org/about-joomla/technical-requirements.html).
* How do you [install Joomla](https://docs.joomla.org/J3.x:Installing_Joomla)?
* You could start your Joomla! experience by [building your site on a local test server](https://docs.joomla.org/Installing_Joomla_locally).
When ready, it can be moved to an on-line hosting account of your choice.
When ready, it can be moved to an online hosting account of your choice.

Updates are free!
---------------------
Expand All @@ -67,20 +68,19 @@ Where can you get support and help?
* Post questions at [our forums](http://forum.joomla.org);
* [Joomla Resources Directory](http://resources.joomla.org/) (JRD).

Do you already have a Joomla site that isn't built with Joomla 3.x?
Do you already have a Joomla! site that isn't built with Joomla! 3.x?
---------------------
* What's [new in Joomla! 3.x](https://www.joomla.org/3)?
* What are the [main differences between 2.5 and 3.x](https://docs.joomla.org/What_are_the_major_differences_between_Joomla!_2.5_and_3.x%3F)?
* How to [migrate from 2.5.x to 3.x](https://docs.joomla.org/Joomla_2.5_to_3.x_Step_by_Step_Migration).
* How to [migrate from 1.5.x to 3.x](https://docs.joomla.org/Joomla_1.5_to_3.x_Step_by_Step_Migration).
* How to [convert an existing website to Joomla](https://docs.joomla.org/How_to_Convert_an_existing_Web_site_to_a_Joomla!_Web_site).

Do you want to improve Joomla?
--------------------
* How do you [request a feature](https://docs.joomla.org/How_do_you_request_a_feature%3F)?
* How do you [report a bug](https://docs.joomla.org/Filing_bugs_and_issues)?
* Get Involved: Joomla! is community developed software. [Join the community](http://volunteers.joomla.org/).
* Documentation for [Developers](https://docs.joomla.org/Developers).
* Where to [request a feature](https://issues.joomla.org/)?
* How do you [report a bug](https://docs.joomla.org/Filing_bugs_and_issues) on the [Issue Tracker](https://issues.joomla.org/)?
* Get Involved: Joomla! is community developed software. [Join the community](https://volunteers.joomla.org/).
* Documentation for [Developers](https://docs.joomla.org/Portal:Developers).
* Documentation for [Web designers](https://docs.joomla.org/Web_designers).

Copyright
Expand Down

0 comments on commit 59de436

Please sign in to comment.