Merge branch '4.0-dev' into Change_Favicon_Order

.appveyor.yml

@@ -2,11 +2,17 @@ build: false
 platform:
   - x64
 clone_folder: C:\projects\joomla-cms
+
+branches:
+  except:
+    - /l10n_*/
+
 ## Build matrix for lowest and highest possible targets
 environment:
   matrix:
   - php_ver_target: 7.0
   - php_ver_target: 7.1
+  - php_ver_target: 7.2
 
 init:
   - SET PATH=C:\Program Files\OpenSSL;C:\tools\php;%PATH%
@@ -23,45 +29,61 @@ services:
 install:
     - IF EXIST C:\tools\php (SET PHP=0)
     - ps: >-
-        appveyor-retry cinst --params '""/InstallDir:C:\tools\php""' --ignore-checksums -y php --version ((choco search php --exact --all-versions -r | select-string -pattern $env:php_ver_target | sort { [version]($_ -split '\|' | select -last 1) } -Descending | Select-Object -first 1) -replace '[php|]','')
-        $VC = "vc14"
-        $PHPBuild = "x64"
+        If ($env:PHP -eq "1") {
+          appveyor-retry cinst --params '""/InstallDir:C:\tools\php""' --ignore-checksums -y php --version ((choco search php --exact --all-versions -r | select-string -pattern $env:php_ver_target | sort { [version]($_ -split '\|' | select -last 1) } -Descending | Select-Object -first 1) -replace '[php|]','')
+          $VC = "vc14"
+          $PHPBuild = "x64"
+        }
     - appveyor-retry cinst -y sqlite
     - cd C:\tools\php
     # Get the MSSQL DLL's
     - ps: >-
         If ($env:PHP -eq "1") {
-          $DLLVersion = "4.1.6.1"
-          cd c:\tools\php\ext
-          appveyor-retry appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/sqlsrv/$($DLLVersion)/php_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip
-          7z x -y php_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip > $null
-          appveyor-retry appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/pdo_sqlsrv/$($DLLVersion)/php_pdo_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip
-          7z x -y php_pdo_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip > $null
-          Remove-Item c:\tools\php\ext* -include .zip
-          cd c:\tools\php
-        }
+            $DLLVersion = "4.3.0"
+            cd c:\tools\php\ext
+            $source = "http://windows.php.net/downloads/pecl/releases/sqlsrv/$($DLLVersion)/php_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip"
+            $destination = "c:\tools\php\ext\php_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip"
+            Invoke-WebRequest $source -OutFile $destination
+            #appveyor-retry appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/sqlsrv/$($DLLVersion)/php_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip
+            7z x -y php_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip > $null
+            $source = "http://windows.php.net/downloads/pecl/releases/pdo_sqlsrv/$($DLLVersion)/php_pdo_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip"
+            $destination = "c:\tools\php\ext\php_pdo_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip"
+            Invoke-WebRequest $source -OutFile $destination
+            #appveyor-retry appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/pdo_sqlsrv/$($DLLVersion)/php_pdo_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip
+            7z x -y php_pdo_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip > $null
+            Remove-Item c:\tools\php\ext* -include .zip
+            cd c:\tools\php}
     - IF %PHP%==1 copy php.ini-production php.ini /Y
     - IF %PHP%==1 echo date.timezone="UTC" >> php.ini
     - IF %PHP%==1 echo extension_dir=ext >> php.ini
     - IF %PHP%==1 echo extension=php_openssl.dll >> php.ini
     - IF %PHP%==1 echo extension=php_mbstring.dll >> php.ini
     - IF %PHP%==1 echo extension=php_fileinfo.dll >> php.ini
     - IF %PHP%==1 echo extension=php_gd2.dll >> php.ini
-    - IF %PHP%==1 echo extension=php_sqlsrv.dll >> php.ini
-    - IF %PHP%==1 echo extension=php_pdo_sqlsrv.dll >> php.ini
+
+    - ps: >-
+        If ($env:PHP -eq "1") {
+          Add-Content php.ini "`nextension=php_sqlsrv.dll"
+          Add-Content php.ini "`nextension=php_pdo_sqlsrv.dll"
+          Add-Content php.ini "`n"}
+
     - IF %PHP%==1 echo extension=php_pgsql.dll >> php.ini
     - IF %PHP%==1 echo extension=php_pdo_pgsql.dll >> php.ini
     - IF %PHP%==1 echo extension=php_pdo_sqlite.dll >> php.ini
     - IF %PHP%==1 echo extension=php_sqlite3.dll >> php.ini
     - IF %PHP%==1 echo extension=php_pdo_mysql.dll >> php.ini
     - IF %PHP%==1 echo extension=php_mysqli.dll >> php.ini
