Merge branch '4.0-dev' into 4.0-batch-copy

joomla · Jun 14, 2019 · 284a094 · 284a094
2 parents 625f3fa + 3757fe2
commit 284a094
Show file tree

Hide file tree

Showing 1,251 changed files with 23,213 additions and 17,909 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -9,10 +9,13 @@ branches:
 
 ## Build matrix for lowest and highest possible targets
 environment:
+  DLLVersion: "5.6.1"
+  PHPBuild: "x64"
+  VC: "vc15"
   matrix:
-  - php_ver_target: 7.0
-  - php_ver_target: 7.1
   - php_ver_target: 7.2
+    DLLVersion: "5.3.0"
+  - php_ver_target: 7.3
 
 init:
   - SET PATH=C:\Program Files\OpenSSL;C:\tools\php;%PATH%
@@ -31,26 +34,23 @@ install:
     - ps: >-
         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.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"
+            $source = "https://windows.php.net/downloads/pecl/releases/sqlsrv/$($env:DLLVersion)/php_sqlsrv-$($env:DLLVersion)-$($env:php_ver_target)-nts-$($env:VC)-$($env:PHPBuild).zip"
+            $destination = "c:\tools\php\ext\php_sqlsrv-$($env:DLLVersion)-$($env:php_ver_target)-nts-$($env:VC)-$($env:PHPBuild).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"
+            #appveyor-retry appveyor DownloadFile https://windows.php.net/downloads/pecl/releases/sqlsrv/$($env:DLLVersion)/php_sqlsrv-$($env:DLLVersion)-$($env:php_ver_target)-nts-$($env:VC)-$($env:PHPBuild).zip
+            7z x -y php_sqlsrv-$($env:DLLVersion)-$($env:php_ver_target)-nts-$($env:VC)-$($env:PHPBuild).zip > $null
+            $source = "https://windows.php.net/downloads/pecl/releases/pdo_sqlsrv/$($env:DLLVersion)/php_pdo_sqlsrv-$($env:DLLVersion)-$($env:php_ver_target)-nts-$($env:VC)-$($env:PHPBuild).zip"
+            $destination = "c:\tools\php\ext\php_pdo_sqlsrv-$($env:DLLVersion)-$($env:php_ver_target)-nts-$($env:VC)-$($env:PHPBuild).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
+            #appveyor-retry appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/pdo_sqlsrv/$($env:DLLVersion)/php_pdo_sqlsrv-$($env:DLLVersion)-$($env:php_ver_target)-nts-$($env:VC)-$($env:PHPBuild).zip
+            7z x -y php_pdo_sqlsrv-$($env:DLLVersion)-$($env:php_ver_target)-nts-$($env:VC)-$($env:PHPBuild).zip > $null
             Remove-Item c:\tools\php\ext* -include .zip
             cd c:\tools\php}
     - IF %PHP%==1 copy php.ini-production php.ini /Y
@@ -80,11 +80,11 @@ install:
         If ($env:PHP -eq "1") {
           $wincache = "2.0.0.8"
           cd c:\tools\php\ext
-          $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"
+          $source = "http://windows.php.net/downloads/pecl/releases/wincache/$($wincache)/php_wincache-$($wincache)-$($env:php_ver_target)-nts-$($env:VC)-$($env:PHPBuild).zip"
+          $destination = "c:\tools\php\ext\php_wincache-$($wincache)-$($env:php_ver_target)-nts-$($env:VC)-$($env: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
+          #appveyor-retry appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/wincache/$($wincache)/php_wincache-$($wincache)-$($env:php_ver_target)-nts-$($env:VC)-$($env:PHPBuild).zip
+          7z x -y php_wincache-$($wincache)-$($env:php_ver_target)-nts-$($env:VC)-$($env:PHPBuild).zip > $null
           Remove-Item C:\tools\php\ext* -include .zip
           cd c:\tools\php}
     - IF %PHP%==1 echo extension=php_wincache.dll >> php.ini

diff --git a/.drone.yml b/.drone.yml
@@ -1,63 +1,90 @@
-pipeline:
-  clone:
-    image: plugins/git
-    depth: 1
+---
+kind: pipeline
+name: default
 
-  phpcs:
-    image: joomlaprojects/docker-phpcs
-    commands:
-      - echo $(date)
-      - /root/.composer/vendor/bin/phpcs --report=full --encoding=utf-8 --extensions=php -p --standard=build/phpcs/Joomla .
-      - echo $(date)
+clone:
+  depth: 42
 
