Skip to content

Commit

Permalink
Merge branch '4.0-dev' into patch-3
Browse files Browse the repository at this point in the history
  • Loading branch information
Ryan Demmer committed Jul 31, 2018
2 parents 668d154 + a687433 commit 70cd90a
Show file tree
Hide file tree
Showing 2,249 changed files with 18,771 additions and 393,858 deletions.
32 changes: 25 additions & 7 deletions .drone.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,26 @@ pipeline:
- /root/.composer/vendor/bin/phpcs --report=full --extensions=php -p --encoding=utf-8 --standard=build/phpcs/Joomla .
- echo $(date)

initdb:
image: joomlaprojects/docker-php70:develop
restore-cache:
image: drillster/drone-volume-cache
restore: true
mount:
- ./node_modules
- ./libraries/vendor
- ./media/vendor
volumes:
- /tmp/cache:/cache

prepare:
image: joomlaprojects/docker-tools:develop
commands:
- composer install --no-progress --no-suggest
# needed for unit testing
- composer update joomla/test-unit --no-progress --no-suggest
# needed for system testing
- composer update joomla/test-system --no-progress --no-suggest
- composer update joomla-projects/selenium-server-standalone --no-progress --no-suggest
- npm install --unsafe-perm

php70-unit:
group: unit
Expand All @@ -39,22 +50,29 @@ pipeline:
- ./libraries/vendor/bin/phpunit --configuration ./libraries/vendor/joomla/test-unit/phpunit.xml.dist

javascript:
image: joomlaprojects/docker-systemtests:latest
image: joomlaprojects/docker-systemtests:develop
commands:
- 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
- mv -f drone-package.json package.json
- fluxbox > /dev/null 2>&1 &
- npm install
- node_modules/karma/bin/karma start node_modules/joomla-javascript-tests/src/karma.conf.js --single-run

system-tests:
image: joomlaprojects/docker-systemtests:latest
image: joomlaprojects/docker-systemtests:develop
commands:
- bash libraries/vendor/joomla/test-system/src/drone-run.sh "$(pwd)"

rebuild-cache:
image: drillster/drone-volume-cache
rebuild: true
mount:
- ./node_modules
- ./libraries/vendor
- ./media/vendor
volumes:
- /tmp/cache:/cache

