Skip to content

Commit

Permalink
Merge branch 'staging' into redo-7259-modal-for-quicker-edit
Browse files Browse the repository at this point in the history
* staging: (274 commits)
  Add JCryptCipherSodium to support libsodium (joomla#16754)
  Performance 2 (libraries/legacy) (joomla#12220)
  Performance 6 (templates) (joomla#12233)
  Fixed typehint (joomla#16425)
  Fix for: Repeatable field is no longer rendered with Chosen layout (joomla#16471)
  Fix the path for the ajax-loader.gif (joomla#16701)
  Menu items list parent filter (joomla#17060)
  Text Filters layout (joomla#17113)
  mod_login showon option (joomla#17153)
  com_banners incorret tooltip (joomla#17157)
  fix joomla.content.options_default (joomla#17123)
  remove the never working limitstart call (joomla#17184)
  Update phpDocumentor build
  set 3.8.0 Dev State
  Prepare 3.7.4 Stable Release
  fixed a logic change in joomla#12294, thanks @Hoffi1
  Update sv-SE.ini
  Update pt-BR.ini
  Update lv-LV.ini
  Update fa-IR.ini
  ...
  • Loading branch information
roland-d committed Jul 26, 2017
2 parents 34dc757 + a2a0d53 commit 5adcaee
Show file tree
Hide file tree
Showing 778 changed files with 37,483 additions and 11,792 deletions.
9 changes: 9 additions & 0 deletions .gitignore
Expand Up @@ -21,6 +21,9 @@
# Test Related Files #
/phpunit.xml

# Stubs file holding mapped classes
/stubs.php

# Node modules #
node_modules/

Expand Down Expand Up @@ -113,6 +116,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 Down
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
14 changes: 11 additions & 3 deletions .travis.yml
Expand Up @@ -14,17 +14,25 @@ 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: nightly
env: INSTALL_APCU="yes" INSTALL_MEMCACHE="no"
allow_failures:
- 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
'''
}
}
}

}
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -15,7 +15,7 @@ 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).
* 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/master).

What is Joomla?
Expand Down
2 changes: 1 addition & 1 deletion README.txt
@@ -1,7 +1,7 @@
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
* 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/master

2- What is Joomla?
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/models/sysinfo.php
Expand Up @@ -193,7 +193,7 @@ protected function cleanPrivateData($dataArray, $dataType = 'other')
}

/**
* Offuscate section values
* Obfuscate section values
*
* @param mixed $sectionValues Section data
*
Expand Down
Expand Up @@ -60,7 +60,7 @@ function admin_postinstall_eaccelerator_action()
// Attempt to make the file writeable if using FTP.
if (!$ftp['enabled'] && JPath::isOwner($file) && !JPath::setPermissions($file, '0644'))
{
JError::raiseNotice('SOME_ERROR_CODE', JText::_('COM_CONFIG_ERROR_CONFIGURATION_PHP_NOTWRITABLE'));
JError::raiseNotice(500, JText::_('COM_CONFIG_ERROR_CONFIGURATION_PHP_NOTWRITABLE'));
}

// Attempt to write the configuration file as a PHP class named JConfig.
Expand All @@ -76,6 +76,6 @@ function admin_postinstall_eaccelerator_action()
// Attempt to make the file unwriteable if using FTP.
if (!$ftp['enabled'] && JPath::isOwner($file) && !JPath::setPermissions($file, '0444'))
{
JError::raiseNotice('SOME_ERROR_CODE', JText::_('COM_CONFIG_ERROR_CONFIGURATION_PHP_NOTUNWRITABLE'));
JError::raiseNotice(500, JText::_('COM_CONFIG_ERROR_CONFIGURATION_PHP_NOTUNWRITABLE'));
}
}

0 comments on commit 5adcaee

Please sign in to comment.