Merge branch '4.0-dev' into ops-plugins

.appveyor.yml

@@ -2,6 +2,11 @@ build: false
 platform:
   - x64
 clone_folder: C:\projects\joomla-cms
+
+branches:
+  except:
+    - /l10n_*/
+
 ## Build matrix for lowest and highest possible targets
 environment:
   matrix:

.drone.yml

@@ -10,15 +10,34 @@ 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
+      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
+
+  rebuild-cache:
+      image: drillster/drone-volume-cache
+      rebuild: true
+      mount:
+        - ./node_modules
+        - ./libraries/vendor
+      volumes:
+        - /tmp/cache:/cache
 
   php70-unit:
     group: unit
@@ -39,22 +58,46 @@ 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
+      - npm run test
 
   system-tests:
-      image: joomlaprojects/docker-systemtests:latest
+      image: joomlaprojects/docker-systemtests:develop
       commands:
         - bash libraries/vendor/joomla/test-system/src/drone-run.sh "$(pwd)"
 
+  analysis3x:
+      image: rips/rips-cli
+      secrets:  [rips_username, rips_password]
+      when:
+        branch: staging
+      commands:
+        - export RIPS_BASE_URI='https://api.rips.joomla.org'
+        - export RIPS_USERNAME=$RIPS_USERNAME
+        - export RIPS_PASSWORD=$RIPS_PASSWORD
+        - if [ $DRONE_REPO_OWNER != 'joomla' ]; then echo "The analysis check only run on the main repos"; exit 0; fi
+        - rips-cli rips:scan:start -a 1 -t 1 -p $(pwd) -t 1 -T $DRONE_REPO_OWNER-$DRONE_BRANCH ||  { echo "Please contact the security team at security@joomla.org"; exit 1; }
+
+  analysis4x:
+    image: rips/rips-cli
+    secrets:  [rips_username, rips_password]
+    when:
+      branch: 4.0-dev
+    commands:
+      - export RIPS_BASE_URI='https://api.rips.joomla.org'
+      - export RIPS_USERNAME=$RIPS_USERNAME
+      - export RIPS_PASSWORD=$RIPS_PASSWORD
+      - if [ $DRONE_REPO_OWNER != 'joomla' ]; then echo "The analysis check only run on the main repos"; exit 0; fi
+      - rips-cli rips:scan:start -a 3 -t 1 -p $(pwd) -t 1 -T $DRONE_REPO_OWNER-$DRONE_BRANCH ||  { echo "Please contact the security team at security@joomla.org"; exit 1; }
+
+branches:
+  exclude: [ l10n_* ]
+
 services:
   mysql:
     image: mysql:5.7

.eslintignore

@@ -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

.gitignore

@@ -18,20 +18,39 @@
 /configuration.php
 /.htaccess
 /web.config
+/.php_cs
 /.php_cs.cache
+/media
+
+# Template CSS files generated by NPM.
+/administrator/templates/atum/css
+/installation/template/css/template-rtl.min.css
+/installation/template/css/template-rtl.css
+/installation/template/css/template.min.css
+/installation/template/css/template.css
+/templates/cassiopeia/css
 
 # 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
@@ -75,178 +94,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