services:
mysql:
image: mysql:5.7
Expand Down
7 changes: 2 additions & 5 deletions .eslintignore
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
# A list of files to ignore from linting
# TODO: Fix the webcomponents codestyle then also allow linting on them
*.js
!*.es6.js
build/**/**/*.js ## Exclude webcomponents till we fix the CS!
*.vue
build/incompatible_page/*.js
media/system/webcomponents/js/*.js ## The linted files are in build/webcomponents!
media/com_media/js/edit-images.js ## TODO: Fix this file
media/mod_menu/js/admin-menu.js ## TODO: Fix this file
186 changes: 12 additions & 174 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,25 @@

# Test Related Files #
/phpunit.xml
selenium.log
composer.phar
/test-install


# Vendor directory handeling
/libraries/vendor
!libraries/vendor/.gitkeep

/media/vendor
!media/vendor/.gitkeep

# Stubs file holding mapped classes
/stubs.php

# Grunt #
# JS/CSS Build #
node_modules/
/build/assets_tmp
/scss-lint-report.xml
/dev/assets/packages.json
yarn.lock

# Removed in Joomla 4 #
administrator/templates/isis
Expand Down Expand Up @@ -75,178 +84,7 @@ Desktop.ini
# Only apply this rule to the main repository's gitignore files
!/.gitignore
!/build/.gitignore
!/tests/unit/suites/libraries/joomla/archive/.gitignore
!/tests/unit/tmp/.gitignore

# Extra files installed by Composer not needed in the CMS environment
# This should only ignore files like unit testing or READMEs, production
# code must remain to ensure all libraries properly function
/libraries/vendor/fig/link-util/test
/libraries/vendor/fig/link-util/composer.json
/libraries/vendor/fig/link-util/phpcs.xml
/libraries/vendor/fig/link-util/README.md
/libraries/vendor/ircmaxell/password-compat/test
/libraries/vendor/ircmaxell/password-compat/.travis.yml
/libraries/vendor/ircmaxell/password-compat/composer.json
/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/composer/ca-bundle/composer.json
/libraries/vendor/composer/ca-bundle/README.md
/libraries/vendor/defuse/php-encryption/dist
/libraries/vendor/defuse/php-encryption/docs
/libraries/vendor/defuse/php-encryption/test
/libraries/vendor/defuse/php-encryption/.gitignore
/libraries/vendor/defuse/php-encryption/.php_cs
/libraries/vendor/defuse/php-encryption/composer.json
/libraries/vendor/defuse/php-encryption/README.md
/libraries/vendor/defuse/php-encryption/psalm.xml
/libraries/vendor/defuse/php-encryption/test.sh
/libraries/vendor/doctrine/inflector/composer.json
/libraries/vendor/doctrine/inflector/README.md
/libraries/vendor/google/recaptcha/examples
/libraries/vendor/google/recaptcha/tests
/libraries/vendor/google/recaptcha/.gitignore
/libraries/vendor/google/recaptcha/.travis.yml
/libraries/vendor/google/recaptcha/composer.json
/libraries/vendor/google/recaptcha/CONTRIBUTING.md
/libraries/vendor/google/recaptcha/phpunit.xml.dist
/libraries/vendor/google/recaptcha/README.md
/libraries/vendor/joomla/*/.appveyor.yml
/libraries/vendor/joomla/*/.gitattributes
/libraries/vendor/joomla/*/.github
/libraries/vendor/joomla/*/.gitignore
/libraries/vendor/joomla/*/.gitmodules
/libraries/vendor/joomla/*/.travis/
/libraries/vendor/joomla/*/docs
/libraries/vendor/joomla/*/Tests
/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
/libraries/vendor/joomla/*/phpunit.xml.dist
/libraries/vendor/joomla/*/phpunit.travis.xml
/libraries/vendor/joomla/*/phpunit.appveyor.xml
/libraries/vendor/joomla/*/README.md
/libraries/vendor/joomla/*/ruleset.xml
/libraries/vendor/leafo/lessphp/docs
/libraries/vendor/leafo/lessphp/tests
/libraries/vendor/leafo/lessphp/.gitignore
/libraries/vendor/leafo/lessphp/.travis.yml
/libraries/vendor/leafo/lessphp/composer.json
/libraries/vendor/leafo/lessphp/Makefile
/libraries/vendor/leafo/lessphp/package.sh
/libraries/vendor/leafo/lessphp/README.md
/libraries/vendor/mso/idna-convert/.gitattributes
/libraries/vendor/mso/idna-convert/.gitignore
/libraries/vendor/mso/idna-convert/composer.json
/libraries/vendor/mso/idna-convert/README.md
/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/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/dist
/libraries/vendor/paragonie/sodium_compat/.gitignore
/libraries/vendor/paragonie/sodium_compat/appveyor.yml
/libraries/vendor/paragonie/sodium_compat/build-phar.sh
/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
/libraries/vendor/phpmailer/phpmailer/test
/libraries/vendor/phpmailer/phpmailer/.github
/libraries/vendor/phpmailer/phpmailer/.gitignore
/libraries/vendor/phpmailer/phpmailer/.phan
/libraries/vendor/phpmailer/phpmailer/.php_cs
/libraries/vendor/phpmailer/phpmailer/.scrutinizer.yml
/libraries/vendor/phpmailer/phpmailer/.travis.yml
/libraries/vendor/phpmailer/phpmailer/changelog.md
/libraries/vendor/phpmailer/phpmailer/composer.json
/libraries/vendor/phpmailer/phpmailer/composer.lock
/libraries/vendor/phpmailer/phpmailer/get_oauth_token.php
/libraries/vendor/phpmailer/phpmailer/ISSUE_TEMPLATE.md
/libraries/vendor/phpmailer/phpmailer/phpdoc.dist.xml
/libraries/vendor/phpmailer/phpmailer/README.md
/libraries/vendor/phpmailer/phpmailer/SECURITY.md
/libraries/vendor/phpmailer/phpmailer/travis.phpunit.xml.dist
/libraries/vendor/phpmailer/phpmailer/UPGRADING.md
/libraries/vendor/psr/container/.gitignore
/libraries/vendor/psr/container/composer.json
/libraries/vendor/psr/container/README.md
/libraries/vendor/psr/http-message/CHANGELOG.md
/libraries/vendor/psr/http-message/composer.json
/libraries/vendor/psr/http-message/README.md
/libraries/vendor/psr/link/composer.json
/libraries/vendor/psr/link/README.md
/libraries/vendor/psr/log/Psr/Log/Test
/libraries/vendor/psr/log/.gitignore
/libraries/vendor/psr/log/composer.json
/libraries/vendor/psr/log/README.md
/libraries/vendor/symfony/*/Tests
/libraries/vendor/symfony/*/.gitignore
/libraries/vendor/symfony/*/CHANGELOG.md
/libraries/vendor/symfony/*/composer.json
/libraries/vendor/symfony/*/phpunit.xml.dist
/libraries/vendor/symfony/*/README.md
/libraries/vendor/symfony/console/Resources/bin/hiddeninput.exe
/libraries/vendor/symfony/debug/Resources/ext
/libraries/vendor/symfony/polyfill-util/TestListener.php
/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
/libraries/vendor/wamania/php-stemmer/.gitignore
/libraries/vendor/wamania/php-stemmer/README.md
/libraries/vendor/wamania/php-stemmer/composer.json
/libraries/vendor/wamania/php-stemmer/phpunit.xml.dist
/libraries/vendor/wamania/php-stemmer/test
/libraries/vendor/zendframework/zend-diactoros/.coveralls.yml
/libraries/vendor/zendframework/zend-diactoros/CHANGELOG.md
/libraries/vendor/zendframework/zend-diactoros/composer.json
/libraries/vendor/zendframework/zend-diactoros/composer.lock
/libraries/vendor/zendframework/zend-diactoros/CONDUCT.md
/libraries/vendor/zendframework/zend-diactoros/CONTRIBUTING.md
/libraries/vendor/zendframework/zend-diactoros/mkdocs.yml
/libraries/vendor/zendframework/zend-diactoros/README.md