+    - IF %PHP_VER_TARGET%==5.6 IF %PHP%==1 echo extension=php_mysql.dll >> php.ini
     - IF %PHP%==1 echo extension=php_curl.dll >> php.ini
     # Get the Wincache DLLs
     - ps: >-
         If ($env:PHP -eq "1") {
           $wincache = "2.0.0.8"
           cd c:\tools\php\ext
-          appveyor-retry appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/wincache/$($wincache)/php_wincache-$($wincache)-$($env:php_ver_target)-nts-$($VC)-$($PHPBuild).zip
+          $source = "http://windows.php.net/downloads/pecl/releases/wincache/$($wincache)/php_wincache-$($wincache)-$($env:php_ver_target)-nts-$($VC)-$($PHPBuild).zip"
+          $destination = "c:\tools\php\ext\php_wincache-$($wincache)-$($env:php_ver_target)-nts-$($VC)-$($PHPBuild).zip"
+          Invoke-WebRequest $source -OutFile $destination
+          #appveyor-retry appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/wincache/$($wincache)/php_wincache-$($wincache)-$($env:php_ver_target)-nts-$($VC)-$($PHPBuild).zip
           7z x -y php_wincache-$($wincache)-$($env:php_ver_target)-nts-$($VC)-$($PHPBuild).zip > $null
           Remove-Item C:\tools\php\ext* -include .zip
           cd c:\tools\php}
@@ -74,26 +96,20 @@ install:
     - appveyor-retry appveyor DownloadFile https://getcomposer.org/composer.phar
     - cd C:\projects\joomla-cms
     - appveyor-retry composer install --no-progress --profile
-
 before_test:
 #  Database setup for MySQL via PowerShell tools
   - >
     "C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql" -u root -p"Password12!" -e "CREATE DATABASE IF NOT EXISTS joomla_ut;"
-  - >
-    "C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql" -u root -p"Password12!" joomla_ut < tests\unit\schema\mysql.sql
-
 #  Database setup for PostgreSQL
   - SET PGUSER=postgres
   - SET PGPASSWORD=Password12!
   - PATH=C:\Program Files\PostgreSQL\9.4\bin\;%PATH%
   - createdb joomla_ut
-  - psql -d joomla_ut -a -f tests\unit\schema\postgresql.sql
 
 # Database setup for SQL Server
   - ps: $sqlInstance = "(local)\SQL2014"
   - ps: sqlcmd -b -E -S "$sqlInstance" -Q "CREATE DATABASE joomla_ut"
-  - ps: sqlcmd -S "$sqlInstance" -U "sa" -P "Password12!" -i $env:APPVEYOR_BUILD_FOLDER\tests\unit\schema\sqlsrv.sql
 
 test_script:
   - cd C:\projects\joomla-cms
-  - libraries/vendor/bin/phpunit -c appveyor-phpunit.xml
+  - libraries/vendor/bin/phpunit

.drone.yml

@@ -7,21 +7,125 @@ pipeline:
     image: joomlaprojects/docker-phpcs
     commands:
       - echo $(date)
-      - /root/.composer/vendor/bin/phpcs --report=full --extensions=php -p --standard=build/phpcs/Joomla .
+      - /root/.composer/vendor/bin/phpcs --report=full --encoding=utf-8 --extensions=php -p --standard=build/phpcs/Joomla .
       - echo $(date)
 
-  javascript:
-    image: joomlaprojects/docker-systemtests:latest
+  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 system testing
+      - composer update joomla/test-system --no-progress --no-suggest
+      - composer update joomla/test-api --no-progress --no-suggest
+      - composer update joomla-projects/selenium-server-standalone --no-progress --no-suggest
+      - composer update joomla-projects/joomla-browser --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
+    image: joomlaprojects/docker-php70:develop
+    commands:
+      - ./libraries/vendor/bin/phpunit
+
+  php71-unit:
+    group: unit
+    image: joomlaprojects/docker-php71:develop
+    commands:
+      - ./libraries/vendor/bin/phpunit
+
+  php72-unit:
+    group: unit
+    image: joomlaprojects/docker-php72:develop
+    commands:
+      - ./libraries/vendor/bin/phpunit
+
+  javascript-cs:
+    image: joomlaprojects/docker-systemtests:develop
     commands:
-      - echo $(date)
-      - apt-get install nodejs npm
-      - 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 karma.conf.js --single-run
-      - echo $(date)
+      - npm run lint:js
+
+  javascript-tests:
+    image: joomlaprojects/docker-systemtests:develop
+    commands:
+      - export DISPLAY=:0
+      - Xvfb -screen 0 1024x768x24 -ac +extension GLX +render -noreset > /dev/null 2>&1 &
+      - sleep 3
+      - fluxbox  > /dev/null 2>&1 &
+      - npm run test
+
+  system-tests:
+      image: joomlaprojects/docker-systemtests:develop
+      commands:
+        - bash libraries/vendor/joomla/test-system/src/drone-run.sh "$(pwd)"
+
+  api-tests:
+    image: joomlaprojects/docker-systemtests:latest
+    commands:
+      - bash libraries/vendor/joomla/test-api/drone-run.sh "$(pwd)"
+
+  analysis3x:
+      image: rips/rips-cli:1.2.1
+      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 -R -k -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:1.2.1
+    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 -R -k -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
+    environment:
+      MYSQL_USER: joomla_ut
+      MYSQL_PASSWORD: joomla_ut
+      MYSQL_ROOT_PASSWORD: joomla_ut
+      MYSQL_DATABASE: test_joomla
+
+  memcached:
+    image: memcached:alpine
+
+  redis:
+    image: redis:alpine
 