-  restore-cache:
-      image: drillster/drone-volume-cache
+steps:
+  - name: restore-cache
+    image: drillster/drone-volume-cache
+    settings:
       restore: true
       mount:
         - ./node_modules
         - ./libraries/vendor
-      volumes:
-        - /tmp/cache:/cache
+        - ./administrator/components/com_media/node_modules
+      cache_key: [ DRONE_REPO_NAMESPACE, DRONE_REPO_NAME, DRONE_BRANCH, DRONE_STAGE_NUMBER ]
+    volumes:
+      - name: cache
+        path: /cache
 
-  prepare:
+  - name: composer
     image: joomlaprojects/docker-tools:develop
+    depends_on: [ restore-cache ]
     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
+
+  - name: phpcs
+    image: php:7.2
+    depends_on: [ composer ]
+    commands:
+      - echo $(date)
+      - ./libraries/vendor/bin/phpcs --report=full --encoding=utf-8 --extensions=php -p --standard=build/phpcs/Joomla .
+      - echo $(date)
+
+  - name: npm
+    image: joomlaprojects/docker-tools:develop
+    depends_on: [ phpcs ]
+    commands:
       - npm install --unsafe-perm
 
-  rebuild-cache:
-      image: drillster/drone-volume-cache
+  - name: rebuild-cache
+    image: drillster/drone-volume-cache
+    depends_on: [ npm ]
+    settings:
       rebuild: true
       mount:
         - ./node_modules
         - ./libraries/vendor
-      volumes:
-        - /tmp/cache:/cache
+        - ./administrator/components/com_media/node_modules
+      cache_key: [ DRONE_REPO_NAMESPACE, DRONE_REPO_NAME, DRONE_BRANCH, DRONE_STAGE_NUMBER ]
+    volumes:
+      - name: cache
+        path: /cache
+
+  - name: php72-unit
+    depends_on: [ phpcs ]
+    image: php:7.2
+    commands:
+      - php -v
+      - ./libraries/vendor/bin/phpunit
 
-  php70-unit:
-    group: unit
-    image: joomlaprojects/docker-php70:develop
+  - name: php73-unit
+    depends_on: [ phpcs ]
+    image: php:7.3
     commands:
+      - php -v
       - ./libraries/vendor/bin/phpunit
 
-  php71-unit:
-    group: unit
-    image: joomlaprojects/docker-php71:develop
+  - name: php74-unit
+    depends_on: [ phpcs ]
+    image: phpdaily/php:7.4-dev
+    failure: ignore
     commands:
+      - php -v
       - ./libraries/vendor/bin/phpunit
 
-  php72-unit:
-    group: unit
-    image: joomlaprojects/docker-php72:develop
+  - name: php80-unit
+    depends_on: [ phpcs ]
+    image: phpdaily/php:8.0-dev
+    failure: ignore
     commands:
+      - php -v
       - ./libraries/vendor/bin/phpunit
 
-  javascript-cs:
+  - name: javascript-cs
+    depends_on: [ npm ]
     image: joomlaprojects/docker-systemtests:develop
     commands:
       - export DISPLAY=:0
@@ -66,7 +93,8 @@ pipeline:
       - fluxbox  > /dev/null 2>&1 &
       - npm run lint:js
 
-  javascript-tests:
+  - name: javascript-tests
+    depends_on: [ npm ]
     image: joomlaprojects/docker-systemtests:develop
     commands:
       - export DISPLAY=:0
@@ -75,57 +103,76 @@ pipeline:
       - 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)"
+  - name: system-tests-mysql
+    depends_on: [ javascript-tests ]
+    image: joomlaprojects/docker-systemtests:latest
+    commands:
+      - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql
+
+  - name: system-tests-postgres
+    depends_on: [ system-tests-mysql ]
+    image: joomlaprojects/docker-systemtests:latest
+    commands:
+      - bash tests/Codeception/drone-system-run.sh "$(pwd)" postgres
 
-  api-tests:
+  - name: api-tests
+    depends_on: [ system-tests-postgres ]
     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:
+      - bash tests/Codeception/drone-api-run.sh "$(pwd)"
+
+  - name: analysis4x
     image: rips/rips-cli:1.2.1