# System Test related files
/libraries/vendor/codeception
/libraries/vendor/behat
/libraries/vendor/consolidation
/libraries/vendor/joomla/test-system
/libraries/vendor/league/
/libraries/vendor/phpdocumentor/
/libraries/vendor/phpspec/
/libraries/vendor/phpunit/
/libraries/vendor/sebastian/
/libraries/vendor/squizlabs/

selenium.log
composer.phar
/test-install

# Build related
RoboFile.ini
Expand Down
25 changes: 25 additions & 0 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
GEM
remote: https://rubygems.org/
specs:
ffi (1.9.25)
rake (12.3.1)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
sass (3.5.7)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
scss_lint (0.56.0)
rake (>= 0.9, < 13)
sass (~> 3.5.3)

PLATFORMS
ruby

DEPENDENCIES
scss_lint (~> 0.56.0)

BUNDLED WITH
1.16.2
4 changes: 2 additions & 2 deletions RoboFile.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ public function runTests($opts = ['use-htaccess' => false, 'env' => 'desktop'])
*
* @param array $opts Additional options
*
* @since __DEPLOY_VERSION__
* @since 4.0.0
*
* @return void
*/
Expand All @@ -285,7 +285,7 @@ public function runInstall($opts = ['use-htaccess' => false, 'env' => 'desktop']
*
* @return string Path to codeception
*
* @since __DEPLOY_VERSION__
* @since 4.0.0
*/
protected function prepareRun($opts = ['use-htaccess' => false, 'env' => 'desktop'])
{
Expand Down
1 change: 1 addition & 0 deletions administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-06-03.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ CREATE TABLE IF NOT EXISTS `#__csp` (
`document_uri` varchar(500) NOT NULL DEFAULT '',
`blocked_uri` varchar(500) NOT NULL DEFAULT '',
`directive` varchar(500) NOT NULL DEFAULT '',
`client` varchar(500) NOT NULL DEFAULT '',
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`published` tinyint(1) NOT NULL DEFAULT 0,
Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-06-06.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ CREATE TABLE IF NOT EXISTS `#__finder_logging` (
`query` BLOB NOT NULL,
`hits` INT(11) NOT NULL DEFAULT '1',
`results` INT(11) NOT NULL DEFAULT '0',
UNIQUE INDEX `md5sum` (`md5sum`),
INDEX `searchterm` (`searchterm`)
PRIMARY KEY `md5sum` (`md5sum`),
INDEX `searchterm` (`searchterm`(191))
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
1 change: 1 addition & 0 deletions administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-06-03.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ CREATE TABLE IF NOT EXISTS "#__csp" (
"document_uri" varchar(500) NOT NULL DEFAULT '',
"blocked_uri" varchar(500) NOT NULL DEFAULT '',
"directive" varchar(500) NOT NULL DEFAULT '',
"client" varchar(500) NOT NULL DEFAULT '',
"created" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
"modified" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
"published" smallint DEFAULT 0 NOT NULL,
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-06-06.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ CREATE TABLE IF NOT EXISTS "#__finder_logging" (
"query" bytes NOT NULL,
"hits" integer NOT NULL DEFAULT 1,
"results" integer NOT NULL DEFAULT 0,
CONSTRAINT "#__finder_logging_idx_md5sum" UNIQUE ("md5sum")
PRIMARY KEY ("md5sum")
);
CREATE INDEX "#__finder_logging_idx_md5sum" on "#__finder_logging" ("md5sum");
CREATE INDEX "#__finder_logging_idx_searchterm" on "#__finder_logging" ("searchterm");
8 changes: 4 additions & 4 deletions administrator/components/com_admin/tmpl/sysinfo/default_config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
<table class="table">
<thead>
<tr>
<th style="width:300px">
<th scope="col" style="width:300px">
<?php echo Text::_('COM_ADMIN_SETTING'); ?>
</th>
<th>
<th scope="col">
<?php echo Text::_('COM_ADMIN_VALUE'); ?>
</th>
</tr>
Expand All @@ -33,9 +33,9 @@
<tbody>
<?php foreach ($this->config as $key => $value) : ?>
<tr>
<td>
<th scope="row">
<?php echo $key; ?>
</td>
</th>
<td>
<?php echo htmlspecialchars($value, ENT_QUOTES); ?>
</td>
Expand Down

0 comments on commit 70cd90a

Please sign in to comment.