Skip to content

Commit

Permalink
Merge pull request #5 from joomla/staging
Browse files Browse the repository at this point in the history
Getting Update
  • Loading branch information
n3t committed Aug 21, 2017
2 parents 2a461ba + c68cc23 commit aac424f
Show file tree
Hide file tree
Showing 2,799 changed files with 156,183 additions and 114,305 deletions.
5 changes: 3 additions & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ install:
$VC = "vc14"
$PHPBuild = "x64"
}
- cinst -y sqlite
- 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://files.nette.org/misc/php-sqlsrv.zip
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
Expand Down Expand Up @@ -91,6 +91,7 @@ install:
- 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
Expand Down
3 changes: 1 addition & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,5 @@ There are other branches available which serve specific purposes.
| Branch | Purpose |
| ------ | ------- |
| staging | Current codebase. Branch for the next minor Joomla version. New backward compatible features go into this branch. |
| 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. |
| 3.8-dev | Branch for the next minor Joomla version. The 3.8.0 release will only include compatibility features for 4.0. Commits to staging will be applied to this branch as well. |
| 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. |
| 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. |
8 changes: 8 additions & 0 deletions .github/SUPPORT.md
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).
46 changes: 46 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
/administrator/logs
/cache
/installation/cache
/installation/sessions
/libraries/autoload_psr4.php
/tmp
/configuration.php
/.htaccess
Expand All @@ -21,6 +23,9 @@
# Test Related Files #
/phpunit.xml

# Stubs file holding mapped classes
/stubs.php

# Node modules #
node_modules/

Expand All @@ -36,6 +41,16 @@ phpdoc-*
# Install from Web plugin #
/plugins/installer/webinstaller

# Languages #
administrator/language/*
!administrator/language/en-GB
administrator/manifests/packages/*
!administrator/manifests/packages/pkg_en-GB.xml
!administrator/language/overrides/index.html
language/*
!language/en-GB
!language/overrides/index.html

# OSX #
._*
.Spotlight-V100
Expand All @@ -61,12 +76,14 @@ 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/*/.gitattributes
/libraries/vendor/joomla/*/.github
/libraries/vendor/joomla/*/.gitignore
/libraries/vendor/joomla/*/.gitmodules
/libraries/vendor/joomla/*/docs
/libraries/vendor/joomla/*/Tests
/libraries/vendor/joomla/*/vendor
/libraries/vendor/joomla/*/.scrutinizer.yml
/libraries/vendor/joomla/*/.travis.yml
/libraries/vendor/joomla/*/CONTRIBUTING.md
/libraries/vendor/joomla/*/composer.json
Expand Down Expand Up @@ -95,10 +112,20 @@ Desktop.ini
/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/RATIONALE.md
/libraries/vendor/paragonie/random_compat/README.md
/libraries/vendor/paragonie/random_compat/SECURITY.md
/libraries/vendor/paragonie/random_compat/build-phar.sh
/libraries/vendor/paragonie/random_compat/composer.json
/libraries/vendor/paragonie/random_compat/psalm-autoload.php
/libraries/vendor/paragonie/random_compat/psalm.xml
/libraries/vendor/paragonie/random_compat/tests
/libraries/vendor/paragonie/sodium_compat/.gitignore
/libraries/vendor/paragonie/sodium_compat/composer.json
/libraries/vendor/paragonie/sodium_compat/composer.lock
/libraries/vendor/paragonie/sodium_compat/phpunit.xml.dist
/libraries/vendor/paragonie/sodium_compat/README.md
/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/README.md
/libraries/vendor/phpmailer/phpmailer/docs
/libraries/vendor/phpmailer/phpmailer/examples
/libraries/vendor/phpmailer/phpmailer/language
Expand All @@ -108,8 +135,11 @@ Desktop.ini
/libraries/vendor/phpmailer/phpmailer/.travis.yml
/libraries/vendor/phpmailer/phpmailer/changelog.md
/libraries/vendor/phpmailer/phpmailer/composer.json
/libraries/vendor/phpmailer/phpmailer/ISSUE_TEMPLATE.md
/libraries/vendor/phpmailer/phpmailer/phpdoc.dist.xml
/libraries/vendor/phpmailer/phpmailer/README.md
/libraries/vendor/phpmailer/phpmailer/travis.phpunit.xml.dist
/libraries/vendor/phpmailer/phpmailer/UPGRADING.md
/libraries/vendor/phpmailer/phpmailer/extras/README.md
/libraries/vendor/phpmailer/phpmailer/get_oauth_token.php
/libraries/vendor/psr/log/Psr/Log/Test
Expand Down Expand Up @@ -139,3 +169,19 @@ Desktop.ini
/libraries/vendor/simplepie/simplepie/build
/libraries/vendor/simplepie/simplepie/idn/ReadMe.txt
/libraries/vendor/simplepie/simplepie/composer.json