+  postgres:
+    image: postgres

.editorconfig

@@ -0,0 +1,12 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+indent_style = tab
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

.eslintignore

@@ -0,0 +1,16 @@
+# A list of files to ignore from linting
+*.js
+!*.es6.js
+administrator/components/com_media/node_modules/uri-js/node_modules/punycode/punycode.es6.js
+media
+*.vue
+# TODO: Fix the webcomponents codestyle then also allow linting on them
+joomla-editor-codemirror.w-c.es6.js
+joomla-field-fancy-select.w-c.es6.js
+joomla-field-module-order.w-c.es6.js
+joomla-field-permissions.w-c.es6.js
+joomla-field-send-test-mail.w-c.es6.js
+joomla-field-simple-color.w-c.es6.js
+joomla-field-subform.w-c.es6.js
+joomla-field-switcher.w-c.es6.js
+# End of TODO

.eslintrc

@@ -0,0 +1,27 @@
+{
+  // Extend the airbnb eslint config
+  "extends": "airbnb-base",
+  // ESLint will not look in parent folders for eslint configs
+  "root": true,
+  // An environment defines global variables that are predefined.
+  "env": {
+    "browser": true,
+    "es6": true,
+    "node": true
+  },
+  // Additional global variables your script accesses during execution
+  "globals": {
+    "Joomla": true
+  },
+  // Rule overrides
+  "rules": {
+    // Disable no-params-reassign for properties
+    "no-param-reassign": ["error", { "props": false }],
+    // Allow usage of dev-dependencies in js files in build directory
+    "import/no-extraneous-dependencies": ["error", {"devDependencies": ["build/**/*.js"]}],
+    // Allow strict mode (we are not dealing with modules)
+    "strict": [0],
+    // Disable alert rule till we have a CE in place
+    "no-alert": 0
+  }
+}

.github/CODEOWNERS

@@ -0,0 +1,65 @@
+# Custom Fields
+administrator/components/com_fields/*  @laoneo
+components/com_fields/*  @laoneo
+plugins/content/fields/*  @laoneo
+plugins/editors-xtd/fields/*  @laoneo
+plugins/fields/*  @laoneo
+plugins/systems/fields/*  @laoneo
+
+# Smart Search
+#administrator/components/com_finder/*
+#components/com_finder/*
+#modules/mod_finder/*
+#plugins/content/finder/*
+#plugins/finder/*
+
+# Language strings
+administrator/language/en-GB/*  @brianteeman
+installation/language/en-GB/*  @brianteeman
+language/en-GB/*  @brianteeman
+README.md  @brianteeman
+README.txt  @brianteeman
+
+# CodeMirror
+media/editors/codemirror/*  @okonomiyaki3000
+plugins/editors/codemirror/*  @okonomiyaki3000
+
+# Statistics Server
+plugins/system/stats/*  @mbabker @wilsonge
+
+# Release Tools
+build.xml  @wilsonge
+build/build.php  @rdeutz @wilsonge
+build/bump.php  @rdeutz @wilsonge
+build/deleted_file_check.php  @rdeutz @wilsonge
+
+# Core/Extension Install/Update Tools
+administrator/components/com_joomlaupdate/*  @rdeutz @wilsonge @zero-24
+libraries/src/Installer/*  @rdeutz @wilsonge @zero-24
+libraries/src/Updater/*  @rdeutz @wilsonge @zero-24
+
+# Automated Testing
+build/jenkins/*  @rdeutz
+build/travis/*  @rdeutz
+tests/codeception/*  @rdeutz
+tests/javascript/*  @dgrammatiko @rdeutz
+tests/unit/*  @rdeutz
+.appveyor.yml  @rdeutz
+.drone.yml  @rdeutz
+.hound.yml  @wilsonge
+.travis.yml  @rdeutz
+appveyor-phpunit.xml  @rdeutz
+codeception.yml  @rdeutz
+karma.conf.js  @dgrammatiko @rdeutz
+phpunit.xml.dist  @rdeutz
+RoboFile.dist.ini  @rdeutz
+RoboFile.php  @rdeutz
+travis-phpunit.xml  @rdeutz
+
+# Core JS
+media/*/js/*  @dgrammatiko
+
+# CSP Tooling
+plugins/system/httpheaders/*  @zero-24
+administrator/components/com_csp/* @zero-24
+components/com_csp/* @zero-24

.github/CONTRIBUTING.md

@@ -20,5 +20,6 @@ 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. |
-| 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. |
+| 3.9-dev | Branch for the next minor Joomla version. The 3.9.0 release will include the Privacy Tools Suite features. Commits to staging will be applied to this branch as well. |
+| 3.10-dev | Branch for the next minor Joomla version. The 3.10.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. |