Skip to content

Commit

Permalink
merged staging
Browse files Browse the repository at this point in the history
  • Loading branch information
julienV committed Nov 5, 2017
2 parents cf8e466 + 0ac5c79 commit d6be7b1
Show file tree
Hide file tree
Showing 2,675 changed files with 168,188 additions and 114,367 deletions.
1 change: 1 addition & 0 deletions .appveyor.yml
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
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
@@ -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).
32 changes: 32 additions & 0 deletions .gitignore
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 Down Expand Up @@ -71,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 @@ -113,6 +120,12 @@ Desktop.ini
/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 @@ -122,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 @@ -153,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
@@ -0,0 +1,13 @@
fail_on_violations: false

scss:
enabled: false

jshint:
enabled: false

eslint:
enabled: false

ruby:
enabled: false
17 changes: 14 additions & 3 deletions .travis.yml
Expand Up @@ -14,17 +14,28 @@ matrix:
fast_finish: true
include:
- 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
env: INSTALL_APCU="yes" INSTALL_MEMCACHE="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
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.2
env: INSTALL_APCU="yes" INSTALL_MEMCACHE="no"
- php: nightly
env: INSTALL_APCU="yes" INSTALL_MEMCACHE="no"
allow_failures:
- php: 7.2
- php: nightly

services:
- memcache
Expand Down
75 changes: 75 additions & 0 deletions Jenkinsfile
@@ -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
'''
}
}
}

}
12 changes: 6 additions & 6 deletions README.md
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/Special:MyLanguage/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 Down Expand Up @@ -71,7 +71,7 @@ Where can you get support and help?
* 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?
---------------------
Expand All @@ -82,9 +82,9 @@ Do you already have a Joomla! site that isn't built with Joomla! 3.x?

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/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/).
* 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).

Expand Down
10 changes: 5 additions & 5 deletions README.txt
@@ -1,8 +1,8 @@
1- What is this?
* This is a Joomla! installation/upgrade package to version 3.x
* Joomla! Official site: https://www.joomla.org
* Joomla! 3.7 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_3.7_version_history
* Detailed changes 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 in the Changelog: https://github.com/joomla/joomla-cms/commits/staging

2- What is Joomla?
* Joomla! is a Content Management System (CMS) which enables you to build Web sites and powerful online applications.
Expand All @@ -13,7 +13,7 @@
3- Is Joomla! for you?
* Joomla! is the right solution for most content web projects: https://docs.joomla.org/Special:MyLanguage/Portal:Learn_More
* See Joomla's core features - https://www.joomla.org/core-features.html
* Try out our online demo: https://demo.joomla.org/
* Try out our online demo: https://demo.joomla.org

4- How to find a Joomla! translation?
* Repository of accredited language packs: https://community.joomla.org/translations.html
Expand Down Expand Up @@ -59,9 +59,9 @@
* How to migrate from 1.5.x to 3.x? Tutorial: https://docs.joomla.org/Special:MyLanguage/Joomla_1.5_to_3.x_Step_by_Step_Migration

12- Do you want to improve Joomla?
* Where to request a feature? https://issues.joomla.org/
* 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
* Get Involved: Joomla! is a community developed software. Join the community at https://volunteers.joomla.org/
* Get Involved: Joomla! is a community developed software. Join the community at 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

Expand Down
6 changes: 6 additions & 0 deletions RoboFile.dist.ini
@@ -0,0 +1,6 @@
; If you want to setup your test website (document root) in a different folder, you can do that here.
; You can also set an absolute path, i.e. /path/to/my/cms/folder
cmsPath = tests/codeception/joomla-cms

; (Linux / Mac only) If you want to set a different owner for the CMS root folder, you can set it here.
localUser =

0 comments on commit d6be7b1

Please sign in to comment.