-    secrets:  [rips_username, rips_password]
+    depends_on: [ api-tests ]
     when:
-      branch: 4.0-dev
+      repo:
+        - joomla/joomla-cms
+      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; }
+      - rips-cli rips:scan:start -a 3 -t 1 -R -k -p $(pwd) -t 1 -T $DRONE_REPO_NAMESPACE-$DRONE_BRANCH ||  { echo "Please contact the security team at security@joomla.org"; exit 1; }
+    environment:
+      RIPS_USERNAME:
+        from_secret: RIPS_USERNAME
+      RIPS_PASSWORD:
+        from_secret: RIPS_PASSWORD
 
 branches:
   exclude: [ l10n_* ]
 
+
+volumes:
+- name: cache
+  host:
+    path: /tmp/cache
+
 services:
-  mysql:
+  - name: mysql
     image: mysql:5.7
     environment:
       MYSQL_USER: joomla_ut
       MYSQL_PASSWORD: joomla_ut
       MYSQL_ROOT_PASSWORD: joomla_ut
       MYSQL_DATABASE: test_joomla
 
-  memcached:
+  - name: memcached
     image: memcached:alpine
 
-  redis:
+  - name: redis
     image: redis:alpine
 
-  postgres:
-    image: postgres
+  - name: postgres
+    image: postgres:9-alpine
+    ports:
+      - 5432
+    environment:
+      POSTGRES_USER: root
+      POSTGRES_PASSWORD: joomla_ut
+      POSTGRES_DB: test_joomla
+
+---
+kind: signature
+hmac: e1c1f28a3614a9ec4d16677b85ae8a9cdff64b25d95eb5a0af7505184276ac62
+
+...
diff --git a/.eslintignore b/.eslintignore
@@ -12,5 +12,4 @@ 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
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -13,13 +13,6 @@ plugins/systems/fields/*  @laoneo
 #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

diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -3,9 +3,9 @@ Joomla! CMS™ [![Analytics](https://ga-beacon.appspot.com/UA-544070-3/joomla-cm
 
 Build Status
 ---------------------
-| Travis-CI  | Drone-CI | AppVeyor |
-| ------------- | ------------- | ------------- |
-| [![Build Status](https://travis-ci.org/joomla/joomla-cms.svg?branch=staging)](https://travis-ci.org/joomla/joomla-cms)  | [![Build Status](http://213.160.72.75/api/badges/joomla/joomla-cms/status.svg)](http://213.160.72.75/joomla/joomla-cms)  | [![Build status](https://ci.appveyor.com/api/projects/status/bpcxulw6nnxlv8kb/branch/staging?svg=true)](https://ci.appveyor.com/project/joomla/joomla-cms)  |
+| Drone-CI | AppVeyor |
+| ------------- | ------------- |
+| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg?branch=4.0-dev)](https://ci.joomla.org/joomla/joomla-cms)  | [![Build status](https://ci.appveyor.com/api/projects/status/bpcxulw6nnxlv8kb/branch/staging?svg=true)](https://ci.appveyor.com/project/joomla/joomla-cms)  |
 
 What is this?
 ---------------------
@@ -45,6 +45,10 @@ git clone git@github.com:joomla/joomla-cms.git
 ```bash
 cd joomla-cms
 ```
+- Go to the 4.0-dev branch:
+```bash
+git checkout 4.0-dev
+```
 - Install all the needed composer packages:
 ```bash
 composer install

diff --git a/RoboFile.php b/RoboFile.php
@@ -55,7 +55,7 @@ class RoboFile extends \Robo\Tasks
 	 * @var    string
 	 * @since  4.0.0
 	 */
-	private $testsPath = 'libraries/vendor/joomla/test-system/src/';
+	private $testsPath = 'tests/Codeception/';
 
 	/**
 	 * @var array | null
@@ -480,7 +480,7 @@ private function getSuiteConfig($suite = 'acceptance')
 	{
 		if (!$this->suiteConfig)
 		{
-			$this->suiteConfig = Symfony\Component\Yaml\Yaml::parse(file_get_contents(__DIR__ . '/libraries/vendor/joomla/test-system/src/' . $suite . '.suite.yml'));
+			$this->suiteConfig = Symfony\Component\Yaml\Yaml::parse(file_get_contents(__DIR__ . '/tests/Codeception/' . $suite . '.suite.yml'));
 		}
 
 		return $this->suiteConfig;