# System Test related files
tests/codeception/acceptance.suite.yml
tests/codeception/_support/_generated/*TesterActions.php
tests/codeception/joomla-cms*
tests/codeception/_output*
selenium-server-standalone.jar
selenium.log
tests/codeception/cache
tests/codeception/_output
tests/codeception/vendor
composer.phar

# Build related
RoboFile.ini

13 changes: 13 additions & 0 deletions .hound.yml
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
36 changes: 15 additions & 21 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,35 +13,29 @@ env:
matrix:
fast_finish: true
include:
- php: 7.0
env: INSTALL_APCU="yes" INSTALL_MEMCACHE="no"
- php: 7.1
env: INSTALL_APCU="yes" INSTALL_MEMCACHE="no"
# Requires older Precise image
- php: 5.3
env: INSTALL_APC="yes"
sudo: true
dist: precise
# The new Trusty image has issues with running APC, do not enable it here
- php: 5.4
env: INSTALL_APC="yes"
env: INSTALL_APC="no"
- php: 5.5
env: INSTALL_APCU="yes"
- php: 5.6
env: INSTALL_APCU="yes"
- php: 7.0
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: 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
- php: 7.2
env: INSTALL_APCU="yes" INSTALL_MEMCACHE="no"
- php: nightly
env: INSTALL_APCU="yes" INSTALL_MEMCACHE="no"
allow_failures:
- php: hhvm
- php: 7.2
- php: nightly

services:
- memcache
Expand Down
75 changes: 75 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
#!groovy

pipeline {
agent any

stages {

stage('codestyles') {
agent {
docker 'joomlaprojects/docker-phpcs'
}
steps {
sh '/usr/local/vendor/bin/phpcs --report=full --extensions=php -p --standard=build/phpcs/Joomla .'
}
}

stage("Testing PHP") {
steps {
// You can only use the parallel step if it's the *only* step in the stage.
parallel(
PHP53: {
sh 'export PHPVERSION=php53;/usr/local/bin/docker-compose --project-name php53-$BRANCH_NAME-$BUILD_NUMBER -f build/jenkins/docker-compose.yml run --rm test bash build/jenkins/unit-tests.sh'
},
PHP54: {
sh 'export PHPVERSION=php54;/usr/local/bin/docker-compose --project-name php54-$BRANCH_NAME-$BUILD_NUMBER -f build/jenkins/docker-compose.yml run --rm test bash build/jenkins/unit-tests.sh'
},
PHP55: {
sh 'export PHPVERSION=php55;/usr/local/bin/docker-compose --project-name php55-$BRANCH_NAME-$BUILD_NUMBER -f build/jenkins/docker-compose.yml run --rm test bash build/jenkins/unit-tests.sh'
},
PHP56: {
sh 'export PHPVERSION=php56;/usr/local/bin/docker-compose --project-name php56-$BRANCH_NAME-$BUILD_NUMBER -f build/jenkins/docker-compose.yml run --rm test bash build/jenkins/unit-tests.sh'
},
PHP70: {
sh 'export PHPVERSION=php70;/usr/local/bin/docker-compose --project-name php70-$BRANCH_NAME-$BUILD_NUMBER -f build/jenkins/docker-compose.yml run --rm test bash build/jenkins/unit-tests.sh'
},
PHP71: {
sh 'export PHPVERSION=php71;/usr/local/bin/docker-compose --project-name php71-$BRANCH_NAME-$BUILD_NUMBER -f build/jenkins/docker-compose.yml run --rm test bash build/jenkins/unit-tests.sh'
}
)
}
post {
always {
// Spin down containers no matter what happens
sh 'export PHPVERSION=php53;/usr/local/bin/docker-compose --project-name php53-$BRANCH_NAME-$BUILD_NUMBER -f build/jenkins/docker-compose.yml down'
sh 'export PHPVERSION=php54;/usr/local/bin/docker-compose --project-name php54-$BRANCH_NAME-$BUILD_NUMBER -f build/jenkins/docker-compose.yml down'
sh 'export PHPVERSION=php55;/usr/local/bin/docker-compose --project-name php55-$BRANCH_NAME-$BUILD_NUMBER -f build/jenkins/docker-compose.yml down'
sh 'export PHPVERSION=php56;/usr/local/bin/docker-compose --project-name php56-$BRANCH_NAME-$BUILD_NUMBER -f build/jenkins/docker-compose.yml down'
sh 'export PHPVERSION=php70;/usr/local/bin/docker-compose --project-name php70-$BRANCH_NAME-$BUILD_NUMBER -f build/jenkins/docker-compose.yml down'
sh 'export PHPVERSION=php71;/usr/local/bin/docker-compose --project-name php71-$BRANCH_NAME-$BUILD_NUMBER -f build/jenkins/docker-compose.yml down'
}
}
}

stage('Testing-Javascript') {
agent {
docker {
image 'joomlaprojects/docker-systemtests'
args '--user 0'
}
}
steps {
sh '''
ln -s /usr/bin/nodejs /usr/bin/node && \
export DISPLAY=:0 && \
(Xvfb -screen 0 1024x768x24 -ac +extension GLX +render -noreset &) && \
sleep 3 && \
(fluxbox &) && \
cd tests/javascript && npm install --no-optional && cd ../.. && \
tests/javascript/node_modules/karma/bin/karma start karma.conf.js --single-run
'''
}
}
}

}
48 changes: 24 additions & 24 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ What is this?
---------------------
* This is a Joomla! 3.x installation/upgrade package.
* Joomla's [Official website](https://www.joomla.org).
* Joomla! 3.7 [version history](https://docs.joomla.org/Joomla_3.7_version_history).
* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/master).
* Joomla! 3.8 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_3.8_version_history).
* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/staging).

What is Joomla?
---------------------
Expand All @@ -26,20 +26,20 @@ What is Joomla?

Is Joomla! for you?
---------------------
* Joomla! is [the right solution for most content web projects](https://docs.joomla.org/Portal:Learn_More).
* Joomla! is [the right solution for most content web projects](https://docs.joomla.org/Special:MyLanguage/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](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)
* You can also [add languages](https://docs.joomla.org/Special:MyLanguage/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/Special:MyLanguage/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/Portal:Beginners).
* Read ['Getting Started with Joomla!'](https://docs.joomla.org/Special:MyLanguage/J3.x:Getting_Started_with_Joomla!) to learn the basics.
* Before installing, read the ['Beginners' Guide'](https://docs.joomla.org/Special:MyLanguage/Portal:Beginners).

What are the benefits of Joomla?
---------------------
Expand All @@ -51,13 +51,13 @@ 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:Template_Management).
* Template management information is [available here](https://docs.joomla.org/Special:MyLanguage/Portal:Template_Management).

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

Updates are free!
Expand All @@ -66,31 +66,31 @@ Updates are free!

Where can you get support and help?
---------------------
* [The Joomla! Documentation](https://docs.joomla.org/Main_Page);
* [Frequently Asked Questions](https://docs.joomla.org/Category:FAQ) (FAQ);
* Find the [information you need](https://docs.joomla.org/Start_here);
* [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).
* [Joomla Resources Directory](https://resources.joomla.org) (JRD).

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).
* What are the [main differences between 2.5 and 3.x](https://docs.joomla.org/Special:MyLanguage/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/Special:MyLanguage/Joomla_2.5_to_3.x_Step_by_Step_Migration).
* How to [migrate from 1.5.x to 3.x](https://docs.joomla.org/Special:MyLanguage/Joomla_1.5_to_3.x_Step_by_Step_Migration).

Do you want to improve Joomla?
--------------------
* 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).
* Where to [request a feature](https://issues.joomla.org)?
* How do you [report a bug](https://docs.joomla.org/Special:MyLanguage/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/Special:MyLanguage/Portal:Developers).
* Documentation for [Web designers](https://docs.joomla.org/Special:MyLanguage/Web_designers).

Copyright
---------------------
* Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
* [Special Thanks](https://docs.joomla.org/Joomla!_Credits_and_Thanks)
* [Special Thanks](https://docs.joomla.org/Special:MyLanguage/Joomla!_Credits_and_Thanks)
* Distributed under the GNU General Public License version 2 or later
* See [License details](https://docs.joomla.org/Joomla_Licenses)
* See [License details](https://docs.joomla.org/Special:MyLanguage/Joomla_Licenses)

0 comments on commit aac424f

Please sign in to comment.